Skip to content

Commit 7e16081

Browse files
committed
Upgrade to Groovy 1.7.8 snapshot
1 parent 570b535 commit 7e16081

File tree

11 files changed

+10
-10
lines changed

11 files changed

+10
-10
lines changed

.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<classpathentry kind="lib" path="lib/ejb3-persistence-1.0.2.GA.jar"/>
3131
<classpathentry kind="lib" path="lib/gant_groovy1.7-1.9.2.jar"/>
3232
<classpathentry kind="lib" path="lib/gpars-0.9.jar"/>
33-
<classpathentry kind="lib" path="lib/groovy-all-1.7.5.jar"/>
33+
<classpathentry kind="lib" path="lib/groovy-all-1.7.8-SNAPSHOT.jar"/>
3434
<classpathentry kind="lib" path="lib/hibernate-annotations-3.4.0.GA.jar"/>
3535
<classpathentry kind="lib" path="lib/hibernate-commons-annotations-3.1.0.GA.jar"/>
3636
<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"/>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ configurations {
2323
dependencies {
2424
lib = "$projectDir/lib"
2525
groovy files(fileTree(dir: lib as File, includes: ['groovy-all-1.7.*.jar']))
26-
compile files(fileTree(dir: lib as File, includes: ['*.jar'], excludes: ['jsp-api-2.1.jar', 'groovy-all-1.7.5.jar']), "${System.getenv('JAVA_HOME')}/lib/tools.jar")
26+
compile files(fileTree(dir: lib as File, includes: ['*.jar'], excludes: ['jsp-api-2.1.jar', 'groovy-all-1.7.*.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.5
19+
bundlor.groovy.version=1.7.8-SNAPSHOT
2020
bundlor.spring.version=3.0.5.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.5.jar
13+
load ${grails.home}/lib/groovy-all-1.7.8-SNAPSHOT.jar
1414
load ${grails.home}/lib/gpars-0.9.jar
1515
load ${grails.home}/lib/ivy-2.2.0.jar
1616
load ${grails.home}/lib/gant_groovy1.7-1.9.2.jar
Binary file not shown.

maven/grails-docs.pom.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>org.codehaus.groovy</groupId>
6060
<artifactId>groovy-all</artifactId>
61-
<version>1.7.5</version>
61+
<version>1.7.8-SNAPSHOT</version>
6262
<exclusions>
6363
<exclusion>
6464
<groupId>jline</groupId>

maven/grails.pom.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>org.codehaus.groovy</groupId>
6565
<artifactId>groovy-all</artifactId>
66-
<version>1.7.5</version>
66+
<version>1.7.8-SNAPSHOT</version>
6767
<exclusions>
6868
<exclusion>
6969
<groupId>jline</groupId>

src/grails/grails-macros.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
<classpath>
7070
<pathelement location="@{cwd}"/>
71-
<pathelement location="${grails.home}/lib/groovy-all-1.7.5.jar"/>
71+
<pathelement location="${grails.home}/lib/groovy-all-1.7.8-SNAPSHOT.jar"/>
7272
<pathelement location="${grails.home}/dist/[email protected]@.jar"/>
7373
<extend-classpath/>
7474
</classpath>

src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class IvyDependencyManager extends AbstractIvyDependencyManager implements Depen
250250
"javax.servlet:jsp-api:2.1"
251251

252252
// dependencies needed for compilation
253-
"${compileTimeDependenciesMethod}"("org.codehaus.groovy:groovy-all:1.7.5") {
253+
"${compileTimeDependenciesMethod}"("org.codehaus.groovy:groovy-all:1.7.8-SNAPSHOT") {
254254
excludes 'jline'
255255
}
256256

src/resources/bash/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.5.jar:$GRAILS_HOME/dist/[email protected]@.jar"
117+
STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.8-SNAPSHOT.jar:$GRAILS_HOME/dist/[email protected]@.jar"
118118

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

0 commit comments

Comments
 (0)