HHH-13925 Upgrade to Gradle 6.3

build.gradle

@@ -22,7 +22,6 @@ buildscript {
 }
 
 plugins {
-	id 'com.gradle.build-scan' version '2.4.2'
 	id 'me.champeau.buildscan-recipes' version '0.2.3'
 	id 'org.hibernate.build.xjc' version '2.0.1' apply false
 	id 'org.hibernate.build.maven-repo-auth' version '3.0.2' apply false

gradle/publishing-pom.gradle

@@ -7,6 +7,11 @@
 
 apply plugin: 'maven-publish'
 
+// Disable Gradle module metadata publishing until we know what we want.
+// https://docs.gradle.org/6.0.1/userguide/publishing_gradle_module_metadata.html#sub:disabling-gmm-publication
+tasks.withType(GenerateModuleMetadata) {
+	enabled = false
+}
 
 publishing {
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java

@@ -68,7 +68,7 @@ protected AbstractEntityInsertAction(
 	 *       entity state.
 	 * @return the entity state.
 	 *
-	 * @see {@link #nullifyTransientReferencesIfNotAlready}
+	 * @see #nullifyTransientReferencesIfNotAlready
 	 */
 	public Object[] getState() {
 		return state;
@@ -107,7 +107,7 @@ public NonNullableTransientDependencies findNonNullableTransientEntities() {
 	 * called for a this object, so it can safely be called both when
 	 * the entity is made "managed" and when this action is executed.
 	 *
-	 * @see {@link #makeEntityManaged() }
+	 * @see #makeEntityManaged()
 	 */
 	protected final void nullifyTransientReferencesIfNotAlready() {
 		if ( ! areTransientReferencesNullified ) {

hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java

@@ -16,20 +16,20 @@
 
 /**
  * Defines size for batch loading of collections or lazy entities.  For example...
- * <blockquote><pre>
- *     &#064;Entity
- *     &#064;BatchSize(size=100)
- *     class Product {
- *         ...
- *     }
- * </pre></blockquote>
+ * <blockquote><pre>{@code
+ * @Entity
+ * @BatchSize(size=100)
+ * class Product {
+ *     ...
+ * }
+ * }</pre></blockquote>
  * will initialize up to 100 lazy Product entity proxies at a time.
  *
- * <blockquote><pre>
- *     	&#064;OneToMany
- *     	&#064;BatchSize(size = 5) /
- *     	Set<Product> getProducts() { ... };
- * </pre></blockquote>
+ * <blockquote><pre>{@code
+ * @OneToMany
+ * @BatchSize(size = 5) /
+ * Set<Product> getProducts() { ... };
+ * }</pre></blockquote>
  * will initialize up to 5 lazy collections of products at a time
  *
  * @author Emmanuel Bernard

hibernate-core/src/main/java/org/hibernate/annotations/Sort.java

@@ -34,7 +34,7 @@
 	/**
 	 * Specifies the comparator to use.  Only valid when {@link #type} specifies {@link SortType#COMPARATOR}.
 	 *
-	 * TODO find a way to use Class<Comparator> -> see HHH-8164
+	 * TODO find a way to use {@code Class<Comparator>} -> see HHH-8164
 	 */
 	Class comparator() default void.class;
 }

hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java

@@ -1776,7 +1776,7 @@ private void processFkSecondPassesInOrder() {
 	 * <p/>
 	 * See <tt>ANN-722</tt> and <tt>ANN-730</tt>
 	 *
-	 * @param orderedFkSecondPasses The list containing the <code>FkSecondPass<code> instances ready
+	 * @param orderedFkSecondPasses The list containing the <code>FkSecondPass</code> instances ready
 	 * for processing.
 	 * @param isADependencyOf Our lookup data structure to determine dependencies between tables
 	 * @param startTable Table name to start recursive algorithm.

hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceAny.java

@@ -7,7 +7,7 @@
 package org.hibernate.boot.model.source.spi;
 
 /**
- * Describes an {@link <any/>} mapping
+ * Describes an {@code <any/>} mapping
  *
  * @author Steve Ebersole
  */

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/CollectionTracker.java

@@ -7,7 +7,7 @@
 package org.hibernate.bytecode.enhance.spi;
 
 /**
- * Interface to be implemented by collection trackers that hold the expected size od collections, a simplified Map<String, int>.
+ * Interface to be implemented by collection trackers that hold the expected size od collections, a simplified {@code Map<String, int>}.
  *
  * @author <a href="mailto:lbarreiro@redhat.com">Luis Barreiro</a>
  */

hibernate-core/src/main/java/org/hibernate/cfg/JPAIndexHolder.java

@@ -13,7 +13,7 @@
 import javax.persistence.Index;
 
 /**
- * @author Strong Liu <stliu@hibernate.org>
+ * @author <a href="mailto:stliu@hibernate.org">Strong Liu</a>
  */
 public class JPAIndexHolder {
 	private final String name;

hibernate-core/src/main/java/org/hibernate/cfg/annotations/QueryHintDefinition.java

@@ -24,7 +24,7 @@
 import org.hibernate.internal.util.LockModeConverter;
 
 /**
- * @author Strong Liu <stliu@hibernate.org>
+ * @author <a href="mailto:stliu@hibernate.org">Strong Liu</a>
  */
 public class QueryHintDefinition {
 	private final Map<String, Object> hintsMap;

hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java

@@ -89,7 +89,7 @@ protected AbstractPersistentCollection(SharedSessionContractImplementor session)
 	}
 
 	/**
-	 *  * @deprecated {@link #AbstractPersistentCollection(SharedSessionContractImplementor)} should be used instead.
+	 * @deprecated {@link #AbstractPersistentCollection(SharedSessionContractImplementor)} should be used instead.
 	 */
 	@Deprecated
 	protected AbstractPersistentCollection(SessionImplementor session) {

hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java

@@ -117,8 +117,8 @@
  * <p>
  * Note: This dialect is configured to create foreign keys with {@code on update cascade}.
  *
- * @author Andrew Clemons <andrew.clemons@sap.com>
- * @author Jonathan Bregler <jonathan.bregler@sap.com>
+ * @author <a href="mailto:andrew.clemons@sap.com">Andrew Clemons</a>
+ * @author <a href="mailto:jonathan.bregler@sap.com">Jonathan Bregler</a>
  */
 public abstract class AbstractHANADialect extends Dialect {
 

hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java

@@ -102,7 +102,7 @@
  * For example, in Hibernate 3.2, typical entries in hibernate.properties would have the following
  * "name=value" pairs:
  * <p/>
- * <table cols=3 border cellpadding=5 cellspacing=0>
+ * <table cols=3 border="" cellpadding=5 cellspacing=0>
  * <tr>
  * <th>Property Name</th>
  * <th>Property Value</th>

hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java

@@ -2538,7 +2538,7 @@ public boolean supportsCircularCascadeDeleteConstraints() {
 	 * Are subselects supported as the left-hand-side (LHS) of
 	 * IN-predicates.
 	 * <p/>
-	 * In other words, is syntax like "... <subquery> IN (1, 2, 3) ..." supported?
+	 * In other words, is syntax like {@code ... <subquery> IN (1, 2, 3) ...} supported?
 	 *
 	 * @return True if subselects can appear as the LHS of an in-predicate;
 	 * false otherwise.

hibernate-core/src/main/java/org/hibernate/dialect/FrontBaseDialect.java

@@ -32,7 +32,7 @@
  * 2.3.1, you can work-around this problem by setting the following in your
  * <tt>hibernate.properties</tt> file: <tt>hibernate.jdbc.batch_size=15</tt>
  *
- * @author Ron Lussier <tt>rlussier@lenscraft.com</tt>
+ * @author <a href="mailto:rlussier@lenscraft.com</tt">Ron Lussier</a>
  */
 public class FrontBaseDialect extends Dialect {
 

hibernate-core/src/main/java/org/hibernate/dialect/HANAColumnStoreDialect.java

@@ -26,8 +26,8 @@
  * <p>
  * Column tables are created by this dialect when using the auto-ddl feature.
  * 
- * @author Andrew Clemons <andrew.clemons@sap.com>
- * @author Jonathan Bregler <jonathan.bregler@sap.com>
+ * @author <a href="mailto:andrew.clemons@sap.com">Andrew Clemons</a>
+ * @author <a href="mailto:jonathan.bregler@sap.com">Jonathan Bregler</a>
  */
 public class HANAColumnStoreDialect extends AbstractHANADialect {
 

hibernate-core/src/main/java/org/hibernate/dialect/HANARowStoreDialect.java

@@ -22,8 +22,8 @@
  * <p>
  * Row tables are created by this dialect when using the auto-ddl feature.
  *
- * @author Andrew Clemons <andrew.clemons@sap.com>
- * @author Jonathan Bregler <jonathan.bregler@sap.com>
+ * @author <a href="mailto:andrew.clemons@sap.com">Andrew Clemons</a>
+ * @author <a href="mailto:jonathan.bregler@sap.com">Jonathan Bregler</a>
  */
 public class HANARowStoreDialect extends AbstractHANADialect {
 

hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java

@@ -20,7 +20,7 @@
  * An Hibernate 3 SQL dialect for Mimer SQL. This dialect requires Mimer SQL 9.2.1 or later
  * because of the mappings to NCLOB, BINARY, and BINARY VARYING.
  *
- * @author Fredrik lund <fredrik.alund@mimer.se>
+ * @author <a href="mailto:fredrik.alund@mimer.se">Fredrik lund</a>
  */
 @SuppressWarnings("deprecation")
 public class MimerSQLDialect extends Dialect {

hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java

@@ -103,7 +103,7 @@ public TeradataDialect() {
 	/**
 	 * Does this dialect support the <tt>FOR UPDATE</tt> syntax?
 	 *
-	 * @return empty string ... Teradata does not support <tt>FOR UPDATE<tt> syntax
+	 * @return empty string ... Teradata does not support <tt>FOR UPDATE</tt> syntax
 	 */
 	@Override
 	public String getForUpdateString() {

hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractEntityEntry.java

@@ -38,9 +38,9 @@
  * A base implementation of EntityEntry
  *
  * @author Gavin King
- * @author Emmanuel Bernard <emmanuel@hibernate.org>
+ * @author <a href="mailto:emmanuel@hibernate.org">Emmanuel Bernard</a>
  * @author Gunnar Morling
- * @author Sanne Grinovero  <sanne@hibernate.org>
+ * @author <a href="mailto:sanne@hibernate.org">Sanne Grinovero </a>
  */
 public abstract class AbstractEntityEntry implements Serializable, EntityEntry {
 	protected final Serializable id;

hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryExtraStateHolder.java

@@ -11,7 +11,7 @@
 /**
  * Contains optional state from {@link org.hibernate.engine.spi.EntityEntry}.
  *
- * @author Emmanuel Bernard <emmanuel@hibernate.org>
+ * @author <a href="mailto:emmanuel@hibernate.org">Emmanuel Bernard</a>
  */
 public class EntityEntryExtraStateHolder implements EntityEntryExtraState {
 	private EntityEntryExtraState next;

hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java

@@ -25,9 +25,9 @@
  * immutable in terms of its internal state; the term immutable here refers to the entity it describes.
  *
  * @author Gavin King
- * @author Emmanuel Bernard <emmanuel@hibernate.org>
+ * @author <a href="mailto:emmanuel@hibernate.org">Emmanuel Bernard</a>
  * @author Gunnar Morling
- * @author Sanne Grinovero  <sanne@hibernate.org>
+ * @author <a href="mailto:sanne@hibernate.org">Sanne Grinovero </a>
  *
  * @see org.hibernate.annotations.Immutable
  */

hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java

@@ -22,9 +22,9 @@
  * An EntityEntry implementation for mutable entities.
  *
  * @author Gavin King
- * @author Emmanuel Bernard <emmanuel@hibernate.org>
+ * @author <a href="mailto:emmanuel@hibernate.org">Emmanuel Bernard</a>
  * @author Gunnar Morling
- * @author Sanne Grinovero  <sanne@hibernate.org>
+ * @author <a href="mailto:sanne@hibernate.org">Sanne Grinovero </a>
  */
 public final class MutableEntityEntry extends AbstractEntityEntry {
 	/**

hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java

@@ -21,9 +21,9 @@
  * therefore we need to take care of its impact on memory consumption.
  *
  * @author Gavin King
- * @author Emmanuel Bernard <emmanuel@hibernate.org>
+ * @author <a href="mailto:emmanuel@hibernate.org">Emmanuel Bernard</a>
  * @author Gunnar Morling
- * @author Sanne Grinovero  <sanne@hibernate.org>
+ * @author <a href="mailto:sanne@hibernate.org">Sanne Grinovero </a>
  */
 public interface EntityEntry {
 	LockMode getLockMode();

hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java

@@ -10,7 +10,7 @@
 /**
  * Navigation methods for extra state objects attached to {@link org.hibernate.engine.spi.EntityEntry}.
  *
- * @author Emmanuel Bernard <emmanuel@hibernate.org>
+ * @author <a href="mailto:emmanuel@hibernate.org">Emmanuel Bernard</a>
  */
 public interface EntityEntryExtraState {
 

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java

@@ -77,7 +77,7 @@
  * API so that only some methods need to be overridden
  * (Used by Hibernate Search).
  *
- * @author Sanne Grinovero <sanne@hibernate.org> (C) 2012 Red Hat Inc.
+ * @author <a href="mailto:sanne@hibernate.org">Sanne Grinovero</a> (C) 2012 Red Hat Inc.
  */
 @SuppressWarnings("deprecation")
 public class SessionDelegatorBaseImpl implements SessionImplementor {