Revert "HHH-8733 - General build cleanup - hibernate-testing"

This reverts commit bc2855b323.

hibernate-c3p0/hibernate-c3p0.gradle

@@ -7,7 +7,7 @@ dependencies {
         // for test runtime
         transitive = true
     }
-	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
+    testCompile project( ':hibernate-testing' )
 }
 
 def pomName() {

hibernate-core/hibernate-core.gradle

@@ -23,6 +23,7 @@ dependencies {
     provided( libraries.validation )
     provided( libraries.classmate )
 
+    testCompile( project(':hibernate-testing') )
     testCompile( libraries.validation )
     testCompile( libraries.jandex )
     testCompile( libraries.classmate )
@@ -34,13 +35,6 @@ dependencies {
     // for testing stored procedure support
     testCompile( libraries.derby )
 
-	testCompile( libraries.byteman )
-	testCompile( libraries.byteman_install )
-	testCompile( libraries.byteman_bmunit )
-	testCompile( libraries.xapool )
-	testCompile ( libraries.jboss_jta ) {
-		transitive=false;
-	}
 
     testRuntime( 'jaxen:jaxen:1.1' )
     testRuntime( libraries.javassist )
@@ -171,34 +165,3 @@ generateSources.dependsOn generateGrammarSource
 compileJava.dependsOn jaxb
 
 
-// create the testing jar
-task testingJar(type: Jar, dependsOn: compileTestJava) {
-	from sourceSets.test.output
-	// atm none of these work, the jar includes everything from sourceSets.test.output
-	include '**/org/hibernate/testing/**'
-	include '**/org/hibernate/testing/*'
-	include 'org/hibernate/testing/**'
-	include 'org/hibernate/testing/*'
-	classifier = 'testing'
-}
-
-// allow other modules to use it
-configurations {
-	testing {
-		extendsFrom testCompile
-	}
-}
-artifacts {
-	testing testingJar
-}
-
-// publish it so other projects can use it
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			artifact testingJar {
-				classifier "testing"
-			}
-		}
-	}
-}

hibernate-ehcache/hibernate-ehcache.gradle

@@ -2,7 +2,7 @@ dependencies {
     compile project( ':hibernate-core' )
     compile( libraries.ehcache )
 
-	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
+    testCompile project( ':hibernate-testing' )
 }
 
 def pomName() {

hibernate-entitymanager/hibernate-entitymanager.gradle

@@ -18,8 +18,8 @@ dependencies {
 
     provided( "javax.enterprise:cdi-api:1.1-PFD" )
 
-	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
-	testCompile( libraries.shrinkwrap_api )
+    testCompile( project(':hibernate-testing') )
+    testCompile( libraries.shrinkwrap_api )
     testCompile( libraries.shrinkwrap )
     testCompile( libraries.validation )
     testCompile( "org.jboss.weld:weld-core:2.0.0.Beta6" )

hibernate-envers/hibernate-envers.gradle

@@ -13,8 +13,8 @@ dependencies {
     provided( [group: 'org.hibernate', name: 'hibernate-tools', version: '3.2.0.ga'] )
     provided( libraries.ant )
 
-	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
-    testCompile( project( path: ':hibernate-entitymanager', configuration: 'tests' ) )
+    testCompile( project(':hibernate-testing') )
+    testCompile( project(path: ':hibernate-entitymanager', configuration: 'tests') )
 
     testRuntime( libraries.javassist )
 

hibernate-infinispan/hibernate-infinispan.gradle

@@ -7,7 +7,7 @@ dependencies {
     compile( libraries.infinispan )
     compile( libraries.rhq )
 
-	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
+    testCompile project( ':hibernate-testing' )
     testCompile( libraries.infinispan_test )
     testCompile( libraries.jboss_common_core )
     testCompile( libraries.jnp_client )

hibernate-proxool/hibernate-proxool.gradle

@@ -1,7 +1,7 @@
 dependencies {
     compile project( ':hibernate-core' )
     compile( libraries.proxool )
-	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
+    testCompile project( ':hibernate-testing' )
 }
 
 def pomName() {

hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteNaturalIdRegionAccessStrategy.java

@@ -44,9 +44,8 @@ class NonstrictReadWriteNaturalIdRegionAccessStrategy extends BaseNaturalIdRegio
 	}
 	
 	/**
-	 * Returns {@code false} since this is an asynchronous cache access strategy.
-	 *
-	 * {@inheritDoc}
+	 * Returns <code>false</code> since this is an asynchronous cache access strategy.
+	 * @see org.hibernate.cache.ehcache.internal.strategy.NonStrictReadWriteEhcacheNaturalIdRegionAccessStrategy 
 	 */
 	@Override
 	public boolean insert(Object key, Object value ) throws CacheException {
@@ -54,9 +53,8 @@ class NonstrictReadWriteNaturalIdRegionAccessStrategy extends BaseNaturalIdRegio
 	}
 
 	/**
-	 * Returns {@code false} since this is a non-strict read/write cache access strategy
-	 *
-	 * {@inheritDoc}
+	 * Returns <code>false</code> since this is a non-strict read/write cache access strategy
+	 * @see org.hibernate.cache.ehcache.internal.strategy.NonStrictReadWriteEhcacheNaturalIdRegionAccessStrategy 
 	 */
 	@Override
 	public boolean afterInsert(Object key, Object value ) throws CacheException {
@@ -65,8 +63,7 @@ class NonstrictReadWriteNaturalIdRegionAccessStrategy extends BaseNaturalIdRegio
 	
 	/**
 	 * Removes the entry since this is a non-strict read/write cache strategy.
-	 *
-	 * {@inheritDoc}
+	 * @see org.hibernate.cache.ehcache.internal.strategy.NonStrictReadWriteEhcacheNaturalIdRegionAccessStrategy 
 	 */
 	public boolean update(Object key, Object value ) throws CacheException {
 		remove( key );

settings.gradle

@@ -1,4 +1,5 @@
 include 'hibernate-core'
+include 'hibernate-testing'
 include 'hibernate-entitymanager'
 include 'hibernate-envers'