Permalink
Browse files

Merge branch 'spring302'

  • Loading branch information...
2 parents 98aea99 + 5f867a1 commit 124a8c44b83546d860aaf8da4916f5af081d0af3 @graemerocher graemerocher committed May 11, 2010
Showing with 64 additions and 62 deletions.
  1. +21 −19 .classpath
  2. +1 −1 build.properties
  3. +3 −3 dependencies.txt
  4. BIN lib/{aspectjrt-1.6.6.jar → aspectjrt-1.6.8.jar}
  5. BIN lib/{aspectjweaver-1.6.6.jar → aspectjweaver-1.6.8.jar}
  6. BIN lib/{org.springframework.aop-3.0.0.RELEASE.jar → org.springframework.aop-3.0.2.RELEASE.jar}
  7. BIN lib/{org.springframework.asm-3.0.0.RELEASE.jar → org.springframework.asm-3.0.2.RELEASE.jar}
  8. BIN lib/org.springframework.aspects-3.0.0.RELEASE.jar
  9. BIN lib/org.springframework.aspects-3.0.2.RELEASE.jar
  10. BIN lib/org.springframework.beans-3.0.0.RELEASE.jar
  11. BIN lib/org.springframework.beans-3.0.2.RELEASE.jar
  12. BIN lib/org.springframework.context-3.0.0.RELEASE.jar
  13. BIN lib/org.springframework.context-3.0.2.RELEASE.jar
  14. BIN ...mework.context.support-3.0.0.RELEASE.jar → org.springframework.context.support-3.0.2.RELEASE.jar}
  15. BIN lib/{org.springframework.core-3.0.0.RELEASE.jar → org.springframework.core-3.0.2.RELEASE.jar}
  16. BIN lib/org.springframework.expression-3.0.0.RELEASE.jar
  17. BIN lib/org.springframework.expression-3.0.2.RELEASE.jar
  18. BIN lib/org.springframework.instrument-3.0.0.RELEASE.jar
  19. BIN lib/org.springframework.instrument-3.0.2.RELEASE.jar
  20. BIN lib/org.springframework.instrument.tomcat-3.0.2.RELEASE.jar
  21. BIN lib/{org.springframework.jdbc-3.0.0.RELEASE.jar → org.springframework.jdbc-3.0.2.RELEASE.jar}
  22. BIN lib/{org.springframework.jms-3.0.0.RELEASE.jar → org.springframework.jms-3.0.2.RELEASE.jar}
  23. BIN lib/{org.springframework.orm-3.0.0.RELEASE.jar → org.springframework.orm-3.0.2.RELEASE.jar}
  24. BIN lib/org.springframework.oxm-3.0.0.RELEASE.jar
  25. BIN lib/org.springframework.oxm-3.0.2.RELEASE.jar
  26. BIN lib/{org.springframework.test-3.0.0.RELEASE.jar → org.springframework.test-3.0.2.RELEASE.jar}
  27. BIN lib/org.springframework.transaction-3.0.0.RELEASE.jar
  28. BIN lib/org.springframework.transaction-3.0.2.RELEASE.jar
  29. BIN lib/org.springframework.web-3.0.0.RELEASE.jar
  30. BIN lib/org.springframework.web-3.0.2.RELEASE.jar
  31. BIN lib/org.springframework.web.servlet-3.0.0.RELEASE.jar
  32. BIN lib/org.springframework.web.servlet-3.0.2.RELEASE.jar
  33. +19 −19 maven/grails.pom.in
  34. +20 −20 src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
View
@@ -5,22 +5,6 @@
<classpathentry kind="src" path="scripts"/>
<classpathentry kind="src" output="target/eclipse/test-output" path="src/test"/>
<classpathentry kind="lib" path="lib/hibernate-core-3.3.1.GA.jar" sourcepath="/Developer/hibernate-distribution-3.3.1.GA/project/core/src/main/java"/>
- <classpathentry kind="lib" path="lib/org.springframework.aop-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.aop-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.asm-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.asm-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.aspects-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.context.support-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.expression-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.expression-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.instrument-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.instrument-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.jdbc-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.jdbc-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.jms-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.jms-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.orm-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.orm-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.test-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.test-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.transaction-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.transaction-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.web-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.web-sources-3.0.0.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.web.servlet-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.web.servlet-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="lib" path="lib/ant-junit-1.7.1.jar"/>
<classpathentry kind="lib" path="lib/ant-nodeps-1.7.1.jar"/>
<classpathentry kind="lib" path="lib/ant-1.7.1.jar"/>
@@ -56,7 +40,6 @@
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/>
<classpathentry kind="lib" path="lib/org.springframework.binding-2.0.8.RELEASE.jar"/>
<classpathentry kind="lib" path="lib/org.springframework.js-2.0.8.RELEASE.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.webflow-2.0.8.RELEASE.jar" sourcepath="/Developer/spring-webflow-2.0.8.RELEASE/src/org.springframework.webflow-sources-2.0.8.RELEASE.jar"/>
<classpathentry kind="lib" path="lib/standard-1.1.2.jar"/>
<classpathentry kind="lib" path="lib/svnkit-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/xpp3_min-1.1.3.4.O.jar"/>
@@ -70,11 +53,30 @@
<classpathentry kind="lib" path="lib/jline-0.9.91.jar"/>
<classpathentry kind="lib" path="lib/ivy-2.1.0.jar"/>
<classpathentry kind="lib" path="lib/gpars-0.9.jar"/>
- <classpathentry kind="lib" path="lib/aspectjrt-1.6.6.jar"/>
- <classpathentry kind="lib" path="lib/aspectjweaver-1.6.6.jar"/>
<classpathentry kind="lib" path="lib/ehcache-core-1.7.1.jar"/>
<classpathentry kind="lib" path="lib/core-renderer-R8.jar"/>
<classpathentry kind="var" path="ASPECTJRT_LIB"/>
<classpathentry kind="lib" path="lib/groovy-all-1.7.2.jar"/>
+ <classpathentry kind="lib" path="lib/aspectjrt-1.6.8.jar"/>
+ <classpathentry kind="lib" path="lib/aspectjweaver-1.6.8.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.aop-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.asm-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.beans-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.context-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.core-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.expression-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.instrument-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.instrument.tomcat-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.jdbc-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.jms-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.orm-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.oxm-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.test-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.transaction-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.web-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.web.servlet-3.0.2.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.webflow-2.0.8.RELEASE.jar"/>
<classpathentry kind="output" path="target/eclipse/bin-output"/>
</classpath>
View
@@ -17,7 +17,7 @@ bundlor.jndi.version=1.2.0
bundlor.servlet.jsp.version=2.1.0
bundlor.radeox.version=1.0.0.b2
bundlor.groovy.version=1.7.2
-bundlor.spring.version=3.0.0.RELEASE
+bundlor.spring.version=3.0.2.RELEASE
bundlor.ant.version=1.7.1
bundlor.ivy.version=2.0.0
bundlor.gant.version=1.9.2
View
@@ -9,8 +9,8 @@ The following libraries are included in Grails because they are required either
- ANTLR 2.7.6 (http://www.antlr.org) BSD License
- required for running Grails applications (Hibernate)
-* aspectjrt-1.6.6.jar, aspectjweaver-1.6.6.jar
-- AspectJ 1.6.6 (http://www.eclipse.org/aspectj/) Eclipse Public License (EPL)
+* aspectjrt-1.6.8.jar, aspectjweaver-1.6.8.jar
+- AspectJ 1.6.8 (http://www.eclipse.org/aspectj/) Eclipse Public License (EPL)
- required for running Grails applications
* cglib-nodep-2.1_3.jar
@@ -148,7 +148,7 @@ The following libraries are included in Grails because they are required either
- required for running Grails applications
* org.springframework.*.jar
-- Spring Framework 3.0.0.RC2 (http://www.springframework.org) Apache 2.0 License
+- Spring Framework 3.0.2 (http://www.springframework.org) Apache 2.0 License
- required for building Grails core
- required for the command line tools (Gant)
- required for running Grails applications
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -142,7 +142,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -170,7 +170,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -184,7 +184,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -198,7 +198,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -212,7 +212,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-instrument</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -226,7 +226,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -240,7 +240,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -254,7 +254,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -268,7 +268,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -283,7 +283,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -297,7 +297,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -311,7 +311,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -325,7 +325,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>3.0.0.RELEASE</version>
+ <version>3.0.2.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -351,13 +351,13 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.6.6</version>
+ <version>1.6.8</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.6.6</version>
+ <version>1.6.8</version>
</dependency>
</dependencies>
@@ -241,7 +241,7 @@ public class IvyDependencyManager extends AbstractIvyDependencyManager implement
"org.grails:grails-web:$grailsVersion",
"org.slf4j:slf4j-api:1.5.8",
"org.slf4j:slf4j-log4j12:1.5.8",
- "org.springframework:org.springframework.test:3.0.0.RELEASE"
+ "org.springframework:org.springframework.test:3.0.2.RELEASE"
docs "org.xhtmlrenderer:core-renderer:R8",
"com.lowagie:itext:2.0.8",
@@ -276,22 +276,22 @@ public class IvyDependencyManager extends AbstractIvyDependencyManager implement
"org.grails:grails-resources:$grailsVersion",
"org.grails:grails-spring:$grailsVersion",
"org.grails:grails-web:$grailsVersion",
- "org.springframework:org.springframework.core:3.0.0.RELEASE",
- "org.springframework:org.springframework.aop:3.0.0.RELEASE",
- "org.springframework:org.springframework.aspects:3.0.0.RELEASE",
- "org.springframework:org.springframework.asm:3.0.0.RELEASE",
- "org.springframework:org.springframework.beans:3.0.0.RELEASE",
- "org.springframework:org.springframework.context:3.0.0.RELEASE",
- "org.springframework:org.springframework.context.support:3.0.0.RELEASE",
- "org.springframework:org.springframework.expression:3.0.0.RELEASE",
- "org.springframework:org.springframework.instrument:3.0.0.RELEASE",
- "org.springframework:org.springframework.jdbc:3.0.0.RELEASE",
- "org.springframework:org.springframework.jms:3.0.0.RELEASE",
- "org.springframework:org.springframework.orm:3.0.0.RELEASE",
- "org.springframework:org.springframework.oxm:3.0.0.RELEASE",
- "org.springframework:org.springframework.transaction:3.0.0.RELEASE",
- "org.springframework:org.springframework.web:3.0.0.RELEASE",
- "org.springframework:org.springframework.web.servlet:3.0.0.RELEASE",
+ "org.springframework:org.springframework.core:3.0.2.RELEASE",
+ "org.springframework:org.springframework.aop:3.0.2.RELEASE",
+ "org.springframework:org.springframework.aspects:3.0.2.RELEASE",
+ "org.springframework:org.springframework.asm:3.0.2.RELEASE",
+ "org.springframework:org.springframework.beans:3.0.2.RELEASE",
+ "org.springframework:org.springframework.context:3.0.2.RELEASE",
+ "org.springframework:org.springframework.context.support:3.0.2.RELEASE",
+ "org.springframework:org.springframework.expression:3.0.2.RELEASE",
+ "org.springframework:org.springframework.instrument:3.0.2.RELEASE",
+ "org.springframework:org.springframework.jdbc:3.0.2.RELEASE",
+ "org.springframework:org.springframework.jms:3.0.2.RELEASE",
+ "org.springframework:org.springframework.orm:3.0.2.RELEASE",
+ "org.springframework:org.springframework.oxm:3.0.2.RELEASE",
+ "org.springframework:org.springframework.transaction:3.0.2.RELEASE",
+ "org.springframework:org.springframework.web:3.0.2.RELEASE",
+ "org.springframework:org.springframework.web.servlet:3.0.2.RELEASE",
"org.slf4j:slf4j-api:1.5.8") {
transitive = false
}
@@ -300,11 +300,11 @@ public class IvyDependencyManager extends AbstractIvyDependencyManager implement
// dependencies needed for running tests
test "junit:junit:4.8.1",
"org.grails:grails-test:$grailsVersion",
- "org.springframework:org.springframework.test:3.0.0.RELEASE"
+ "org.springframework:org.springframework.test:3.0.2.RELEASE"
// dependencies needed at runtime only
- runtime "org.aspectj:aspectjweaver:1.6.6",
- "org.aspectj:aspectjrt:1.6.6",
+ runtime "org.aspectj:aspectjweaver:1.6.8",
+ "org.aspectj:aspectjrt:1.6.8",
"cglib:cglib-nodep:2.1_3",
"commons-fileupload:commons-fileupload:1.2.1",
"oro:oro:2.0.8",

0 comments on commit 124a8c4

Please sign in to comment.