HHH-8733 - General build cleanup - hibernate-testing

hibernate-c3p0/hibernate-c3p0.gradle

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

hibernate-core/hibernate-core.gradle

@@ -23,7 +23,6 @@ dependencies {
     provided( libraries.validation )
     provided( libraries.classmate )
 
-    testCompile( project(':hibernate-testing') )
     testCompile( libraries.validation )
     testCompile( libraries.jandex )
     testCompile( libraries.classmate )
@@ -35,6 +34,13 @@ 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 )
@@ -165,3 +171,34 @@ 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-core/src/test/java/org/hibernate/testing/cache/NonstrictReadWriteNaturalIdRegionAccessStrategy.java

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

hibernate-ehcache/hibernate-ehcache.gradle

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

hibernate-entitymanager/hibernate-entitymanager.gradle

@@ -18,8 +18,8 @@ dependencies {
 
     provided( "javax.enterprise:cdi-api:1.1-PFD" )
 
-    testCompile( project(':hibernate-testing') )
-    testCompile( libraries.shrinkwrap_api )
+	testCompile( project( path: ':hibernate-core', configuration: '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(':hibernate-testing') )
-    testCompile( project(path: ':hibernate-entitymanager', configuration: 'tests') )
+	testCompile( project( path: ':hibernate-core', configuration: '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( ':hibernate-testing' )
+	testCompile( project( path: ':hibernate-core', configuration: '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( ':hibernate-testing' )
+	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
 }
 
 def pomName() {

settings.gradle

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