HHH-7385 change to use gradle 1.1

maesenka · Aug 8, 2012 · 7a82349 · 7a82349
1 parent 9a7d3ee
commit 7a82349
Show file tree

Hide file tree

Showing 15 changed files with 145 additions and 134 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,32 +1,36 @@
 apply plugin: 'eclipse'
 apply plugin: 'idea'
-
+apply from: "./libraries.gradle"
 allprojects {
     repositories {
-        mavenCentral()
-        mavenLocal()
-        mavenRepo name: 'jboss-nexus', url: "https://repository.jboss.org/nexus/content/groups/public/"
+	mavenCentral()
+    	mavenLocal()
+
+
+        mavenRepo name: 'jboss-nexus', url: "http://repository.jboss.org/nexus/content/groups/public/"
         mavenRepo name: "jboss-snapshots", url: "http://snapshots.jboss.org/maven2/"
     }
 }
 
 buildscript {
     repositories {
-        mavenCentral()
-        mavenLocal()
-        mavenRepo name: 'jboss-nexus', url: "https://repository.jboss.org/nexus/content/groups/public/"
+	mavenCentral()
+	    mavenLocal()
+
+
+        mavenRepo name: 'jboss-nexus', url: "http://repository.jboss.org/nexus/content/groups/public/"
         mavenRepo name: "jboss-snapshots", url: "http://snapshots.jboss.org/maven2/"
     }
     dependencies {
         classpath 'org.hibernate.build.gradle:gradle-upload-auth-plugin:1.1.1'
     }
 }
 
-hibernateTargetVersion = '4.2.0-SNAPSHOT'
+ext.hibernateTargetVersion = '4.2.0-SNAPSHOT'
 
 idea {
     project {
-        jdkName = "1.6"
+        languageLevel = '1.6'
         ipr {
             withXml { provider ->
                 provider.node.component.find { it.@name == 'VcsDirectoryMappings' }.mapping.@vcs = 'Git'
@@ -46,67 +50,6 @@ idea {
     }
 }
 
-// build a map of the dependency artifacts to use.  Allows centralized definition of the version of artifacts to
-// use.  In that respect it serves a role similar to <dependencyManagement> in Maven
-slf4jVersion = '1.6.1'
-junitVersion = '4.10'
-h2Version = '1.2.145'
-bytemanVersion = '1.5.2'
-
-libraries = [
-        // Ant
-        ant:            'org.apache.ant:ant:1.8.2',
-
-        // Antlr
-        antlr:          'antlr:antlr:2.7.7',
-
-        // Annotations
-        commons_annotations:
-                        'org.hibernate.common:hibernate-commons-annotations:4.0.1.Final@jar',
-        jandex:         'org.jboss:jandex:1.0.3.Final',
-        classmate:      'com.fasterxml:classmate:0.5.4',
-
-        // Dom4J
-        dom4j:          'dom4j:dom4j:1.6.1@jar',
-
-        // Javassist
-        javassist:      'org.javassist:javassist:3.15.0-GA',
-
-        // javax
-        jpa:            'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Draft-7plus',
-        jta:            'org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final',
-        validation:     'javax.validation:validation-api:1.0.0.GA',
-        jacc:           'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.0.Final',
-
-        // logging
-        logging:        'org.jboss.logging:jboss-logging:3.1.0.GA',
-        logging_processor:  'org.jboss.logging:jboss-logging-processor:1.0.0.Final',
-
-        // jaxb task
-        jaxb:           'com.sun.xml.bind:jaxb-xjc:2.1.6',
-        jaxb2_basics:   'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.0',
-        jaxb2_ant:      'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.6.0',
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~ testing
-
-        // logging for testing
-        slf4j_api:      "org.slf4j:slf4j-api:${slf4jVersion}",
-        slf4j_log4j12:  "org.slf4j:slf4j-log4j12:${slf4jVersion}",
-        jcl_slf4j:      "org.slf4j:jcl-over-slf4j:${slf4jVersion}",
-        jcl_api:        'commons-logging:commons-logging-api:99.0-does-not-exist',
-        jcl:            'commons-logging:commons-logging:99.0-does-not-exist',
-
-
-        junit:           "junit:junit:${junitVersion}",
-        byteman:         "org.jboss.byteman:byteman:${bytemanVersion}",
-        byteman_install: "org.jboss.byteman:byteman-install:${bytemanVersion}",
-        byteman_bmunit:  "org.jboss.byteman:byteman-bmunit:${bytemanVersion}",
-        jpa_modelgen:    'org.hibernate:hibernate-jpamodelgen:1.1.1.Final',
-        shrinkwrap_api:  'org.jboss.shrinkwrap:shrinkwrap-api:1.0.0-beta-6',
-        shrinkwrap:      'org.jboss.shrinkwrap:shrinkwrap-impl-base:1.0.0-beta-6',
-        validator:       'org.hibernate:hibernate-validator:4.2.0.Final',
-        h2:              "com.h2database:h2:${h2Version}",
-        mockito:         'org.mockito:mockito-core:1.9.0'
-]
 
 
 subprojects { subProject ->
@@ -147,15 +90,16 @@ subprojects { subProject ->
             }
 
         }
-        toolsJar = file("${System.getProperty('java.home')}/../lib/tools.jar")
+
+        ext.toolsJar = file("${System.getProperty('java.home')}/../lib/tools.jar")
         // appropriately inject the common dependencies into each sub-project
         dependencies {
             compile( libraries.logging )
             testCompile( libraries.junit )
             testCompile( libraries.byteman )
             testCompile( libraries.byteman_install )
             testCompile( libraries.byteman_bmunit )
-            testCompile files( toolsJar )
+
             testRuntime( libraries.slf4j_api )
             testRuntime( libraries.slf4j_log4j12 )
             testRuntime( libraries.jcl_slf4j )
@@ -165,21 +109,27 @@ subprojects { subProject ->
             testRuntime( libraries.h2 )
             jbossLoggingTool( libraries.logging_processor )
             hibernateJpaModelGenTool( libraries.jpa_modelgen )
-            jaxb( libraries.jaxb )
+            jaxb( libraries.jaxb ){
+                exclude group: "javax.xml.stream"
+            }
             jaxb( libraries.jaxb2_basics )
             jaxb( libraries.jaxb2_ant )
             deployerJars "org.apache.maven.wagon:wagon-http:1.0"
         }
-
-        aptDumpDir = subProject.file( "${buildDir}/tmp/apt" )
+        if(ext.toolsJar.exists()){
+            dependencies{
+                testCompile files( toolsJar )
+            }
+        }
+        ext.aptDumpDir = subProject.file( "${buildDir}/tmp/apt" )
 
         sourceSets.main {
             compileClasspath += configurations.provided
         }
 
         sourceSets.all {
-            originalJavaSrcDirs = java.srcDirs
-            generatedLoggingSrcDir = file( "${buildDir}/generated-src/logging/${name}" )
+            ext.originalJavaSrcDirs = java.srcDirs
+            ext.generatedLoggingSrcDir = file( "${buildDir}/generated-src/logging/${name}" )
             java.srcDir generatedLoggingSrcDir
         }
 
@@ -228,6 +178,8 @@ subprojects { subProject ->
             maxHeapSize = "1024m"
         }
 
+
+
         processTestResources.doLast( {
             copy {
                 from( sourceSets.test.java.srcDirs ) {
@@ -313,7 +265,7 @@ subprojects { subProject ->
             }
         }
 
-        subProject.basePomConfig = pomConfig
+        subProject.ext.basePomConfig = pomConfig
 
         configure(install.repositories.mavenInstaller) {
             pom.project pomConfig
@@ -342,7 +294,6 @@ subprojects { subProject ->
     }
 
 }
-
 dependsOnChildren()
 
 // This is a task that generates the gradlew scripts, allowing users to run gradle without having gradle installed
@@ -352,5 +303,5 @@ dependsOnChildren()
 //  2) /gradlew.bat which is the windows bat script for for executing builds
 //  3) /wrapper which is a directory named by the "jarPath" config which contains other needed files.
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.0-milestone-8a'
+    gradleVersion = '1.1'
 }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -49,11 +49,10 @@ dependencies {
 
 idea {
 	project {
-		jdkName = "1.6"
+		languageLevel = '1.6'
 	}
 	module {
 		downloadSources = true
 		downloadJavadoc = true
-		javaVersion = '1.6'
 	}
 }
diff --git a/buildSrc/src/main/groovy/org/hibernate/build/qalab/DatabaseAllocator.groovy b/buildSrc/src/main/groovy/org/hibernate/build/qalab/DatabaseAllocator.groovy
@@ -93,7 +93,7 @@ class DatabaseAllocator {
 
 	public static DatabaseAllocator locate(Project project) {
 		if ( ! project.rootProject.hasProperty( DB_ALLOCATOR_KEY ) ) {
-			project.rootProject.setProperty( DB_ALLOCATOR_KEY, new DatabaseAllocator( project.rootProject ) );
+			project.rootProject.ext.setProperty( DB_ALLOCATOR_KEY, new DatabaseAllocator( project.rootProject ) );
 		}
 		return (DatabaseAllocator) project.rootProject.properties[ DB_ALLOCATOR_KEY ];
 	}

diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
@@ -2,18 +2,18 @@ buildscript {
   repositories {
       mavenCentral()
       mavenLocal()
-	  mavenRepo name: 'jboss-nexus', url: "https://repository.jboss.org/nexus/content/groups/public/"
+	  mavenRepo name: 'jboss-nexus', url: "http://repository.jboss.org/nexus/content/groups/public/"
   }
   dependencies {
-      classpath "org.jboss.jdocbook:gradle-jdocbook:1.2.0"
+      classpath "org.jboss.jdocbook:gradle-jdocbook:1.2.1"
   }
 }
 
 apply plugin: "java"
 apply plugin: "jdocbook"
-
+ext.pressgangVersion = '3.0.0'
 dependencies {
-    pressgangVersion = '3.0.0'
+
     jdocbookXsl "org.jboss.pressgang:pressgang-xslt-ns:${pressgangVersion}"
     jdocbookXsl "org.jboss.pressgang:pressgang-fonts:${pressgangVersion}"
     jdocbookStyles "org.jboss.pressgang:pressgang-jdocbook-style:${pressgangVersion}"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-8a-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip
diff --git a/hibernate-c3p0/hibernate-c3p0.gradle b/hibernate-c3p0/hibernate-c3p0.gradle
@@ -1,9 +1,7 @@
-apply plugin: 'java'
-
 dependencies {
     provided( libraries.validation )
     compile project( ':hibernate-core' )
-    compile "c3p0:c3p0:0.9.1"
+    compile( libraries.c3p0 )
 
     testCompile( libraries.validator ) {
         // for test runtime

diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
@@ -1,4 +1,3 @@
-apply plugin: 'java'
 apply plugin: 'antlr'
 apply plugin: org.hibernate.build.gradle.inject.InjectionPlugin
 apply plugin: org.hibernate.build.gradle.testing.matrix.MatrixTestingPlugin
@@ -39,7 +38,7 @@ manifest.mainAttributes(
 )
 
 sourceSets.main {
-    jaxbTargetDir = file( "${buildDir}/generated-src/jaxb/main" )
+    ext.jaxbTargetDir = file( "${buildDir}/generated-src/jaxb/main" )
     java.srcDir jaxbTargetDir
 	originalJavaSrcDirs = java.srcDirs
 }
@@ -56,6 +55,7 @@ idea {
 }
 
 task jaxb {
+	ext {
     // output directory
     jaxbTargetDir = file( "${buildDir}/generated-src/jaxb/main" )
 
@@ -68,7 +68,7 @@ task jaxb {
     cfgXjb = file( 'src/main/xjb/hbm-configuration-bindings.xjb' )
     hbmXjb = file( 'src/main/xjb/hbm-mapping-bindings.xjb' )
     ormXjb = file( 'src/main/xjb/orm-bindings.xjb' )
-
+}
     // configure Gradle up-to-date checking
     inputs.files( [cfgXsd, hbmXsd, ormXsd, cfgXjb, hbmXjb, ormXjb] )
     outputs.dir( jaxbTargetDir )

diff --git a/hibernate-ehcache/hibernate-ehcache.gradle b/hibernate-ehcache/hibernate-ehcache.gradle
@@ -1,9 +1,6 @@
-apply plugin: 'java'
-
 dependencies {
     compile project( ':hibernate-core' )
-    compile "net.sf.ehcache:ehcache-core:2.4.3"
+    compile( libraries.ehcache )
 
     testCompile project( ':hibernate-testing' )
-    testCompile libraries.h2
 }
diff --git a/hibernate-entitymanager/hibernate-entitymanager.gradle b/hibernate-entitymanager/hibernate-entitymanager.gradle
@@ -1,6 +1,5 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
-apply plugin: 'java'
 apply plugin: org.hibernate.build.gradle.testing.matrix.MatrixTestingPlugin
 
 dependencies {
@@ -11,7 +10,6 @@ dependencies {
     compile( libraries.jta )
     compile( libraries.javassist )
     testCompile( project(':hibernate-testing') )
-    testCompile( libraries.junit )
     testCompile( libraries.shrinkwrap_api )
     testCompile( libraries.shrinkwrap )
     testCompile( libraries.validation )
@@ -25,7 +23,7 @@ aptDumpDir = file( "${buildDir}/tmp/apt" )
 
 sourceSets.test {
     originalJavaSrcDirs = java.srcDirs
-    generatedJpaMetamodelSrcDir = file( "${buildDir}/generated-src/jpamodelgen/${name}" )
+    ext.generatedJpaMetamodelSrcDir = file( "${buildDir}/generated-src/jpamodelgen/${name}" )
     java.srcDir generatedJpaMetamodelSrcDir
 }
 task generateTestJpaMetamodelClasses(type: Compile) {
@@ -53,8 +51,8 @@ compileTestJava.options.define(compilerArgs: ["-proc:none"])
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Process 'bundle resources' for the packaging tests
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
-bundlesTargetDir = file( "${buildDir}/bundles" )
 task copyBundleResources (type: Copy) {
+	ext.bundlesTargetDir = file( "${buildDir}/bundles" )
     from file('src/test/bundles') 
     into bundlesTargetDir
     filter(ReplaceTokens, tokens: [
@@ -74,7 +72,7 @@ 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
+    from sourceSets.test.output
 }
 
 configurations {
@@ -83,4 +81,4 @@ configurations {
 
 artifacts {
     tests testJar
-}
+}
diff --git a/hibernate-envers/hibernate-envers.gradle b/hibernate-envers/hibernate-envers.gradle
@@ -1,24 +1,18 @@
-apply plugin: 'java'
 apply plugin: org.hibernate.build.gradle.testing.matrix.MatrixTestingPlugin
 
 dependencies {
     compile( project( ':hibernate-core' ) )
     compile( project( ':hibernate-entitymanager' ) )
-    compile( libraries.commons_annotations )
-    compile( libraries.dom4j )
     provided( [group: 'org.hibernate', name: 'hibernate-tools', version: '3.2.0.ga'] )
     provided( libraries.ant )
-    testCompile( libraries.junit )
     testCompile( project(':hibernate-testing') )
     testCompile( project(path: ':hibernate-entitymanager', configuration: 'tests') )
-    testCompile( libraries.jpa )
-    testRuntime( libraries.h2 )
     testRuntime( libraries.javassist )
 }
 
 sourceSets {
     main {
-        generatedJpaMetamodelSrcDir = file( "${buildDir}/generated-src/jpamodelgen/${name}" )
+        ext.generatedJpaMetamodelSrcDir = file( "${buildDir}/generated-src/jpamodelgen/${name}" )
         java {
             srcDir generatedJpaMetamodelSrcDir
         }