Author: markt
Date: Sun Aug 20 17:02:52 2006
New Revision: 433094
URL: http://svn.apache.org/viewvc?rev=433094&view=rev
Log:
Fix bug 40252 (commons-logging conflict) by reverting to beanutils 1.6.1
Modified:
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/container/branches/tc4.1.x/build.properties.default
Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=433094&r1=433093&r2=433094&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Sun Aug 20 17:02:52
2006
@@ -146,10 +146,14 @@
[4.1.32] JUnit
Upgrade to 3.8.2
-
[4.1.32] Pure TLS
Upgrade to 0.9b5
+[4.1.33] Commons Collections
+ Upgrade to 3.2
+
+[4.1.33] Commons BeanUtils
+ Revert to 1.6.1
---------------------
@@ -1610,6 +1614,13 @@
[4.1.32] #39769
StandardWrapper
Ensure correct context classloader when calling destroy()
+
+[4.1.33] #40252
+ Commons Logging
+ Revert to Commons BeanUtils 1.6.1 since 1.7.0 introduced an issue
+ that prevented web applications from loading if the Commons Logging
+ library was present in the web application.
+
----------------
Coyote Bug Fixes:
Modified: tomcat/container/branches/tc4.1.x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.properties.default?rev=433094&r1=433093&r2=433094&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/build.properties.default (original)
+++ tomcat/container/branches/tc4.1.x/build.properties.default Sun Aug 20
17:02:52 2006
@@ -56,18 +56,18 @@
# --------------------------------------------------
-# ----- Commons Beanutils, version 1.1 or later -----
-commons-beanutils.home=${base.path}/commons-beanutils-1.7.0
+# ----- Commons Beanutils, version 1.1 to 1.6.1 -----
+commons-beanutils.home=${base.path}/commons-beanutils-1.6.1
commons-beanutils.lib=${commons-beanutils.home}
commons-beanutils.jar=${commons-beanutils.lib}/commons-beanutils.jar
-commons-beanutils.loc=${base-jakarta.loc}/commons/beanutils/binaries/commons-beanutils-1.7.0.tar.gz
+commons-beanutils.loc=${base-jakarta.loc}/commons/beanutils/binaries/commons-beanutils-1.6.1.tar.gz
# ----- Commons Collections, version 1.0 or later -----
-commons-collections.home=${base.path}/commons-collections-3.1
+commons-collections.home=${base.path}/commons-collections-3.2
commons-collections.lib=${commons-collections.home}
-commons-collections.jar=${commons-collections.lib}/commons-collections-3.1.jar
-commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.1.tar.gz
+commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar
+commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.tar.gz
# ----- Commons Digester, version 1.1.1 or later -----
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]