moved dependencies around to actual dependent projects, this will pro…

…duce more valid POMs
grails · Feb 23, 2011 · 43f8b19 · 43f8b19
1 parent 636513a
commit 43f8b19
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 59 deletions.
diff --git a/build.gradle b/build.gradle
@@ -61,82 +61,44 @@ subprojects { project ->
 		// Jars in lib
 		compile files(fileTree(dir:"$projectDir/src/libs" as File))
 
-		// Ant
-		compile "org.apache.ant:ant:${antVersion}",
-	 			"org.apache.ant:ant-launcher:${antVersion}",
-				"org.apache.ant:ant-junit:${antVersion}",	
-				"org.apache.ant:ant-nodeps:${antVersion}",			
-				"org.apache.ant:ant-trax:${antVersion}",
-				"org.apache.ivy:ivy:2.2.0",
-				'org.codehaus.gant:gant_groovy1.7:1.9.3'
-
-
-		// Apache Commons
-		compile 'commons-beanutils:commons-beanutils:1.8.0'	,
+
+        compile 'commons-beanutils:commons-beanutils:1.8.0'	,
 				'commons-cli:commons-cli:1.0',
 				'commons-codec:commons-codec:1.4',
 				'commons-collections:commons-collections:3.2.1',
-				'commons-dbcp:commons-dbcp:1.3',
-				'commons-el:commons-el:1.0',
-				'commons-fileupload:commons-fileupload:1.2.1',
 				'commons-io:commons-io:1.4',
 				'commons-lang:commons-lang:2.4',
-				'commons-pool:commons-pool:1.5.5',
 				'commons-validator:commons-validator:1.3.1'
+        // Apache Commons
 
 		// Others
-		compile( 'cglib:cglib-nodep:2.1_3',
-				 'org.fusesource.jansi:jansi:1.2.1',
-				 'oro:oro:2.0.8',
-				 'jline:jline:0.9.94',
-				 'opensymphony:sitemesh:2.4',
-				 'org.tmatesoft.svnkit:svnkit:1.3.4',
-				 'ognl:ognl:2.7.3',
-				 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.1_jdk5') 
+		runtime( 'cglib:cglib-nodep:2.1_3')
+
+		compile 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.1_jdk5'
 
 		runtime 'aopalliance:aopalliance:1.0',
-	  		    'com.h2database:h2:1.2.147',
-				'hsqldb:hsqldb:1.8.0.10',
 				'org.aspectj:aspectjrt:1.6.10',
 				'org.aspectj:aspectjweaver:1.6.10',
-				'net.sf.ehcache:ehcache-core:2.3.1',
-				'org.coconut.forkjoin:jsr166y:070108'
+				'net.sf.ehcache:ehcache-core:2.3.1'
 
 
-		// Testing
-		compile 'junit:junit:4.8.1'
-
 		// XML
-		compile 'xpp3:xpp3_min:1.1.4c'
-		compile 'xalan:serializer:2.7.1'
+		runtime 'xalan:serializer:2.7.1'
 
 		// Logging
 		compile 'log4j:log4j:1.2.16'
-		compile 'org.slf4j:slf4j-log4j12:1.6.1'
-		compile 'org.slf4j:slf4j-api:1.6.1'
-		compile 'org.slf4j:jcl-over-slf4j:1.6.1'
-		compile 'org.slf4j:jul-to-slf4j:1.6.1'	
+        compile 'org.slf4j:slf4j-api:1.6.1'
+        compile 'org.slf4j:jcl-over-slf4j:1.6.1'
+
+        runtime'org.slf4j:slf4j-log4j12:1.6.1'
+        runtime 'org.slf4j:jul-to-slf4j:1.6.1'
 
 
 		// Specs
-        compile 'javax.el:el-api:1.0'
-		compile 'javax.servlet:jsp-api:2.0'
-		compile 'javax.servlet:servlet-api:2.5'
-		compile 'javax.servlet:jstl:1.2'
-		compile 'taglibs:standard:1.1.2'
-		compile 'net.sf.jsr107cache:jsr107cache:1.0'
+        compile 'javax.servlet:servlet-api:2.5'
 		compile 'javax.transaction:jta:1.1'
 		compile 'javax.persistence:persistence-api:1.0'
 
-		// Hibernate related
-		compile 'org.hibernate:hibernate-annotations:3.4.0.GA',
-				'org.hibernate:hibernate-commons-annotations:3.1.0.GA',
-				'org.hibernate:hibernate-core:3.3.1.GA',
-				'org.hibernate:hibernate-validator:3.1.0.GA',
-				'org.hibernate:hibernate-ehcache:3.3.1.GA',
-				'javassist:javassist:3.11.0.GA',
-				'antlr:antlr:2.7.6'
-
 		// Spring
 
 		compile "org.springframework:spring-aop:${springVersion}",
@@ -156,10 +118,9 @@ subprojects { project ->
 				"org.springframework:spring-web:${springVersion}",
 				"org.springframework:spring-webmvc:${springVersion}"
 
+		// Testing
+		testCompile 'junit:junit:4.8.1'
 
-		compile( 'org.codehaus.gpars:gpars:0.9' ) {
-			exclude module:'netty'
-		}
 	}
 
     install.doLast {

diff --git a/grails-bootstrap/build.gradle b/grails-bootstrap/build.gradle
@@ -1,5 +1,20 @@
 dependencies {
     groovy group: 'org.codehaus.groovy', name: 'groovy-all', version: '1.8.0-beta-4'
+
+    compile( 'org.codehaus.gpars:gpars:0.9' ) {
+        exclude module:'netty'
+    }
+
+    // Ant
+    compile "org.apache.ant:ant:${antVersion}",
+            "org.apache.ant:ant-launcher:${antVersion}",
+            "org.apache.ant:ant-junit:${antVersion}",
+            "org.apache.ant:ant-nodeps:${antVersion}",
+            "org.apache.ant:ant-trax:${antVersion}",
+            "org.apache.ivy:ivy:2.2.0",
+            'org.codehaus.gant:gant_groovy1.7:1.9.3'
+
+    runtime 'org.coconut.forkjoin:jsr166y:070108'
 }
 
 compileGroovy.doFirst {

diff --git a/grails-core/build.gradle b/grails-core/build.gradle
@@ -1,4 +1,5 @@
 dependencies {
+    runtime 'oro:oro:2.0.8'
     compile project(":grails-bootstrap"), project(":grails-spring")
 }
 

diff --git a/grails-hibernate/build.gradle b/grails-hibernate/build.gradle
@@ -5,11 +5,14 @@ dependencies {
     // Hibernate related
     compile 'org.hibernate:hibernate-annotations:3.4.0.GA',
             'org.hibernate:hibernate-commons-annotations:3.1.0.GA',
-            'org.hibernate:hibernate-core:3.3.1.GA',
-            'org.hibernate:hibernate-validator:3.1.0.GA',
+            'org.hibernate:hibernate-core:3.3.1.GA'
+    compile 'javassist:javassist:3.11.0.GA'
+
+
+
+    runtime 'org.hibernate:hibernate-validator:3.1.0.GA',
             'org.hibernate:hibernate-ehcache:3.3.1.GA',
-            'javassist:javassist:3.11.0.GA',
-            'antlr:antlr:2.7.6'    
+            'antlr:antlr:2.7.6'
 
 
 }

diff --git a/grails-plugin-datasource/build.gradle b/grails-plugin-datasource/build.gradle
@@ -1,4 +1,10 @@
 dependencies {
+    compile     'commons-pool:commons-pool:1.5.5',
+				'commons-dbcp:commons-dbcp:1.3'
+
+    runtime 'com.h2database:h2:1.2.147',
+			'hsqldb:hsqldb:1.8.0.10'
+
     compile project(":grails-core")
 }
 

diff --git a/grails-scripts/build.gradle b/grails-scripts/build.gradle
@@ -1,4 +1,16 @@
 dependencies {
+    // Testing
+    compile 'junit:junit:4.8.1'
+    // Ant
+    compile "org.apache.ant:ant:${antVersion}",
+            "org.apache.ant:ant-launcher:${antVersion}",
+            "org.apache.ant:ant-junit:${antVersion}",
+            "org.apache.ant:ant-nodeps:${antVersion}",
+            "org.apache.ant:ant-trax:${antVersion}",
+            "org.apache.ivy:ivy:2.2.0",
+            'org.codehaus.gant:gant_groovy1.7:1.9.3'
+
+    compile 'org.tmatesoft.svnkit:svnkit:1.3.4'
 	compile project(":grails-web"), 
 			project(':grails-hibernate'),
 			project(':grails-docs'), 

diff --git a/grails-test/build.gradle b/grails-test/build.gradle
@@ -1,4 +1,7 @@
 dependencies {
+    // Testing
+    compile 'junit:junit:4.8.1'
+
     compile project(":grails-web")
 }
 jar.appendix = 'test'
diff --git a/grails-web/build.gradle b/grails-web/build.gradle
@@ -5,6 +5,19 @@ dependencies {
     jsp21 'javax.servlet.jsp:jsp-api:2.1'
 
     compile  project(":grails-bootstrap"), project(":grails-core"), project(":grails-spring")
+    compile( 'commons-el:commons-el:1.0' ) {
+         exclude module:'commons-logging'
+    }
+    compile('commons-fileupload:commons-fileupload:1.2.1')
+    compile 'opensymphony:sitemesh:2.4'
+
+    // Required for JSP support
+    compile 'javax.servlet:jsp-api:2.0'
+    compile 'javax.servlet:jstl:1.2'
+    compile 'xpp3:xpp3_min:1.1.4c'
+    runtime 'taglibs:standard:1.1.2'
+    runtime 'javax.el:el-api:1.0'
+
 }
 sourceSets {
     jsp21 {

diff --git a/grails-webflow/build.gradle b/grails-webflow/build.gradle
@@ -1,4 +1,5 @@
 dependencies {
+    runtime 'ognl:ognl:2.7.3'
     // Spring Web Flow
     compile "org.springframework.webflow:spring-binding:2.0.8.RELEASE",
             "org.springframework.webflow:spring-js:2.0.8.RELEASE",