Skip to content

Commit 26d2da4

Browse files
graemerochergraemerocher
committed
Merge branch 'master' of github.com:grails/grails-core
2 parents c2534e5 + 374bcf8 commit 26d2da4

File tree

80 files changed

+1588
-1542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1588
-1542
lines changed

‎.classpath‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,24 @@
5959
<classpathentry kind="lib" path="lib/groovy-all-1.7.3.jar"/>
6060
<classpathentry kind="lib" path="lib/aspectjrt-1.6.8.jar"/>
6161
<classpathentry kind="lib" path="lib/aspectjweaver-1.6.8.jar"/>
62-
<classpathentry kind="lib" path="lib/org.springframework.aop-3.0.2.RELEASE.jar"/>
63-
<classpathentry kind="lib" path="lib/org.springframework.asm-3.0.2.RELEASE.jar"/>
64-
<classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.2.RELEASE.jar"/>
65-
<classpathentry kind="lib" path="lib/org.springframework.beans-3.0.2.RELEASE.jar"/>
66-
<classpathentry kind="lib" path="lib/org.springframework.context-3.0.2.RELEASE.jar"/>
67-
<classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.2.RELEASE.jar"/>
68-
<classpathentry kind="lib" path="lib/org.springframework.core-3.0.2.RELEASE.jar"/>
69-
<classpathentry kind="lib" path="lib/org.springframework.expression-3.0.2.RELEASE.jar"/>
70-
<classpathentry kind="lib" path="lib/org.springframework.instrument-3.0.2.RELEASE.jar"/>
71-
<classpathentry kind="lib" path="lib/org.springframework.instrument.tomcat-3.0.2.RELEASE.jar"/>
72-
<classpathentry kind="lib" path="lib/org.springframework.jdbc-3.0.2.RELEASE.jar"/>
73-
<classpathentry kind="lib" path="lib/org.springframework.jms-3.0.2.RELEASE.jar"/>
74-
<classpathentry kind="lib" path="lib/org.springframework.orm-3.0.2.RELEASE.jar"/>
75-
<classpathentry kind="lib" path="lib/org.springframework.oxm-3.0.2.RELEASE.jar"/>
76-
<classpathentry kind="lib" path="lib/org.springframework.test-3.0.2.RELEASE.jar"/>
77-
<classpathentry kind="lib" path="lib/org.springframework.transaction-3.0.2.RELEASE.jar"/>
78-
<classpathentry kind="lib" path="lib/org.springframework.web-3.0.2.RELEASE.jar"/>
79-
<classpathentry kind="lib" path="lib/org.springframework.web.servlet-3.0.2.RELEASE.jar"/>
62+
<classpathentry kind="lib" path="lib/org.springframework.aop-3.0.3.RELEASE.jar"/>
63+
<classpathentry kind="lib" path="lib/org.springframework.asm-3.0.3.RELEASE.jar"/>
64+
<classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.3.RELEASE.jar"/>
65+
<classpathentry kind="lib" path="lib/org.springframework.beans-3.0.3.RELEASE.jar"/>
66+
<classpathentry kind="lib" path="lib/org.springframework.context-3.0.3.RELEASE.jar"/>
67+
<classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.3.RELEASE.jar"/>
68+
<classpathentry kind="lib" path="lib/org.springframework.core-3.0.3.RELEASE.jar"/>
69+
<classpathentry kind="lib" path="lib/org.springframework.expression-3.0.3.RELEASE.jar"/>
70+
<classpathentry kind="lib" path="lib/org.springframework.instrument-3.0.3.RELEASE.jar"/>
71+
<classpathentry kind="lib" path="lib/org.springframework.instrument.tomcat-3.0.3.RELEASE.jar"/>
72+
<classpathentry kind="lib" path="lib/org.springframework.jdbc-3.0.3.RELEASE.jar"/>
73+
<classpathentry kind="lib" path="lib/org.springframework.jms-3.0.3.RELEASE.jar"/>
74+
<classpathentry kind="lib" path="lib/org.springframework.orm-3.0.3.RELEASE.jar"/>
75+
<classpathentry kind="lib" path="lib/org.springframework.oxm-3.0.3.RELEASE.jar"/>
76+
<classpathentry kind="lib" path="lib/org.springframework.test-3.0.3.RELEASE.jar"/>
77+
<classpathentry kind="lib" path="lib/org.springframework.transaction-3.0.3.RELEASE.jar"/>
78+
<classpathentry kind="lib" path="lib/org.springframework.web-3.0.3.RELEASE.jar"/>
79+
<classpathentry kind="lib" path="lib/org.springframework.web.servlet-3.0.3.RELEASE.jar"/>
8080
<classpathentry kind="lib" path="lib/org.springframework.webflow-2.0.8.RELEASE.jar"/>
8181
<classpathentry kind="output" path="target/eclipse/bin-output"/>
8282
</classpath>

‎bin/startGrails‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ fi
114114
if [ -z "$GROOVY_CONF" ]; then
115115
GROOVY_CONF="$GRAILS_HOME/conf/groovy-starter.conf"
116116
fi
117-
STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.3.jar:$GRAILS_HOME/dist/grails-bootstrap-1.3.2.BUILD-SNAPSHOT.jar"
117+
STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.3.jar:$GRAILS_HOME/dist/grails-bootstrap-1.3.2.jar"
118118

119119
# Allow access to Cocoa classes on OS X
120120
if $darwin; then

‎bin/startGrails.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ set CMD_LINE_ARGS=%$
106106

107107
:execute
108108
@rem Setup the command line
109-
set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.3.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.3.2.BUILD-SNAPSHOT.jar
109+
set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.3.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.3.2.jar
110110

111111
if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
112112

@@ -127,7 +127,7 @@ set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar
127127
if "%JAVA_OPTS%" == "" set JAVA_OPTS=-Xmx512m -XX:MaxPermSize=96m
128128
set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name="%PROGNAME%"
129129
set JAVA_OPTS=%JAVA_OPTS% -Dgrails.home="%GRAILS_HOME%"
130-
set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version="1.3.2.BUILD-SNAPSHOT"
130+
set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version="1.3.2"
131131
set JAVA_OPTS=%JAVA_OPTS% -Dbase.dir="."
132132
set JAVA_OPTS=%JAVA_OPTS% -Dtools.jar="%TOOLS_JAR%"
133133
set JAVA_OPTS=%JAVA_OPTS% -Dgroovy.starter.conf="%STARTER_CONF%"

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99

1010
apply id: 'groovy'
1111

12-
version = '1.3.2.BUILD-SNAPSHOT'
12+
version = '1.3.2'
1313

1414
sourceCompatibility = "1.5"
1515
targetCompatibility = "1.5"

‎build.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
grails.version=1.3.2.BUILD-SNAPSHOT
2-
bundlor.grails.version=1.3.2.BUILD-SNAPSHOT
1+
grails.version=1.3.2
2+
bundlor.grails.version=1.3.2
33
grails.src.commons=src/commons
44
grails.src.groovy=src/groovy
55

@@ -17,7 +17,7 @@ bundlor.jndi.version=1.2.0
1717
bundlor.servlet.jsp.version=2.1.0
1818
bundlor.radeox.version=1.0.0.b2
1919
bundlor.groovy.version=1.7.3
20-
bundlor.spring.version=3.0.2.RELEASE
20+
bundlor.spring.version=3.0.3.RELEASE
2121
bundlor.ant.version=1.7.1
2222
bundlor.ivy.version=2.0.0
2323
bundlor.gant.version=1.9.2

‎dependencies.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ The following libraries are included in Grails because they are required either
148148
- required for running Grails applications
149149

150150
* org.springframework.*.jar
151-
- Spring Framework 3.0.2 (http://www.springframework.org) Apache 2.0 License
151+
- Spring Framework 3.0.3 (http://www.springframework.org) Apache 2.0 License
152152
- required for building Grails core
153153
- required for the command line tools (Gant)
154154
- required for running Grails applications

‎grails.ipr‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -526,24 +526,24 @@
526526
<root url="jar://$PROJECT_DIR$/lib/org.springframework.webflow-2.0.8.RELEASE.jar!/" />
527527
<root url="jar://$PROJECT_DIR$/lib/org.springframework.js-2.0.8.RELEASE.jar!/" />
528528
<root url="jar://$PROJECT_DIR$/lib/org.springframework.binding-2.0.8.RELEASE.jar!/" />
529-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.web.servlet-3.0.2.RELEASE.jar!/" />
530-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.web-3.0.2.RELEASE.jar!/" />
531-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument.tomcat-3.0.2.RELEASE.jar!/" />
532-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.transaction-3.0.2.RELEASE.jar!/" />
533-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.test-3.0.2.RELEASE.jar!/" />
534-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.oxm-3.0.2.RELEASE.jar!/" />
535-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument-3.0.2.RELEASE.jar!/" />
536-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.context.support-3.0.2.RELEASE.jar!/" />
537-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.orm-3.0.2.RELEASE.jar!/" />
538-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.beans-3.0.2.RELEASE.jar!/" />
539-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.jms-3.0.2.RELEASE.jar!/" />
540-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.jdbc-3.0.2.RELEASE.jar!/" />
541-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.core-3.0.2.RELEASE.jar!/" />
542-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.aspects-3.0.2.RELEASE.jar!/" />
543-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.expression-3.0.2.RELEASE.jar!/" />
544-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.context-3.0.2.RELEASE.jar!/" />
545-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.asm-3.0.2.RELEASE.jar!/" />
546-
<root url="jar://$PROJECT_DIR$/lib/org.springframework.aop-3.0.2.RELEASE.jar!/" />
529+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.web.servlet-3.0.3.RELEASE.jar!/" />
530+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.web-3.0.3.RELEASE.jar!/" />
531+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument.tomcat-3.0.3.RELEASE.jar!/" />
532+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.transaction-3.0.3.RELEASE.jar!/" />
533+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.test-3.0.3.RELEASE.jar!/" />
534+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.oxm-3.0.3.RELEASE.jar!/" />
535+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument-3.0.3.RELEASE.jar!/" />
536+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.context.support-3.0.3.RELEASE.jar!/" />
537+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.orm-3.0.3.RELEASE.jar!/" />
538+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.beans-3.0.3.RELEASE.jar!/" />
539+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.jms-3.0.3.RELEASE.jar!/" />
540+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.jdbc-3.0.3.RELEASE.jar!/" />
541+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.core-3.0.3.RELEASE.jar!/" />
542+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.aspects-3.0.3.RELEASE.jar!/" />
543+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.expression-3.0.3.RELEASE.jar!/" />
544+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.context-3.0.3.RELEASE.jar!/" />
545+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.asm-3.0.3.RELEASE.jar!/" />
546+
<root url="jar://$PROJECT_DIR$/lib/org.springframework.aop-3.0.3.RELEASE.jar!/" />
547547
</CLASSES>
548548
<JAVADOC />
549549
<SOURCES>

‎lib/org.springframework.aop-3.0.2.RELEASE.jar‎ renamed to ‎lib/org.springframework.aop-3.0.3.RELEASE.jar‎

313 KB
Binary file not shown.

‎lib/org.springframework.asm-3.0.2.RELEASE.jar‎ renamed to ‎lib/org.springframework.asm-3.0.3.RELEASE.jar‎

51.8 KB
Binary file not shown.

‎lib/org.springframework.aspects-3.0.2.RELEASE.jar‎

-29.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)