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

+18-18
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

+1-1
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

+2-2
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

+1-1
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

+3-3
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

+1-1
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

+18-18
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 ‎lib/org.springframework.aop-3.0.3.RELEASE.jar

313 KB
Binary file not shown.

‎lib/org.springframework.asm-3.0.2.RELEASE.jar ‎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.

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

29.5 KB
Binary file not shown.

‎lib/org.springframework.beans-3.0.2.RELEASE.jar ‎lib/org.springframework.beans-3.0.3.RELEASE.jar

537 KB
Binary file not shown.

‎lib/org.springframework.context-3.0.2.RELEASE.jar ‎lib/org.springframework.context-3.0.3.RELEASE.jar

642 KB
Binary file not shown.

‎lib/org.springframework.context.support-3.0.2.RELEASE.jar ‎lib/org.springframework.context.support-3.0.3.RELEASE.jar

97.7 KB
Binary file not shown.

‎lib/org.springframework.core-3.0.2.RELEASE.jar ‎lib/org.springframework.core-3.0.3.RELEASE.jar

350 KB
Binary file not shown.

‎lib/org.springframework.expression-3.0.2.RELEASE.jar ‎lib/org.springframework.expression-3.0.3.RELEASE.jar

153 KB
Binary file not shown.

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

-1.76 KB
Binary file not shown.

‎lib/org.springframework.instrument-3.0.3.RELEASE.jar

1.77 KB
Binary file not shown.

‎lib/org.springframework.instrument.tomcat-3.0.2.RELEASE.jar

-5.48 KB
Binary file not shown.

‎lib/org.springframework.instrument.tomcat-3.0.3.RELEASE.jar

5.59 KB
Binary file not shown.

‎lib/org.springframework.jdbc-3.0.2.RELEASE.jar ‎lib/org.springframework.jdbc-3.0.3.RELEASE.jar

369 KB
Binary file not shown.

‎lib/org.springframework.jms-3.0.2.RELEASE.jar ‎lib/org.springframework.jms-3.0.3.RELEASE.jar

179 KB
Binary file not shown.

‎lib/org.springframework.orm-3.0.2.RELEASE.jar ‎lib/org.springframework.orm-3.0.3.RELEASE.jar

325 KB
Binary file not shown.

‎lib/org.springframework.oxm-3.0.2.RELEASE.jar ‎lib/org.springframework.oxm-3.0.3.RELEASE.jar

59.3 KB
Binary file not shown.

‎lib/org.springframework.test-3.0.2.RELEASE.jar ‎lib/org.springframework.test-3.0.3.RELEASE.jar

200 KB
Binary file not shown.

‎lib/org.springframework.transaction-3.0.2.RELEASE.jar ‎lib/org.springframework.transaction-3.0.3.RELEASE.jar

226 KB
Binary file not shown.

‎lib/org.springframework.web-3.0.2.RELEASE.jar ‎lib/org.springframework.web-3.0.3.RELEASE.jar

374 KB
Binary file not shown.

‎lib/org.springframework.web.servlet-3.0.2.RELEASE.jar ‎lib/org.springframework.web.servlet-3.0.3.RELEASE.jar

394 KB
Binary file not shown.

‎maven/grails.pom.in

+17-17
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<dependency>
101101
<groupId>org.springframework</groupId>
102102
<artifactId>spring-aop</artifactId>
103-
<version>3.0.2.RELEASE</version>
103+
<version>3.0.3.RELEASE</version>
104104
<scope>runtime</scope>
105105
<exclusions>
106106
<!-- We have JCL-over-SLF4J instead. -->
@@ -114,7 +114,7 @@
114114
<dependency>
115115
<groupId>org.springframework</groupId>
116116
<artifactId>spring-asm</artifactId>
117-
<version>3.0.2.RELEASE</version>
117+
<version>3.0.3.RELEASE</version>
118118
<scope>runtime</scope>
119119
<exclusions>
120120
<!-- We have JCL-over-SLF4J instead. -->
@@ -128,7 +128,7 @@
128128
<dependency>
129129
<groupId>org.springframework</groupId>
130130
<artifactId>spring-aspects</artifactId>
131-
<version>3.0.2.RELEASE</version>
131+
<version>3.0.3.RELEASE</version>
132132
<scope>runtime</scope>
133133
<exclusions>
134134
<!-- We have JCL-over-SLF4J instead. -->
@@ -142,7 +142,7 @@
142142
<dependency>
143143
<groupId>org.springframework</groupId>
144144
<artifactId>spring-beans</artifactId>
145-
<version>3.0.2.RELEASE</version>
145+
<version>3.0.3.RELEASE</version>
146146
<scope>runtime</scope>
147147
<exclusions>
148148
<!-- We have JCL-over-SLF4J instead. -->
@@ -156,7 +156,7 @@
156156
<dependency>
157157
<groupId>org.springframework</groupId>
158158
<artifactId>spring-context</artifactId>
159-
<version>3.0.2.RELEASE</version>
159+
<version>3.0.3.RELEASE</version>
160160
<scope>runtime</scope>
161161
<exclusions>
162162
<!-- We have JCL-over-SLF4J instead. -->
@@ -170,7 +170,7 @@
170170
<dependency>
171171
<groupId>org.springframework</groupId>
172172
<artifactId>spring-context-support</artifactId>
173-
<version>3.0.2.RELEASE</version>
173+
<version>3.0.3.RELEASE</version>
174174
<scope>runtime</scope>
175175
<exclusions>
176176
<!-- We have JCL-over-SLF4J instead. -->
@@ -184,7 +184,7 @@
184184
<dependency>
185185
<groupId>org.springframework</groupId>
186186
<artifactId>spring-core</artifactId>
187-
<version>3.0.2.RELEASE</version>
187+
<version>3.0.3.RELEASE</version>
188188
<scope>runtime</scope>
189189
<exclusions>
190190
<!-- We have JCL-over-SLF4J instead. -->
@@ -198,7 +198,7 @@
198198
<dependency>
199199
<groupId>org.springframework</groupId>
200200
<artifactId>spring-expression</artifactId>
201-
<version>3.0.2.RELEASE</version>
201+
<version>3.0.3.RELEASE</version>
202202
<scope>runtime</scope>
203203
<exclusions>
204204
<!-- We have JCL-over-SLF4J instead. -->
@@ -212,7 +212,7 @@
212212
<dependency>
213213
<groupId>org.springframework</groupId>
214214
<artifactId>spring-instrument</artifactId>
215-
<version>3.0.2.RELEASE</version>
215+
<version>3.0.3.RELEASE</version>
216216
<scope>runtime</scope>
217217
<exclusions>
218218
<!-- We have JCL-over-SLF4J instead. -->
@@ -226,7 +226,7 @@
226226
<dependency>
227227
<groupId>org.springframework</groupId>
228228
<artifactId>spring-jdbc</artifactId>
229-
<version>3.0.2.RELEASE</version>
229+
<version>3.0.3.RELEASE</version>
230230
<scope>runtime</scope>
231231
<exclusions>
232232
<!-- We have JCL-over-SLF4J instead. -->
@@ -240,7 +240,7 @@
240240
<dependency>
241241
<groupId>org.springframework</groupId>
242242
<artifactId>spring-jms</artifactId>
243-
<version>3.0.2.RELEASE</version>
243+
<version>3.0.3.RELEASE</version>
244244
<scope>runtime</scope>
245245
<exclusions>
246246
<!-- We have JCL-over-SLF4J instead. -->
@@ -254,7 +254,7 @@
254254
<dependency>
255255
<groupId>org.springframework</groupId>
256256
<artifactId>spring-orm</artifactId>
257-
<version>3.0.2.RELEASE</version>
257+
<version>3.0.3.RELEASE</version>
258258
<scope>runtime</scope>
259259
<exclusions>
260260
<!-- We have JCL-over-SLF4J instead. -->
@@ -268,7 +268,7 @@
268268
<dependency>
269269
<groupId>org.springframework</groupId>
270270
<artifactId>spring-oxm</artifactId>
271-
<version>3.0.2.RELEASE</version>
271+
<version>3.0.3.RELEASE</version>
272272
<scope>runtime</scope>
273273
<exclusions>
274274
<!-- We have JCL-over-SLF4J instead. -->
@@ -283,7 +283,7 @@
283283
<dependency>
284284
<groupId>org.springframework</groupId>
285285
<artifactId>spring-tx</artifactId>
286-
<version>3.0.2.RELEASE</version>
286+
<version>3.0.3.RELEASE</version>
287287
<scope>runtime</scope>
288288
<exclusions>
289289
<!-- We have JCL-over-SLF4J instead. -->
@@ -297,7 +297,7 @@
297297
<dependency>
298298
<groupId>org.springframework</groupId>
299299
<artifactId>spring-web</artifactId>
300-
<version>3.0.2.RELEASE</version>
300+
<version>3.0.3.RELEASE</version>
301301
<scope>runtime</scope>
302302
<exclusions>
303303
<!-- We have JCL-over-SLF4J instead. -->
@@ -311,7 +311,7 @@
311311
<dependency>
312312
<groupId>org.springframework</groupId>
313313
<artifactId>spring-webmvc</artifactId>
314-
<version>3.0.2.RELEASE</version>
314+
<version>3.0.3.RELEASE</version>
315315
<scope>runtime</scope>
316316
<exclusions>
317317
<!-- We have JCL-over-SLF4J instead. -->
@@ -325,7 +325,7 @@
325325
<dependency>
326326
<groupId>org.springframework</groupId>
327327
<artifactId>spring-test</artifactId>
328-
<version>3.0.2.RELEASE</version>
328+
<version>3.0.3.RELEASE</version>
329329
<scope>runtime</scope>
330330
<exclusions>
331331
<!-- We have JCL-over-SLF4J instead. -->

‎samples/petclinic-mvc/ivy.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
<conf name="runtime" extends="compile"/>
99
</configurations>
1010
<dependencies>
11-
<dependency org="org.grails" name="grails-bootstrap" rev="1.3.1" conf="runtime">
11+
<dependency org="org.grails" name="grails-bootstrap" rev="1.3.2" conf="runtime">
1212
<exclude org="org.springframework" module="spring-instrument-classloading" name="*" type="*" ext="*" conf="" matcher="exact"/>
1313
<exclude org="javax.validation" module="com.springsource.javax.validation" name="*" type="*" ext="*" conf="" matcher="exact"/>
1414

1515
</dependency>
16-
<dependency org="org.grails" name="grails-gorm" rev="1.3.1" conf="runtime">
16+
<dependency org="org.grails" name="grails-gorm" rev="1.3.2" conf="runtime">
1717
<exclude org="org.springframework" module="spring-instrument-classloading" name="*" type="*" ext="*" conf="" matcher="exact"/>
1818
<exclude org="javax.validation" module="com.springsource.javax.validation" name="*" type="*" ext="*" conf="" matcher="exact"/>
1919
</dependency>
20-
<dependency org="org.grails" name="grails-web" rev="1.3.1" conf="runtime">
20+
<dependency org="org.grails" name="grails-web" rev="1.3.2" conf="runtime">
2121
<exclude org="org.springframework" module="spring-instrument-classloading" name="*" type="*" ext="*" conf="" matcher="exact"/>
2222
<exclude org="javax.validation" module="com.springsource.javax.validation" name="*" type="*" ext="*" conf="" matcher="exact"/>
2323

‎samples/petclinic/application.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Grails Metadata file
22
#Thu Oct 01 11:54:33 CEST 2009
3-
app.grails.version=1.3.1
3+
app.grails.version=1.3.2
44
app.name=petclinic
55
app.servlet.version=2.4
66
app.version=0.1
7-
plugins.hibernate=1.3.1
8-
plugins.tomcat=1.3.1
7+
plugins.hibernate=1.3.2
8+
plugins.tomcat=1.3.2

‎scripts/DependencyReport.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ target(dependencyReport:"Produces a dependency report for the current Grails app
4242
}
4343

4444
def conf = args.trim() ?: 'build, compile, provided, runtime, test'
45-
ivy.report(organisation:grailsAppName, module:grailsAppName,todir:targetDir, conf:conf)
45+
ivy.report(organisation:'org.grails.internal', module:grailsAppName,todir:targetDir, conf:conf)
4646

4747
println "Dependency report output to [$targetDir]"
4848
}

0 commit comments

Comments
 (0)