HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec + HEM boot cleanup (HHH-6159)

Author: sebersole

hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java

@@ -159,7 +159,7 @@ public boolean isSynchronizationRegistered() {
 	@Override
 	@SuppressWarnings( {"unchecked"})
 	public boolean isTransactionInProgress() {
-		return getTransaction().isActive() && getTransaction().getJoinStatus() == JoinStatus.JOINED;
+		return open && getTransaction().isActive() && getTransaction().getJoinStatus() == JoinStatus.JOINED;
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java

@@ -188,7 +188,7 @@ public static int[] join(int[] x, int[] y) {
 	}
 
 	@SuppressWarnings( {"unchecked"})
-	public static <T> T[] join(T[] x, T[] y) {
+	public static <T> T[] join(T[] x, T... y) {
 		T[] result = (T[]) Array.newInstance( x.getClass().getComponentType(), x.length + y.length );
 		System.arraycopy( x, 0, result, 0, x.length );
 		System.arraycopy( y, 0, result, x.length, y.length );
@@ -372,8 +372,6 @@ public static boolean isEquals(byte[] b1, byte[] b2) {
 		}
         return true;
 	}
-
-
 }
 
 

hibernate-entitymanager/hibernate-entitymanager.gradle

@@ -71,3 +71,16 @@ task copyBundleResources (type: Copy) {
 }
 processTestResources.dependsOn copyBundleResources
 
+// create an artifact configuration composed of the test classes so that envers can access hem test classes
+task testJar(type: Jar, dependsOn: testClasses) {
+    classifier = 'test'
+    from sourceSets.test.classes
+}
+
+configurations {
+    tests
+}
+
+artifacts {
+    tests testJar
+}