GRAILS-6638 updated Log4j to 1.2.16

fbxie · Aug 24, 2010 · af181a3 · af181a3
1 parent 902092c
commit af181a3
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/.classpath b/.classpath
@@ -30,7 +30,7 @@
 	<classpathentry kind="lib" path="lib/jstl-1.1.2.jar"/>
 	<classpathentry kind="lib" path="lib/jta-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
 	<classpathentry kind="lib" path="lib/ognl-2.7.3.jar"/>
 	<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>
 	<classpathentry kind="lib" path="lib/serializer-2.7.1.jar"/>

diff --git a/build.properties b/build.properties
@@ -7,7 +7,7 @@ grails.src.groovy=src/groovy
 bundlor.javax.persistence.version=1.0.2.GA
 bundlor.webflow.version=2.0.8
 bundlor.xpp.version=1.1.3
-bundlor.log4j.version=1.2.15
+bundlor.log4j.version=1.2.16
 bundlor.sitemesh.version=2.4.0
 bundlor.hibernate.version=3.3.1.GA
 bundlor.javassist.version=3.9.0

diff --git a/dependencies.txt b/dependencies.txt
@@ -125,8 +125,8 @@ The following libraries are included in Grails because they are required either
 - required for building Grails core
 - required for the command line tools (Gant)
 
-* log4j-1.2.15.jar
-- Log4J 1.2.15 (http://logging.apache.org/log4j/) Apache 2.0 License
+* log4j-1.2.16.jar
+- Log4J 1.2.16 (http://logging.apache.org/log4j/) Apache 2.0 License
 - required for running Grails applications
 
 * ognl-2.7.3.jar

diff --git a/grails.ipr b/grails.ipr
@@ -481,7 +481,7 @@
         <root url="jar://$PROJECT_DIR$/lib/commons-el-1.0.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/commons-cli-1.0.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/oro-2.0.8.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.15.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.16.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/commons-io-1.4.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/commons-codec-1.3.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/commons-lang-2.4.jar!/" />

diff --git a/lib/log4j-1.2.15.jar b/lib/log4j-1.2.15.jar
diff --git a/lib/log4j-1.2.16.jar b/lib/log4j-1.2.16.jar
diff --git a/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy b/src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
@@ -315,7 +315,7 @@ class IvyDependencyManager extends AbstractIvyDependencyManager implements Depen
                     }
 
                     // logging
-                    "${runtimeDependenciesMethod}"("log4j:log4j:1.2.15",
+                    "${runtimeDependenciesMethod}"("log4j:log4j:1.2.16",
                             "org.slf4j:jcl-over-slf4j:1.5.8",
                             "org.slf4j:jul-to-slf4j:1.5.8",
                             "org.slf4j:slf4j-log4j12:1.5.8" ) {

diff --git a/src/test/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy b/src/test/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy
@@ -722,7 +722,7 @@ class IvyDependencyManagerTests extends GroovyTestCase {
                     "commons-io:commons-io:1.4",
                     "commons-lang:commons-lang:2.4",
                     "javax.transaction:jta:1.1",
-                    "log4j:log4j:1.2.15",
+                    "log4j:log4j:1.2.16",
                     "net.sf.ehcache:ehcache:1.6.1",
                     "opensymphony:oscache:2.4.1",
                     "opensymphony:sitemesh:2.4",