Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

re-organization of dependency definitions so only the subprojects tha…

…t depend on the a dependency have it declared instead of every subproject inheriting the same set of dependencies. This will help product more valid POMs for Maven usage.
  • Loading branch information...
commit c1535bef4c04d9b2fb53f6d0c4dd84ce49885e0d 1 parent 7c1cf15
@graemerocher graemerocher authored
Showing with 133 additions and 74 deletions.
  1. +12 −55 build.gradle
  2. +10 −0 grails-bootstrap/build.gradle
  3. +29 −0 grails-core/build.gradle
  4. +3 −2 grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/AbstractGrailsClass.java
  5. +1 −1  grails-docs/build.gradle
  6. +16 −6 grails-hibernate/build.gradle
  7. +1 −0  grails-plugin-codecs/build.gradle
  8. +2 −0  grails-plugin-controllers/build.gradle
  9. +0 −1  ...trollers/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/CommandObjectEnablingPostProcessor.java
  10. +3 −0  grails-plugin-converters/build.gradle
  11. +3 −2 grails-plugin-datasource/build.gradle
  12. +1 −0  grails-plugin-gsp/build.gradle
  13. +1 −0  grails-plugin-i18n/build.gradle
  14. +5 −0 grails-plugin-logging/build.gradle
  15. +1 −0  grails-plugin-mimetypes/build.gradle
  16. +2 −0  grails-plugin-services/build.gradle
  17. +5 −0 grails-plugin-url-mappings/build.gradle
  18. +2 −0  grails-spring/build.gradle
  19. +2 −0  grails-test-suite-persistence/build.gradle
  20. +2 −0  grails-test-suite-uber/build.gradle
  21. +1 −0  grails-test-suite-web/build.gradle
  22. +4 −0 grails-test/build.gradle
  23. +9 −0 grails-web/build.gradle
  24. +3 −2 grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/MethodGrailsControllerHelper.java
  25. +3 −2 grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/MixedGrailsControllerHelper.java
  26. +12 −3 grails-webflow/build.gradle
View
67 build.gradle
@@ -12,14 +12,23 @@ buildscript {
apply plugin: 'idea'
+
grailsVersion = '1.4.0.BUILD-SNAPSHOT'
antVersion = "1.8.2"
antTraxVersion = "1.7.1"
+aspectjVersion = "1.6.10"
springVersion = "3.1.0.M1"
+springDatastoreVersion = "1.0.0.BUILD-SNAPSHOT"
springLoadedVersion = "0.8.0.BUILD-SNAPSHOT"
+springWebflowVersion= "2.0.8.RELEASE"
ivyVersion = "2.2.0"
gantVersion = "1.9.5"
groovyVersion = "1.8.0"
+commonsCollectionsVersion = "3.2.1"
+commonsBeanUtilsVersion = "1.8.0"
+commonsIOVersion = "1.4"
+commonsLangVersion = "2.4"
+slf4jVersion = "1.6.1"
archivesBaseName = 'grails'
version = grailsVersion
@@ -40,6 +49,7 @@ subprojects { project ->
apply plugin: 'maven'
apply plugin: 'eclipse'
apply plugin: 'idea'
+ apply plugin: 'project-report'
sourceCompatibility = "1.5"
targetCompatibility = "1.5"
@@ -51,7 +61,6 @@ subprojects { project ->
"Built-By": System.properties['user.name'],
"Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")",
"Implementation-Title": "Grails",
- "Ant-Version": 'Apache Ant 1.8.2', // todo we just have this property to make it easy to compare manifests. Remove it when this build is life
"Implementation-Version": grailsVersion,
"Implementation-Vendor": 'grails.org')
@@ -82,66 +91,14 @@ subprojects { project ->
groovy groovyDependency
compile groovyDependency
- // Jars in lib
- compile files(fileTree(dir:"$projectDir/src/libs" as File))
-
-
- 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-io:commons-io:1.4',
- 'commons-lang:commons-lang:2.4',
- 'commons-validator:commons-validator:1.3.1'
- // Apache Commons
-
- // Others
- runtime( 'cglib:cglib-nodep:2.1_3')
-
- compile 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.1_jdk5'
-
- runtime 'aopalliance:aopalliance:1.0',
- 'org.aspectj:aspectjrt:1.6.10',
- 'org.aspectj:aspectjweaver:1.6.10',
- 'net.sf.ehcache:ehcache-core:2.3.1'
-
-
- // XML
- runtime 'xalan:serializer:2.7.1'
-
// Logging
- compile 'log4j:log4j:1.2.16'
- 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'
-
+ compile "org.slf4j:slf4j-api:$slf4jVersion"
+ compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"
// Specs
compile 'javax.servlet:servlet-api:2.5'
- compile 'javax.transaction:jta:1.1'
compile 'org.hibernate.java-persistence:jpa-api:2.0-cr-1'
- // Spring
-
- compile "org.springframework:spring-aop:${springVersion}",
- "org.springframework:spring-asm:${springVersion}",
- "org.springframework:spring-aspects:${springVersion}",
- "org.springframework:spring-beans:${springVersion}",
- "org.springframework:spring-context:${springVersion}",
- "org.springframework:spring-context-support:${springVersion}",
- "org.springframework:spring-core:${springVersion}",
- "org.springframework:spring-expression:${springVersion}",
- "org.springframework:spring-instrument:${springVersion}",
- "org.springframework:spring-jdbc:${springVersion}",
- "org.springframework:spring-jms:${springVersion}",
- "org.springframework:spring-orm:${springVersion}",
- "org.springframework:spring-oxm:${springVersion}",
- "org.springframework:spring-test:${springVersion}",
- "org.springframework:spring-tx:${springVersion}",
- "org.springframework:spring-web:${springVersion}",
- "org.springframework:spring-webmvc:${springVersion}"
// Testing
testCompile 'junit:junit:4.8.1'
View
10 grails-bootstrap/build.gradle
@@ -4,10 +4,20 @@ repositories {
mavenRepo urls:'http://spring-roo-repository.springsource.org.s3.amazonaws.com/release'
}
dependencies {
+ compile "org.springframework:spring-core:${springVersion}",
+ "org.springframework:spring-beans:${springVersion}",
+ "org.springframework:spring-test:${springVersion}",
+ "org.springframework:spring-context:${springVersion}",
+ "org.springframework:spring-context-support:${springVersion}"
+
+
compile( "org.springframework.uaa:org.springframework.uaa.client:1.0.1.RELEASE" ) {
transitive = false
}
+ compile "commons-lang:commons-lang:$commonsLangVersion"
+ compile 'commons-cli:commons-cli:1.2'
+
// These 3 are required by UAA but not Grails
compile 'com.google.protobuf:protobuf-java:2.3.0',
'com.googlecode.json-simple:json-simple:1.1',
View
29 grails-core/build.gradle
@@ -2,8 +2,37 @@ configurations {
agent.extendsFrom compile
}
dependencies {
+ compile "commons-collections:commons-collections:${commonsCollectionsVersion}"
+ compile "commons-io:commons-io:${commonsIOVersion}"
+ compile "commons-lang:commons-lang:$commonsLangVersion"
+ compile "commons-validator:commons-validator:1.3.1"
+ compile "org.springframework:spring-aop:${springVersion}",
+ "org.springframework:spring-aspects:${springVersion}",
+ "org.springframework:spring-asm:${springVersion}",
+ "org.springframework:spring-core:${springVersion}",
+ "org.springframework:spring-beans:${springVersion}",
+ "org.springframework:spring-context:${springVersion}",
+ "org.springframework:spring-context-support:${springVersion}",
+ "org.springframework:spring-expression:${springVersion}",
+ "org.springframework:spring-test:${springVersion}",
+ "org.springframework:spring-web:${springVersion}"
+
+
runtime 'oro:oro:2.0.8'
+ runtime( 'cglib:cglib-nodep:2.1_3') // Used to generate proxies for classes via Spring AOP
+ runtime 'aopalliance:aopalliance:1.0',
+ "org.aspectj:aspectjrt:$aspectjVersion",
+ "org.aspectj:aspectjweaver:$aspectjVersion"
+ runtime "org.springframework:spring-jms:${springVersion}"
+
agent "com.springsource.springloaded:springloaded-core:$springLoadedVersion"
+
+
+
+
+
+
+ compile "org.springframework:spring-tx:${springVersion}"
compile project(":grails-bootstrap"), project(":grails-spring")
}
View
5 grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/AbstractGrailsClass.java
@@ -22,13 +22,13 @@
import groovy.lang.GroovySystem;
import groovy.lang.MetaClass;
import groovy.lang.MetaProperty;
-import org.apache.commons.beanutils.MethodUtils;
import org.apache.commons.lang.ClassUtils;
import org.apache.commons.lang.StringUtils;
import org.codehaus.groovy.grails.exceptions.NewInstanceCreationException;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
import org.springframework.util.Assert;
+import org.springframework.util.ReflectionUtils;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Constructor;
@@ -168,7 +168,8 @@ public boolean isReadableProperty(String propName) {
}
public boolean isActionMethod(String methodName) {
- Method m = MethodUtils.getAccessibleMethod(getClazz(), methodName, new Class[0]);
+ Method m = ReflectionUtils.findMethod(getClazz(), methodName, new Class[0]);
+ ReflectionUtils.makeAccessible(m);
return m != null && m.getAnnotation(Action.class) != null;
}
View
2  grails-docs/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compile "commons-lang:commons-lang:$commonsLangVersion"
compile 'com.lowagie:itext:2.1.7',
'org.xhtmlrenderer:core-renderer:R8',
- 'commons-lang:commons-lang:2.4',
'org.grails:grails-gdoc-engine:1.0-SNAPSHOT'
compile project(":grails-core"),project(":grails-bootstrap")
}
View
22 grails-hibernate/build.gradle
@@ -1,5 +1,8 @@
dependencies {
+ compile "commons-lang:commons-lang:$commonsLangVersion"
+ compile "commons-beanutils:commons-beanutils:${commonsBeanUtilsVersion}"
+
compile project(":grails-bootstrap"),
project(":grails-core"),
project(":grails-spring"),
@@ -7,24 +10,31 @@ dependencies {
project(":grails-plugin-domain-class")
- // Srping Datastore APIs
- compile( 'org.grails:grails-datastore-gorm:1.0.0.BUILD-SNAPSHOT' ) {
+ // Specs
+ compile 'javax.transaction:jta:1.1'
+
+ // Spring Datastore APIs
+ compile( "org.grails:grails-datastore-gorm:$springDatastoreVersion" ) {
transitive = false
}
- compile( 'org.springframework:spring-datastore-core:1.0.0.BUILD-SNAPSHOT' ) {
+ compile( "org.springframework:spring-datastore-core:$springDatastoreVersion" ) {
transitive = false
}
- compile( 'org.springframework:spring-datastore-simple:1.0.0.BUILD-SNAPSHOT' ) {
+ compile( "org.springframework:spring-datastore-simple:$springDatastoreVersion" ) {
transitive = false
}
+ compile "org.springframework:spring-jdbc:${springVersion}"
+ compile "org.springframework:spring-orm:${springVersion}"
+ compile "org.springframework:spring-tx:${springVersion}"
+
// Hibernate related
compile 'org.hibernate:hibernate-core:3.6.1.Final'
compile 'javassist:javassist:3.11.0.GA'
+ compile 'javax.transaction:jta:1.1'
-
-
+ runtime 'net.sf.ehcache:ehcache-core:2.3.1'
runtime 'org.hibernate:hibernate-validator:4.1.0.Final',
'org.hibernate:hibernate-ehcache:3.6.1.Final',
'antlr:antlr:2.7.6'
View
1  grails-plugin-codecs/build.gradle
@@ -1,4 +1,5 @@
dependencies {
+ compile 'commons-codec:commons-codec:1.4'
compile project(":grails-web")
}
jar.appendix = 'plugin-codecs'
View
2  grails-plugin-controllers/build.gradle
@@ -1,4 +1,6 @@
dependencies {
+ compile "commons-lang:commons-lang:$commonsLangVersion"
+ compile "commons-beanutils:commons-beanutils:${commonsBeanUtilsVersion}"
compile project(":grails-core"),
project(":grails-web"),
project(':grails-plugin-converters'),
View
1  ...llers/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/CommandObjectEnablingPostProcessor.java
@@ -17,7 +17,6 @@
import grails.web.Action;
import groovy.lang.Closure;
import groovy.lang.GroovyObject;
-import org.apache.commons.beanutils.MethodUtils;
import org.codehaus.groovy.grails.commons.ControllerArtefactHandler;
import org.codehaus.groovy.grails.commons.GrailsApplication;
import org.codehaus.groovy.grails.plugins.support.BeanPostProcessorAdapter;
View
3  grails-plugin-converters/build.gradle
@@ -1,4 +1,7 @@
dependencies {
+ compile "commons-lang:commons-lang:$commonsLangVersion"
+ compile "commons-io:commons-io:${commonsIOVersion}"
+
compile project(":grails-web"),
project(':grails-plugin-domain-class')
}
View
5 grails-plugin-datasource/build.gradle
@@ -1,9 +1,10 @@
dependencies {
+
+ compile "org.springframework:spring-jdbc:${springVersion}"
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'
+ runtime 'com.h2database:h2:1.2.147'
compile project(":grails-core"),
project(':grails-bootstrap')
View
1  grails-plugin-gsp/build.gradle
@@ -1,5 +1,6 @@
dependencies {
+ compile "commons-lang:commons-lang:$commonsLangVersion"
compile project(":grails-web"),
project(":grails-plugin-codecs"),
project(":grails-plugin-logging"),
View
1  grails-plugin-i18n/build.gradle
@@ -1,4 +1,5 @@
dependencies {
+ compile "commons-lang:commons-lang:$commonsLangVersion"
compile project(":grails-web")
}
View
5 grails-plugin-logging/build.gradle
@@ -1,5 +1,10 @@
dependencies {
+ compile "commons-beanutils:commons-beanutils:${commonsBeanUtilsVersion}"
compile 'log4j:log4j:1.2.16'
+
+ runtime "org.slf4j:slf4j-log4j12:$slf4jVersion"
+ runtime "org.slf4j:jul-to-slf4j:$slf4jVersion"
+
compile project(":grails-core"),
project(':grails-bootstrap'),
project(':grails-web')
View
1  grails-plugin-mimetypes/build.gradle
@@ -1,4 +1,5 @@
dependencies {
+ compile "commons-collections:commons-collections:${commonsCollectionsVersion}"
compile project(":grails-web")
}
jar.appendix = 'plugin-mimetypes'
View
2  grails-plugin-services/build.gradle
@@ -1,4 +1,6 @@
dependencies {
+ compile "org.springframework:spring-tx:${springVersion}"
+
compile project(":grails-core"),
project(':grails-bootstrap')
}
View
5 grails-plugin-url-mappings/build.gradle
@@ -1,4 +1,9 @@
dependencies {
+ compile "commons-lang:commons-lang:$commonsLangVersion"
+ compile "commons-io:commons-io:${commonsIOVersion}"
+
+ compile 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.1_jdk5'
+
compile project(":grails-web"), project(":grails-plugin-controllers")
}
jar.appendix = 'plugin-url-mappings'
View
2  grails-spring/build.gradle
@@ -1,4 +1,6 @@
dependencies {
+ compile "org.springframework:spring-tx:${springVersion}"
+ compile "org.springframework:spring-web:${springVersion}"
compile project(":grails-bootstrap")
}
jar.appendix = 'spring'
View
2  grails-test-suite-persistence/build.gradle
@@ -1,5 +1,7 @@
dependencies {
+ testCompile "commons-beanutils:commons-beanutils:${commonsBeanUtilsVersion}"
+
testCompile 'net.sf.ehcache:ehcache-core:2.3.1'
testCompile project(':grails-test-suite-base'),
View
2  grails-test-suite-uber/build.gradle
@@ -1,5 +1,6 @@
// dependencies
dependencies {
+
compile project(':grails-hibernate'),
project(':grails-test-suite-base'),
project(':grails-plugin-testing')
@@ -9,6 +10,7 @@ dependencies {
testRuntime 'jstl:jstl:1.1.2'
testRuntime 'javax.el:el-api:1.0'
+ testCompile "commons-io:commons-io:${commonsIOVersion}"
testCompile project(':grails-plugin-codecs'),
project(':grails-plugin-domain-class') ,
project(':grails-plugin-url-mappings') ,
View
1  grails-test-suite-web/build.gradle
@@ -4,6 +4,7 @@ dependencies {
testRuntime 'jstl:jstl:1.1.2'
testRuntime 'javax.el:el-api:1.0'
+ testCompile "commons-io:commons-io:${commonsIOVersion}"
testCompile project(':grails-test-suite-base'),
project(':grails-plugin-testing'),
project(':grails-plugin-domain-class'),
View
4 grails-test/build.gradle
@@ -1,4 +1,8 @@
dependencies {
+
+ compile "org.springframework:spring-tx:${springVersion}"
+
+
// Testing
compile 'junit:junit:4.8.1', project(":grails-plugin-converters"), project(":grails-plugin-mimetypes")
View
9 grails-web/build.gradle
@@ -8,9 +8,18 @@ dependencies {
compile( 'commons-el:commons-el:1.0' ) {
exclude module:'commons-logging'
}
+
+ compile "commons-beanutils:commons-beanutils:${commonsBeanUtilsVersion}"
+ compile "commons-collections:commons-collections:${commonsCollectionsVersion}"
compile('commons-fileupload:commons-fileupload:1.2.1')
+ compile "commons-io:commons-io:${commonsIOVersion}"
+ compile "commons-lang:commons-lang:$commonsLangVersion"
+
+ compile 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.1_jdk5'
compile 'opensymphony:sitemesh:2.4'
+ compile "org.springframework:spring-webmvc:${springVersion}"
+
// Required for JSP support
compile 'javax.servlet:jsp-api:2.0'
compile 'xpp3:xpp3_min:1.1.4c'
View
5 grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/MethodGrailsControllerHelper.java
@@ -17,8 +17,8 @@
import grails.web.Action;
import groovy.lang.GroovyObject;
-import org.apache.commons.beanutils.MethodUtils;
import org.codehaus.groovy.grails.web.servlet.mvc.exceptions.ControllerExecutionException;
+import org.springframework.util.ReflectionUtils;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -37,7 +37,8 @@
@Override
protected Method retrieveAction(GroovyObject controller, String actionName, HttpServletResponse response) {
- Method action = MethodUtils.getAccessibleMethod(controller.getClass(), actionName, NOARGS);
+ Method action = ReflectionUtils.findMethod(controller.getClass(), actionName, NOARGS);
+ ReflectionUtils.makeAccessible(action);
if (action == null || action.getAnnotation(Action.class) == null) {
try {
View
5 grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/MixedGrailsControllerHelper.java
@@ -19,8 +19,8 @@
import groovy.lang.Closure;
import groovy.lang.GroovyObject;
import groovy.lang.MissingPropertyException;
-import org.apache.commons.beanutils.MethodUtils;
import org.codehaus.groovy.grails.web.servlet.mvc.exceptions.ControllerExecutionException;
+import org.springframework.util.ReflectionUtils;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -37,7 +37,8 @@
@Override
protected Object retrieveAction(GroovyObject controller, String actionName, HttpServletResponse response) {
- Method mAction = MethodUtils.getAccessibleMethod(controller.getClass(),actionName, MethodGrailsControllerHelper.NOARGS);
+ Method mAction = ReflectionUtils.findMethod(controller.getClass(), actionName, MethodGrailsControllerHelper.NOARGS);
+ ReflectionUtils.makeAccessible(mAction);
if (mAction != null && mAction.getAnnotation(Action.class) != null) {
return mAction;
View
15 grails-webflow/build.gradle
@@ -1,9 +1,18 @@
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",
- "org.springframework.webflow:spring-webflow:2.0.8.RELEASE"
+ compile( "org.springframework.webflow:spring-binding:$springWebflowVersion") {
+ transitive = false
+ }
+ compile("org.springframework.webflow:spring-js:$springWebflowVersion") {
+ transitive = false
+ }
+ compile("org.springframework.webflow:spring-webflow:$springWebflowVersion" ) {
+ transitive = false
+ }
+
+ compile "org.springframework:spring-orm:${springVersion}"
+ compile "org.springframework:spring-tx:${springVersion}"
compile project(":grails-web"), project(':grails-hibernate'), project(':grails-plugin-controllers')
}
Please sign in to comment.
Something went wrong with that request. Please try again.