[hibernate-commits] Hibernate SVN: r19815 - in core/branches/gradle2: hibernate-entitymanager and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2010-06-24 02:10:03 -0400 (Thu, 24 Jun 2010)
New Revision: 19815

Modified:
   core/branches/gradle2/build.gradle
   core/branches/gradle2/hibernate-entitymanager/hibernate-entitymanager.gradle
   core/branches/gradle2/hibernate-release/hibernate-release.gradle
Log:
centralize repository definitions in root build.gradle

Modified: core/branches/gradle2/build.gradle
===================================================================
--- core/branches/gradle2/build.gradle	2010-06-24 04:19:25 UTC (rev 19814)
+++ core/branches/gradle2/build.gradle	2010-06-24 06:10:03 UTC (rev 19815)
@@ -1,16 +1,34 @@
 buildscript {
-    repositories {
-        mavenRepo urls: 'http://gradle.artifactoryonline.com/gradle/plugins'
-    }
     dependencies {
         classpath "org.gradle.plugins:gradle-idea-plugin:0.3"
     }
 }
 
 allprojects {
+    buildscript {
+        repositories {
+            mavenRepo urls: 'http://gradle.artifactoryonline.com/gradle/plugins'
+            mavenRepo name: 'jboss-nexus', urls: "https://repository.jboss.org/nexus/content/groups/public/"
+            mavenRepo name: "jboss-snapshots", urls: "http://snapshots.jboss.org/maven2/"
+            mavenRepo urls: "file://" + System.getProperty('user.home') + "/.m2/repository/"
+        }
+    }
+
+    repositories {
+        mavenCentral()
+        mavenRepo name: 'jboss-nexus', urls: "https://repository.jboss.org/nexus/content/groups/public/"
+        mavenRepo name: "jboss-snapshots", urls: "http://snapshots.jboss.org/maven2/"
+        mavenRepo urls: "file://" + System.getProperty('user.home') + "/.m2/repository/"
+    }
+
     apply plugin: 'org.gradle.idea'
 }
 
+apply plugin: org.hibernate.gradle.testing.database.DatabaseMatrixPlugin
+databases {
+    baseDir 'databases'
+}
+
 ideaProject {
     javaVersion = "1.5"
 }
@@ -75,13 +93,6 @@
     // minimize changes, at least for now (gradle uses 'build' by default)..
     buildDirName = "target"
 
-    repositories {
-        mavenCentral()
-        mavenRepo name: 'jboss-nexus', urls: "https://repository.jboss.org/nexus/content/groups/public/"
-        mavenRepo name: "jboss-snapshots", urls: "http://snapshots.jboss.org/maven2/"
-        mavenRepo urls: "file://" + System.getProperty('user.home') + "/.m2/repository/"
-    }
-
     if ( 'hibernate-release' == subProject.name ) {
         apply plugin : 'base'
     }

Modified: core/branches/gradle2/hibernate-entitymanager/hibernate-entitymanager.gradle
===================================================================
--- core/branches/gradle2/hibernate-entitymanager/hibernate-entitymanager.gradle	2010-06-24 04:19:25 UTC (rev 19814)
+++ core/branches/gradle2/hibernate-entitymanager/hibernate-entitymanager.gradle	2010-06-24 06:10:03 UTC (rev 19815)
@@ -4,15 +4,11 @@
 // todo : there are test failures due to issues with how 'bundles' are handled.
 //      My guess is using TCCL as the tests try to is not valid in Gradle.
 
-buildscript {
-    repositories {
-        mavenRepo name: 'jboss-nexus', urls: "https://repository.jboss.org/nexus/content/groups/public/"
-        mavenRepo urls: "file://" + System.getProperty('user.home') + "/.m2/repository/"
-    }
-    dependencies {
-        classpath libraries.jpa_modelgen
-    }
-}
+//buildscript {
+//    dependencies {
+//        classpath libraries.jpa_modelgen
+//    }
+//}
 
 dependencies {
     shrinkwrapVersion = '1.0.0-alpha-6'

Modified: core/branches/gradle2/hibernate-release/hibernate-release.gradle
===================================================================
--- core/branches/gradle2/hibernate-release/hibernate-release.gradle	2010-06-24 04:19:25 UTC (rev 19814)
+++ core/branches/gradle2/hibernate-release/hibernate-release.gradle	2010-06-24 06:10:03 UTC (rev 19815)
@@ -1,12 +1,12 @@
 buildscript {
-    repositories {
-        mavenRepo name: "jboss", urls: "https://repository.jboss.org/nexus/content/groups/public/"
-        mavenRepo name: "mavenCache", urls: "file://" + System.getProperty('user.home') + "/.m2/repository/"
-    }
+//    repositories {
+//        mavenRepo name: "jboss", urls: "https://repository.jboss.org/nexus/content/groups/public/"
+//        mavenRepo name: "mavenCache", urls: "file://" + System.getProperty('user.home') + "/.m2/repository/"
+//    }
     dependencies {
         classpath "org.jboss.jdocbook:gradle-jdocbook:1.0.0-SNAPSHOT"
-        classpath "org.hibernate:hibernate-jdocbook-style:2.0.1"
-        classpath gradleApi()
+//        classpath "org.hibernate:hibernate-jdocbook-style:2.0.1"
+//        classpath gradleApi()
     }
 }
 
@@ -207,7 +207,7 @@
     from new File( parent.projectDir, 'changelog.txt' )
     from new File( parent.projectDir, 'hibernate_logo.gif' )
     from tasks.uberJar.archivePath
-    from parent.project( 'hibernate-testing' ).artifacts
+//    from parent.project( 'hibernate-testing' ).artifacts
 
     into('lib/required') {
         from parent.project( 'hibernate-core' ).configurations.runtime