Skip to content

Commit 9b80250

Browse files
GRAILS-6398 - upgrade to Groovy 1.7.3
1 parent 4c01d46 commit 9b80250

File tree

14 files changed

+15
-15
lines changed

14 files changed

+15
-15
lines changed

.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<classpathentry kind="lib" path="lib/ehcache-core-1.7.1.jar"/>
5757
<classpathentry kind="lib" path="lib/core-renderer-R8.jar"/>
5858
<classpathentry kind="var" path="ASPECTJRT_LIB"/>
59-
<classpathentry kind="lib" path="lib/groovy-all-1.7.2.jar"/>
59+
<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"/>
6262
<classpathentry kind="lib" path="lib/org.springframework.aop-3.0.2.RELEASE.jar"/>

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.2.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.BUILD-SNAPSHOT.jar"
118118

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

bin/startGrails.bat

Lines changed: 1 addition & 1 deletion
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.2.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.BUILD-SNAPSHOT.jar
110110

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

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ configurations {
2222

2323
dependencies {
2424
lib = "$projectDir/lib"
25-
groovy files("$lib/groovy-all-1.7.2.jar")
26-
compile files(fileTree(dir: lib as File, includes: ['*.jar'], excludes: ['jsp-api-2.1.jar', 'groovy-all-1.7.2.jar']), "${System.getenv('JAVA_HOME')}/lib/tools.jar")
25+
groovy files("$lib/groovy-all-1.7.3.jar")
26+
compile files(fileTree(dir: lib as File, includes: ['*.jar'], excludes: ['jsp-api-2.1.jar', 'groovy-all-1.7.3.jar']), "${System.getenv('JAVA_HOME')}/lib/tools.jar")
2727
jsp21 files("$lib/jsp-api-2.1.jar")
2828
}
2929

build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ bundlor.servlet.version=2.5.0
1616
bundlor.jndi.version=1.2.0
1717
bundlor.servlet.jsp.version=2.1.0
1818
bundlor.radeox.version=1.0.0.b2
19-
bundlor.groovy.version=1.7.2
19+
bundlor.groovy.version=1.7.3
2020
bundlor.spring.version=3.0.2.RELEASE
2121
bundlor.ant.version=1.7.1
2222
bundlor.ivy.version=2.0.0

conf/groovy-starter.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
##
1111
# Load required libraries
1212
load ${grails.home}/dist/grails-bootstrap-${grails.version}.jar
13-
load ${grails.home}/lib/groovy-all-1.7.2.jar
13+
load ${grails.home}/lib/groovy-all-1.7.3.jar
1414
load ${grails.home}/lib/gpars-0.9.jar
1515
load ${grails.home}/lib/ivy-2.1.0.jar
1616
load ${grails.home}/lib/gant_groovy1.7-1.9.2.jar

dependencies.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ The following libraries are included in Grails because they are required either
8383
- Gant 1.9.2 (http://gant.codehaus.org) Apache 2.0 License
8484
- required for the command line tools (Gant)
8585

86-
* groovy-all-1.7.2.jar
87-
- Groovy 1.7.2 (http://groovy.codehaus.org) Apache 2.0 License
86+
* groovy-all-1.7.3.jar
87+
- Groovy 1.7.3 (http://groovy.codehaus.org) Apache 2.0 License
8888
- required for the command line tools (Gant)
8989
- required for building Grails core
9090
- required for running Grails applications

grails.ipr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@
581581
</library>
582582
<library name="Groovy">
583583
<CLASSES>
584-
<root url="jar://$PROJECT_DIR$/lib/groovy-all-1.7.2.jar!/" />
584+
<root url="jar://$PROJECT_DIR$/lib/groovy-all-1.7.3.jar!/" />
585585
</CLASSES>
586586
<JAVADOC />
587587
<SOURCES>
Binary file not shown.

maven/grails-docs.pom.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>org.codehaus.groovy</groupId>
5656
<artifactId>groovy-all</artifactId>
57-
<version>1.7.2</version>
57+
<version>1.7.3</version>
5858
<exclusions>
5959
<exclusion>
6060
<groupId>jline</groupId>

0 commit comments

Comments
 (0)