Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix for GRAILS-4751 "Upgraded some key dependencies". Also removed OS…

…Cache as a dependency and went with only Ehcache 1.7.0 which now doesn't throw errors on development mode.

Added appropriate error handling to help users upgrade if they have OSCache already configured.
  • Loading branch information...
commit 4423ade768d982b71d8e2f8c6b965bfdaa4508cc 1 parent b0e6771
@graemerocher graemerocher authored
View
77 dependencies.txt
@@ -1,7 +1,7 @@
The following libraries are included in Grails because they are required either for building the framework or for running the command line tools or for running Grails applications themselves.
* ant.jar, ant-nodeps.jar, ant-junit.jar, ant-launcher.jar, ant-trax.jar
-- Ant 1.7.0 (http://ant.apache.org) Apache 2.0 License
+- Ant 1.7.1 (http://ant.apache.org) Apache 2.0 License
- used to build the framework and for the command line tools (Gant)
- required for running Grails applications when using AntBuilder
@@ -9,12 +9,16 @@ The following libraries are included in Grails because they are required either
- ANTLR 2.7.6 (http://www.antlr.org) BSD License
- required for running Grails applications (Hibernate)
+* aspectjrt-1.6.6.jar, aspectjweaver-1.6.6.jar
+- AspectJ 1.6.6 (http://www.eclipse.org/aspectj/) Eclipse Public License (EPL)
+- required for running Grails applications
+
* cglib-nodep-2.1_3.jar
- CGLIB 2.1_3 with ObjectWeb ASM 1.5.3 (http://cglib.sourceforge.net) Apache 1.1 License
- required for running Grails applications (Spring AOP & Hibernate)
-* commons-beanutils-1.7.0.jar
-- Commons BeanUtils 1.7.0 (http://commons.apache.org/beanutils/) Apache 2.0 License
+* commons-beanutils-1.8.0.jar
+- Commons BeanUtils 1.8.0 (http://commons.apache.org/beanutils/) Apache 2.0 License
- required for running Grails applications
* commons-codec-1.3.jar
@@ -25,13 +29,13 @@ The following libraries are included in Grails because they are required either
- Commons CLI 1.0 (http://commons.apache.org/cli/) Apache 2.0 License
- required for the command line tools (Gant)
-* commons-collections-3.2.jar
-- Commons Collections 3.2 (http://commons.apache.org/collections/) Apache 2.0 License
+* commons-collections-3.2.1.jar
+- Commons Collections 3.2.1 (http://commons.apache.org/collections/) Apache 2.0 License
- required for building Grails core
- required for running Grails applications
-* commons-dbcp-1.2.1.jar
-- Commons DBCP 1.2.1 (http://commons.apache.org/dbcp/) Apache 2.0 License
+* commons-dbcp-1.2.2.jar
+- Commons DBCP 1.2.2 (http://commons.apache.org/dbcp/) Apache 2.0 License
- required for building Grails core
- required for running Grails applications
@@ -52,12 +56,12 @@ The following libraries are included in Grails because they are required either
- required for building Grails core
- required for running Grails application
-* commons-pool-1.2.jar
-- Commons Pool 1.2 (http://commons.apache.org/pool/) Apache 2.0 License
+* commons-pool-1.5.3.jar
+- Commons Pool 1.5.3 (http://commons.apache.org/pool/) Apache 2.0 License
- required for running Grails applications
-* commons-validator-1.3.0.jar
-- Commons Validator 1.3 (http://commons.apache.org/validator/) Apache 2.0 License
+* commons-validator-1.3.1.jar
+- Commons Validator 1.3.1 (http://commons.apache.org/validator/) Apache 2.0 License
- required for building Grails core
- required for running Grails applications
@@ -66,7 +70,7 @@ The following libraries are included in Grails because they are required either
- required for building Grails core
- required for running Grails applications
-* ejb3-persistence-3.3.0.jar
+* ejb3-persistence-1.0.2.GA.jar
- EJB 3.0 Final Release
- required for running Grails applications (When using Hibernate EJB3 annotations)
@@ -79,14 +83,14 @@ The following libraries are included in Grails because they are required either
- Gant 1.6 (http://groovy.codehaus.org/Gant) Apache 2.0 License
- required for the command line tools (Gant)
-* groovy-all-1.6.3.jar
-- Groovy 1.6.3 (http://groovy.codehaus.org) Apache 2.0 License
+* groovy-all-1.6.6.jar
+- Groovy 1.6.6 (http://groovy.codehaus.org) Apache 2.0 License
- required for the command line tools (Gant)
- required for building Grails core
- required for running Grails applications
* hibernate-annotations.jar, hibernate-commons-annotations.jar
-- Hibernate Annotations 3.3.0 GA (http://annotations.hibernate.org) LGPL License
+- Hibernate Annotations 3.4.0 GA (http://annotations.hibernate.org) LGPL License
- required for running Grails applications (When using Hibernate EJB3 annotations)
* hibernate3.jar
@@ -94,31 +98,15 @@ The following libraries are included in Grails because they are required either
- required for building Grails core
- required for running Grails applications
-* hsqldb-1.8.0.5.jar
-- HSQLDB 1.8.0.5 (http://hsqldb.org/) HSQLDB License (see http://hsqldb.org/web/hsqlLicense.html)
+* hsqldb-1.8.0.10.jar
+- HSQLDB 1.8.0.10 (http://hsqldb.org/) HSQLDB License (see http://hsqldb.org/web/hsqlLicense.html)
- required for building Grails core
- required for running Grails applications (With an in-memory database)
-* jasper-compiler-5.5.15.jar, jasper-compiler-jdt-5.5.15.jar, jasper-runtime-5.5.15.jar
-- Jasper Compiler 5.5.15 (http://tomcat.apache.org) Apache 2.0 License
-- required for running Grails applications (When using JSPs)
-
-* javassist-2.4.GA.jar
-- Javassist 2.4 (http://www.jboss.org/javassist/) MPL or LGPL License
+* javassist-3.8.0.GA.jar
+- Javassist 3.8 (http://www.jboss.org/javassist/) MPL or LGPL License
- required for running Grails applications
-* jdbc2_0-stdext.jar
-- JDBC 2.0 Spec
-- required for running Grails applications
-
-* jetty-6.1.14.jar,jetty-util-6.1.14.jar, servlet-api-2.5-6.1.4.jar, start.jar
-Jetty Container 6.1.14 (http://www.mortbay.org) Apache 2.0 License
-- required for running Grails applications (with embedded Jetty container, not a WAR depedency)
-
-* jetty-naming-6.1.14.jar, jetty-plus-6.1.14.jar, jetty-util-6.1.14.jar
-Jetty JNDI Support 6.1.4 (http://www.mortbay.org)
-- required for running Grails applications (When -Denable.jndi=true)
-
* jline-0.9.91.jar
- JLine 0.9.91 (http://jline.sourceforge.net/)
- required for the Grails shell
@@ -128,16 +116,7 @@ Jetty JNDI Support 6.1.4 (http://www.mortbay.org)
- required for building Grails core
- required for running Grails applications
-* jsr107cache-1.0.jar
-- JCache 1.0 (http://jcp.org/en/jsr/detail?id=107)
-- required for running Grails applications that use Ehcache
-- optional otherwise
-
-* jstl-2.3.jar,jstl-2.4.jar,standard-2.3.jar,standard-2.4.jar
-- Jakarta Standard Implementation of Java Standard Tag Library 2.3/2.4 Spec (http://jakarta.apache.org/taglibs/doc/standard-1.0-doc/index.html) Apache 2.0 License
-- required for running Grails applications (When using JSPs that use JSTL tags)
-
-* jta1.1.jar
+* jta-1.1.jar
- Java Transaction API
- required for running Grails applications
@@ -150,18 +129,14 @@ Jetty JNDI Support 6.1.4 (http://www.mortbay.org)
- Log4J 1.2.15 (http://logging.apache.org/log4j/) Apache 2.0 License
- required for running Grails applications
-* ognl-2.6.9.jar
-- OGNL 2.6.9 (http://www.ognl.org/) OGNL License (http://www.ognl.org/copyright.html)
+* ognl-2.7.3.jar
+- OGNL 2.7.3 (http://www.ognl.org/) OGNL License (http://www.ognl.org/copyright.html)
- required for running Grails applications (When using Web Flows)
* oro-2.0.8.jar
- Jakarta ORO 2.0.8 (http://jakarta.apache.org/oro/) Apache 2.0 License
- required for running Grails applications
-* oscache-2.4.1.jar
-- OSCache 2.4.1 (http://www.opensymphony.com/oscache) OpenSymphony Software License (see http://www.opensymphony.com/oscache/license.action)
-- required for running Grails applications (When using Hibernate caching)
-
* sitemesh-2.4.jar
- Sitemesh 2.4 (http://www.opensymphony.com/sitemesh) OpenSymphony Software License (see http://www.opensymphony.com/sitemesh/license.action)
- required for building Grails core
View
BIN  lib/aspectjrt-1.6.2.jar → lib/aspectjrt-1.6.6.jar
Binary file not shown
View
BIN  lib/aspectjweaver-1.6.2.jar
Binary file not shown
View
BIN  lib/aspectjweaver-1.6.6.jar
Binary file not shown
View
BIN  lib/ehcache-1.6.1.jar
Binary file not shown
View
BIN  lib/ehcache-core-1.7.0.jar
Binary file not shown
View
BIN  lib/javassist-3.4.GA.jar
Binary file not shown
View
BIN  lib/javassist-3.8.0.GA.jar
Binary file not shown
View
BIN  lib/jcl-over-slf4j-1.5.6.jar → lib/jcl-over-slf4j-1.5.8.jar
Binary file not shown
View
BIN  lib/jsr166y-070108.jar
Binary file not shown
View
BIN  lib/jul-to-slf4j-1.5.6.jar
Binary file not shown
View
BIN  lib/jul-to-slf4j-1.5.8.jar
Binary file not shown
View
BIN  lib/ognl-2.6.9.jar
Binary file not shown
View
BIN  lib/oscache-2.4.1.jar
Binary file not shown
View
BIN  lib/slf4j-api-1.5.6.jar → lib/slf4j-api-1.5.8.jar
Binary file not shown
View
BIN  lib/slf4j-log4j12-1.5.6.jar → lib/slf4j-log4j12-1.5.8.jar
Binary file not shown
View
18 maven/grails.pom.in
@@ -69,19 +69,19 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.6</version>
+ <version>1.5.8</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
- <version>1.5.6</version>
+ <version>1.5.8</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
+ <version>1.5.8</version>
<scope>runtime</scope>
</dependency>
@@ -329,6 +329,18 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
View
9 src/grails/grails-app/conf/BuildConfig.groovy
@@ -5,8 +5,8 @@ grails.project.test.reports.dir = "target/test-reports"
grails.project.dependency.resolution = {
// inherit Grails' default dependencies
inherits( "global" ) {
- // uncomment to disable oscache
- // excludes 'oscache'
+ // uncomment to disable ehcache
+ // excludes 'ehcache'
}
log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
repositories {
@@ -25,11 +25,6 @@ grails.project.dependency.resolution = {
dependencies {
// specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
- // uncomment to enable ehcache
-// runtime ("net.sf.ehcache:ehcache:1.6.1") {
-// excludes 'jms', 'commons-logging', 'servlet-api'
-// }
-
// runtime 'mysql:mysql-connector-java:5.1.5'
}
View
2  src/grails/grails-app/conf/DataSource.groovy
@@ -7,7 +7,7 @@ dataSource {
hibernate {
cache.use_second_level_cache=true
cache.use_query_cache=true
- cache.provider_class='com.opensymphony.oscache.hibernate.OSCacheProvider'
+ cache.provider_class='net.sf.ehcache.hibernate.EhCacheProvider'
}
// environment specific settings
environments {
View
4 src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsAnnotationConfiguration.java
@@ -70,8 +70,8 @@ public void setGrailsApplication(GrailsApplication application) {
if(this.grailsApplication != null) {
GrailsClass[] existingDomainClasses = this.grailsApplication.getArtefacts(DomainClassArtefactHandler.TYPE);
- for(int i = 0; i < existingDomainClasses.length;i++) {
- addDomainClass((GrailsDomainClass)existingDomainClasses[i]);
+ for (GrailsClass existingDomainClass : existingDomainClasses) {
+ addDomainClass((GrailsDomainClass) existingDomainClass);
}
}
}
View
10 src/java/org/codehaus/groovy/grails/plugins/orm/hibernate/HibernatePluginSupport.groovy
@@ -149,14 +149,14 @@ public class HibernatePluginSupport {
LOG.info "Set db generation strategy to '${hibProps.'hibernate.hbm2ddl.auto'}'"
if(hibConfig) {
- def cacheProvider = hibConfig.cache.provider_class
- if('org.hibernate.cache.EhCacheProvider' == cacheProvider) {
+ def cacheProvider = hibConfig.cache.provider_class ?: 'net.sf.ehcache.hibernate.EhCacheProvider'
+ if(cacheProvider.contains('OSCacheProvider')) {
try {
- def cacheClass = getClass().classLoader.loadClass('net.sf.ehcache.Cache')
+ def cacheClass = getClass().classLoader.loadClass(cacheProvider)
} catch (Throwable t) {
hibConfig.remove('cache')
- log.error """WARNING: Your cache provider is set to 'org.hibernate.cache.EhCacheProvider' in DataSource.groovy, however the classes for this provider cannot be found.
-Try using Grails' default cache provider: 'org.hibernate.cache.OSCacheProvider'"""
+ log.error """WARNING: Your cache provider is set to '${cacheProvider}' in DataSource.groovy, however the classes for this provider cannot be found.
+Try using Grails' default cache provider: 'net.sf.ehcache.hibernate.EhCacheProvider'"""
}
}
hibProps.putAll(hibConfig.flatten().toProperties('hibernate'))
View
20 src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
@@ -249,8 +249,8 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
"org.grails:grails-core:$grailsVersion",
"org.grails:grails-resources:$grailsVersion",
"org.grails:grails-web:$grailsVersion",
- "org.slf4j:slf4j-api:1.5.6",
- "org.slf4j:slf4j-log4j12:1.5.6",
+ "org.slf4j:slf4j-api:1.5.8",
+ "org.slf4j:slf4j-log4j12:1.5.8",
"org.springframework:org.springframework.test:3.0.0.RC2"
// dependencies needed during development, but not for deployment
@@ -299,7 +299,7 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
"org.springframework:org.springframework.transaction:3.0.0.RC2",
"org.springframework:org.springframework.web:3.0.0.RC2",
"org.springframework:org.springframework.web.servlet:3.0.0.RC2",
- "org.slf4j:slf4j-api:1.5.6") {
+ "org.slf4j:slf4j-api:1.5.8") {
transitive = false
}
@@ -310,8 +310,8 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
"org.springframework:org.springframework.test:3.0.0.RC2"
// dependencies needed at runtime only
- runtime "org.aspectj:aspectjweaver:1.6.2",
- "org.aspectj:aspectjrt:1.6.2",
+ runtime "org.aspectj:aspectjweaver:1.6.6",
+ "org.aspectj:aspectjrt:1.6.6",
"cglib:cglib-nodep:2.1_3",
"commons-fileupload:commons-fileupload:1.2.1",
"oro:oro:2.0.8"
@@ -322,16 +322,16 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
"hsqldb:hsqldb:1.8.0.10"
// caching
- runtime ("opensymphony:oscache:2.4.1") {
+ runtime ("net.sf.ehcache:ehcache-core:1.7.0") {
excludes 'jms', 'commons-logging', 'servlet-api'
}
+
// logging
runtime( "log4j:log4j:1.2.15",
- "org.slf4j:jcl-over-slf4j:1.5.6",
- "org.slf4j:jul-to-slf4j:1.5.6",
-
- "org.slf4j:slf4j-log4j12:1.5.6" ) {
+ "org.slf4j:jcl-over-slf4j:1.5.8",
+ "org.slf4j:jul-to-slf4j:1.5.8",
+ "org.slf4j:slf4j-log4j12:1.5.8" ) {
excludes 'mail', 'jms', 'jmxtools', 'jmxri'
}
Please sign in to comment.
Something went wrong with that request. Please try again.