Skip to content

Commit 45d4a33

Browse files
committed
Merge branch '1.3.x' of github.com:grails/grails-core into 1.3.x
2 parents 5761ea8 + 1c7a042 commit 45d4a33

File tree

6 files changed

+15
-10
lines changed

6 files changed

+15
-10
lines changed

.classpath

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,17 @@
7777
<classpathentry kind="lib" path="lib/svnkit-1.3.1.jar"/>
7878
<classpathentry kind="lib" path="lib/xpp3_min-1.1.3.4.O.jar"/>
7979
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
80+
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
81+
<classpathentry kind="lib" path="lib/aopalliance-1.0.jar"/>
82+
<classpathentry kind="lib" path="lib/radeox-1.0-b2.jar"/>
83+
<classpathentry kind="lib" path="lib/javassist-3.11.0.GA.jar"/>
84+
<classpathentry kind="lib" path="lib/hibernate-annotations-3.4.0.GA.jar"/>
85+
<classpathentry kind="lib" path="lib/hibernate-commons-annotations-3.1.0.GA.jar"/>
86+
<classpathentry kind="lib" path="lib/jline-0.9.94.jar"/>
87+
<classpathentry kind="lib" path="lib/ivy-2.2.0.jar"/>
88+
<classpathentry kind="lib" path="lib/gpars-0.9.jar"/>
89+
<classpathentry kind="lib" path="lib/ehcache-core-1.7.1.jar"/>
90+
<classpathentry kind="lib" path="lib/core-renderer-R8.jar"/>
8091
<classpathentry kind="var" path="ASPECTJRT_LIB"/>
8192
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
8293
<classpathentry kind="output" path="target/eclipse/bin-output"/>

conf/groovy-starter.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
load ${grails.home}/dist/grails-bootstrap-${grails.version}.jar
1313
load ${grails.home}/lib/groovy-all-1.7.5.jar
1414
load ${grails.home}/lib/gpars-0.9.jar
15-
load ${grails.home}/lib/ivy-2.1.0.jar
15+
load ${grails.home}/lib/ivy-2.2.0.jar
1616
load ${grails.home}/lib/gant_groovy1.7-1.9.2.jar
1717
load ${grails.home}/lib/ant-1.7.1.jar
1818
load ${tools.jar}
890 KB
Binary file not shown.

maven/grails-bootstrap.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.apache.ivy</groupId>
5656
<artifactId>ivy</artifactId>
57-
<version>2.1.0</version>
57+
<version>2.2.0</version>
5858
</dependency>
5959

6060
<dependency>

src/java/org/codehaus/groovy/grails/plugins/orm/hibernate/HibernatePluginSupport.groovy

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -478,13 +478,7 @@ Using Grails' default naming strategy: '${GrailsDomainBinder.namingStrategy.getC
478478
Validator validator = ctx.containsBean("${dc.fullName}Validator") ? ctx.getBean("${dc.fullName}Validator") : null
479479
def validateMethod = new ValidatePersistentMethod(sessionFactory, application.classLoader, application,validator)
480480
metaClass.validate = {->
481-
try {
482-
validateMethod.invoke(delegate, "validate", [] as Object[])
483-
}
484-
catch (Throwable e) {
485-
e.printStackTrace()
486-
throw e
487-
}
481+
validateMethod.invoke(delegate, "validate", [] as Object[])
488482
}
489483
metaClass.validate = {Map args ->
490484
validateMethod.invoke(delegate, "validate", [args] as Object[])

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected ResolvedResource findResourceUsingPattern(ModuleRevisionId mrid, Strin
6161
}
6262

6363
private void installIvyAuth() {
64-
java.net.Authenticator.setDefault(IvyAuthenticator.INSTANCE);
64+
IvyAuthenticator.install();
6565
}
6666

6767
public String transformGrailsRepositoryPattern(ModuleRevisionId mrid, String pattern) {

0 commit comments

Comments
 (0)