Permalink
Browse files

Merge branch 'master' of github.com:grails/grails-core

  • Loading branch information...
2 parents c2534e5 + 374bcf8 commit 26d2da457056c1baa0dceff864e14a381e09596f @graemerocher graemerocher committed Jun 16, 2010
Showing with 1,588 additions and 1,542 deletions.
  1. +18 −18 .classpath
  2. +1 −1 bin/startGrails
  3. +2 −2 bin/startGrails.bat
  4. +1 −1 build.gradle
  5. +3 −3 build.properties
  6. +1 −1 dependencies.txt
  7. +18 −18 grails.ipr
  8. BIN lib/{org.springframework.aop-3.0.2.RELEASE.jar → org.springframework.aop-3.0.3.RELEASE.jar}
  9. BIN lib/{org.springframework.asm-3.0.2.RELEASE.jar → org.springframework.asm-3.0.3.RELEASE.jar}
  10. BIN lib/org.springframework.aspects-3.0.2.RELEASE.jar
  11. BIN lib/org.springframework.aspects-3.0.3.RELEASE.jar
  12. BIN lib/{org.springframework.beans-3.0.2.RELEASE.jar → org.springframework.beans-3.0.3.RELEASE.jar}
  13. BIN lib/{org.springframework.context-3.0.2.RELEASE.jar → org.springframework.context-3.0.3.RELEASE.jar}
  14. BIN ...mework.context.support-3.0.2.RELEASE.jar → org.springframework.context.support-3.0.3.RELEASE.jar}
  15. BIN lib/{org.springframework.core-3.0.2.RELEASE.jar → org.springframework.core-3.0.3.RELEASE.jar}
  16. BIN ....springframework.expression-3.0.2.RELEASE.jar → org.springframework.expression-3.0.3.RELEASE.jar}
  17. BIN lib/org.springframework.instrument-3.0.2.RELEASE.jar
  18. BIN lib/org.springframework.instrument-3.0.3.RELEASE.jar
  19. BIN lib/org.springframework.instrument.tomcat-3.0.2.RELEASE.jar
  20. BIN lib/org.springframework.instrument.tomcat-3.0.3.RELEASE.jar
  21. BIN lib/{org.springframework.jdbc-3.0.2.RELEASE.jar → org.springframework.jdbc-3.0.3.RELEASE.jar}
  22. BIN lib/{org.springframework.jms-3.0.2.RELEASE.jar → org.springframework.jms-3.0.3.RELEASE.jar}
  23. BIN lib/{org.springframework.orm-3.0.2.RELEASE.jar → org.springframework.orm-3.0.3.RELEASE.jar}
  24. BIN lib/{org.springframework.oxm-3.0.2.RELEASE.jar → org.springframework.oxm-3.0.3.RELEASE.jar}
  25. BIN lib/{org.springframework.test-3.0.2.RELEASE.jar → org.springframework.test-3.0.3.RELEASE.jar}
  26. BIN ...pringframework.transaction-3.0.2.RELEASE.jar → org.springframework.transaction-3.0.3.RELEASE.jar}
  27. BIN lib/{org.springframework.web-3.0.2.RELEASE.jar → org.springframework.web-3.0.3.RELEASE.jar}
  28. BIN ...pringframework.web.servlet-3.0.2.RELEASE.jar → org.springframework.web.servlet-3.0.3.RELEASE.jar}
  29. +17 −17 maven/grails.pom.in
  30. +3 −3 samples/petclinic-mvc/ivy.xml
  31. +3 −3 samples/petclinic/application.properties
  32. +1 −1 scripts/DependencyReport.groovy
  33. +19 −5 src/java/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassProperty.java
  34. +1 −1 src/java/org/codehaus/groovy/grails/compiler/injection/GrailsASTUtils.java
  35. +6 −2 src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java
  36. +3 −1 src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/gorm.xsd
  37. +18 −18 src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
  38. +123 −121 src/java/org/codehaus/groovy/grails/web/servlet/DefaultGrailsApplicationAttributes.java
  39. +55 −47 src/java/org/codehaus/groovy/grails/web/servlet/ErrorHandlingServlet.java
  40. +6 −5 src/java/org/codehaus/groovy/grails/web/servlet/FlashScope.java
  41. +54 −49 src/java/org/codehaus/groovy/grails/web/servlet/GrailsApplicationAttributes.java
  42. +22 −26 src/java/org/codehaus/groovy/grails/web/servlet/GrailsControllerHandlerMapping.java
  43. +2 −1 src/java/org/codehaus/groovy/grails/web/servlet/GrailsDispatcherServlet.java
  44. +61 −52 src/java/org/codehaus/groovy/grails/web/servlet/GrailsFlashScope.java
  45. +13 −19 src/java/org/codehaus/groovy/grails/web/servlet/GrailsRequestContext.java
  46. +6 −10 src/java/org/codehaus/groovy/grails/web/servlet/GrailsUrlPathHelper.java
  47. +60 −62 src/java/org/codehaus/groovy/grails/web/servlet/HttpHeaders.java
  48. +22 −22 src/java/org/codehaus/groovy/grails/web/servlet/WebRequestDelegatingRequestContext.java
  49. +5 −11 src/java/org/codehaus/groovy/grails/web/servlet/WrappedResponseHolder.java
  50. +23 −21 src/java/org/codehaus/groovy/grails/web/servlet/filter/GrailsReloadServletFilter.java
  51. +5 −5 src/java/org/codehaus/groovy/grails/web/servlet/filter/ResourceCopier.java
  52. +3 −7 src/java/org/codehaus/groovy/grails/web/servlet/mvc/AbstractTokenResponseHandler.java
  53. +11 −9 src/java/org/codehaus/groovy/grails/web/servlet/mvc/CommandObjectEnablingPostProcessor.java
  54. +80 −81 src/java/org/codehaus/groovy/grails/web/servlet/mvc/GrailsControllerHelper.java
  55. +95 −88 src/java/org/codehaus/groovy/grails/web/servlet/mvc/GrailsHttpSession.java
  56. +130 −146 src/java/org/codehaus/groovy/grails/web/servlet/mvc/GrailsParameterMap.groovy
  57. +19 −19 src/java/org/codehaus/groovy/grails/web/servlet/mvc/GrailsUrlHandlerMapping.java
  58. +147 −150 src/java/org/codehaus/groovy/grails/web/servlet/mvc/GrailsWebRequest.java
  59. +2 −5 src/java/org/codehaus/groovy/grails/web/servlet/mvc/ParameterInitializationCallback.java
  60. +23 −33 src/java/org/codehaus/groovy/grails/web/servlet/mvc/SimpleGrailsController.java
  61. +173 −174 src/java/org/codehaus/groovy/grails/web/servlet/mvc/SimpleGrailsControllerHelper.java
  62. +9 −9 src/java/org/codehaus/groovy/grails/web/servlet/mvc/SynchronizerToken.groovy
  63. +4 −7 src/java/org/codehaus/groovy/grails/web/servlet/mvc/TokenResponseHandler.java
  64. +9 −8 src/java/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/CannotRedirectException.groovy
  65. +13 −17 src/java/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/ControllerExecutionException.java
  66. +19 −21 src/java/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/GrailsMVCException.java
  67. +19 −21 ...va/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/IncompatibleParameterCountException.java
  68. +19 −21 src/java/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/InvalidUriException.java
  69. +19 −21 src/java/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/NoClosurePropertyForURIException.java
  70. +19 −21 src/java/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/NoViewNameDefinedException.java
  71. +18 −20 src/java/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/UnknownControllerException.java
  72. +19 −21 src/java/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/UnsupportedReturnValueException.java
  73. +6 −9 src/java/org/codehaus/groovy/grails/web/servlet/view/GrailsViewResolver.java
  74. +70 −70 src/java/org/codehaus/groovy/grails/web/servlet/view/GroovyPageView.java
  75. +8 −7 src/java/org/codehaus/groovy/grails/web/servlet/view/NullView.java
  76. +1 −1 src/test/grails/util/GrailsUtilTests.java
  77. +25 −0 src/test/org/codehaus/groovy/grails/compiler/injection/GrailsASTUtilsTests.groovy
  78. +47 −0 src/test/org/codehaus/groovy/grails/orm/hibernate/ComponentMappingTests.groovy
  79. +5 −7 src/test/org/codehaus/groovy/grails/orm/hibernate/IdInheritanceTests.groovy
  80. +4 −3 src/test/org/codehaus/groovy/grails/orm/hibernate/MappingDslTests.groovy
View
@@ -59,24 +59,24 @@
<classpathentry kind="lib" path="lib/groovy-all-1.7.3.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.aop-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.asm-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.beans-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.context-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.core-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.expression-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.instrument-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.instrument.tomcat-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.jdbc-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.jms-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.orm-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.oxm-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.test-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.transaction-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.web-3.0.3.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.web.servlet-3.0.3.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
@@ -114,7 +114,7 @@ fi
if [ -z "$GROOVY_CONF" ]; then
GROOVY_CONF="$GRAILS_HOME/conf/groovy-starter.conf"
fi
-STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.3.jar:$GRAILS_HOME/dist/grails-bootstrap-1.3.2.BUILD-SNAPSHOT.jar"
+STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.3.jar:$GRAILS_HOME/dist/grails-bootstrap-1.3.2.jar"
# Allow access to Cocoa classes on OS X
if $darwin; then
View
@@ -106,7 +106,7 @@ set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
-set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.3.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.3.2.BUILD-SNAPSHOT.jar
+set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.3.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.3.2.jar
if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
@@ -127,7 +127,7 @@ set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar
if "%JAVA_OPTS%" == "" set JAVA_OPTS=-Xmx512m -XX:MaxPermSize=96m
set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name="%PROGNAME%"
set JAVA_OPTS=%JAVA_OPTS% -Dgrails.home="%GRAILS_HOME%"
-set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version="1.3.2.BUILD-SNAPSHOT"
+set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version="1.3.2"
set JAVA_OPTS=%JAVA_OPTS% -Dbase.dir="."
set JAVA_OPTS=%JAVA_OPTS% -Dtools.jar="%TOOLS_JAR%"
set JAVA_OPTS=%JAVA_OPTS% -Dgroovy.starter.conf="%STARTER_CONF%"
View
@@ -9,7 +9,7 @@ buildscript {
apply id: 'groovy'
-version = '1.3.2.BUILD-SNAPSHOT'
+version = '1.3.2'
sourceCompatibility = "1.5"
targetCompatibility = "1.5"
View
@@ -1,5 +1,5 @@
-grails.version=1.3.2.BUILD-SNAPSHOT
-bundlor.grails.version=1.3.2.BUILD-SNAPSHOT
+grails.version=1.3.2
+bundlor.grails.version=1.3.2
grails.src.commons=src/commons
grails.src.groovy=src/groovy
@@ -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.3
-bundlor.spring.version=3.0.2.RELEASE
+bundlor.spring.version=3.0.3.RELEASE
bundlor.ant.version=1.7.1
bundlor.ivy.version=2.0.0
bundlor.gant.version=1.9.2
View
@@ -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.2 (http://www.springframework.org) Apache 2.0 License
+- Spring Framework 3.0.3 (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
View
@@ -526,24 +526,24 @@
<root url="jar://$PROJECT_DIR$/lib/org.springframework.webflow-2.0.8.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/org.springframework.js-2.0.8.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/org.springframework.binding-2.0.8.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.web.servlet-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.web-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument.tomcat-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.transaction-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.test-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.oxm-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.context.support-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.orm-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.beans-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.jms-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.jdbc-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.core-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.aspects-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.expression-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.context-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.asm-3.0.2.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.aop-3.0.2.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.web.servlet-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.web-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument.tomcat-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.transaction-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.test-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.oxm-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.context.support-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.orm-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.beans-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.jms-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.jdbc-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.core-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.aspects-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.expression-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.context-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.asm-3.0.3.RELEASE.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.aop-3.0.3.RELEASE.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.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.2.RELEASE</version>
+ <version>3.0.3.RELEASE</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -8,16 +8,16 @@
<conf name="runtime" extends="compile"/>
</configurations>
<dependencies>
- <dependency org="org.grails" name="grails-bootstrap" rev="1.3.1" conf="runtime">
+ <dependency org="org.grails" name="grails-bootstrap" rev="1.3.2" conf="runtime">
<exclude org="org.springframework" module="spring-instrument-classloading" name="*" type="*" ext="*" conf="" matcher="exact"/>
<exclude org="javax.validation" module="com.springsource.javax.validation" name="*" type="*" ext="*" conf="" matcher="exact"/>
</dependency>
- <dependency org="org.grails" name="grails-gorm" rev="1.3.1" conf="runtime">
+ <dependency org="org.grails" name="grails-gorm" rev="1.3.2" conf="runtime">
<exclude org="org.springframework" module="spring-instrument-classloading" name="*" type="*" ext="*" conf="" matcher="exact"/>
<exclude org="javax.validation" module="com.springsource.javax.validation" name="*" type="*" ext="*" conf="" matcher="exact"/>
</dependency>
- <dependency org="org.grails" name="grails-web" rev="1.3.1" conf="runtime">
+ <dependency org="org.grails" name="grails-web" rev="1.3.2" conf="runtime">
<exclude org="org.springframework" module="spring-instrument-classloading" name="*" type="*" ext="*" conf="" matcher="exact"/>
<exclude org="javax.validation" module="com.springsource.javax.validation" name="*" type="*" ext="*" conf="" matcher="exact"/>
@@ -1,8 +1,8 @@
#Grails Metadata file
#Thu Oct 01 11:54:33 CEST 2009
-app.grails.version=1.3.1
+app.grails.version=1.3.2
app.name=petclinic
app.servlet.version=2.4
app.version=0.1
-plugins.hibernate=1.3.1
-plugins.tomcat=1.3.1
+plugins.hibernate=1.3.2
+plugins.tomcat=1.3.2
@@ -42,7 +42,7 @@ target(dependencyReport:"Produces a dependency report for the current Grails app
}
def conf = args.trim() ?: 'build, compile, provided, runtime, test'
- ivy.report(organisation:grailsAppName, module:grailsAppName,todir:targetDir, conf:conf)
+ ivy.report(organisation:'org.grails.internal', module:grailsAppName,todir:targetDir, conf:conf)
println "Dependency report output to [$targetDir]"
}
Oops, something went wrong.

0 comments on commit 26d2da4

Please sign in to comment.