From c0c647127dd621e89ac468d1f7e33da630ab0b07 Mon Sep 17 00:00:00 2001
From: Simon Kitching <skitching@apache.org>
Date: Sun, 22 Jan 2006 01:47:01 +0000
Subject: [PATCH] Exclude jdk14 logger from api jar Include WeakHashtable in
 api jar Make ant dependencies used in build be the same as those in the maven
 project.xml file.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@371164 13f79535-47bb-0310-9956-ffa450edef68
---
 build.properties.sample | 2 +-
 build.xml               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.properties.sample b/build.properties.sample
index f1b59da..9ddcd07 100644
--- a/build.properties.sample
+++ b/build.properties.sample
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Apache Log4j 1.2.x series
-log4j12.jar=lib/log4j-1.2.6.jar
+log4j12.jar=lib/log4j-1.2.12.jar
 
 # Apache Log4j 1.3.x series
 log4j13.jar=lib/log4j-1.3.0.jar
diff --git a/build.xml b/build.xml
index 5a60cc4..6a9fcf8 100644
--- a/build.xml
+++ b/build.xml
@@ -67,7 +67,7 @@
 
   <!-- The locations of necessary jar files -->
   <property name="junit.jar"               value="junit-3.8.1.jar"/>
-  <property name="log4j12.jar"             value="log4j-1.2.9.jar"/>
+  <property name="log4j12.jar"             value="log4j-1.2.12.jar"/>
   <property name="log4j13.jar"             value="log4j-1.3.0.jar"/>
   <property name="logkit.jar"              value="logkit-1.0.1.jar"/>
   <property name="avalon-framework.jar"    value="avalon-framework-4.1.3.jar"/>
@@ -216,7 +216,7 @@
     <get dest="lib/junit-3.8.1.jar" src="${getlibs.base}/junit/jars/junit-3.8.1.jar"/>
     <get dest="lib/logkit-1.0.1.jar" src="${getlibs.base}/logkit/jars/logkit-1.0.1.jar"/>
     <get dest="lib/avalon-framework-4.1.3.jar" src="${getlibs.base}/avalon-framework/jars/avalon-framework-4.1.3.jar"/>
-    <get dest="lib/log4j-1.2.6.jar" src="${getlibs.base}/log4j/jars/log4j-1.2.6.jar"/>
+    <get dest="lib/log4j-1.2.12.jar" src="${getlibs.base}/log4j/jars/log4j-1.2.12.jar"/>
     <get dest="lib/servletapi-2.3.jar" src="${getlibs.base}/servletapi/jars/servletapi-2.3.jar"/>
   </target>
 
@@ -429,7 +429,7 @@
          manifest="${build.home}/conf/MANIFEST.MF">
       <include name="org/apache/commons/logging/*.class" />
       <include name="org/apache/commons/logging/impl/LogFactoryImpl*.class" />
-      <include name="org/apache/commons/logging/impl/Jdk14*.class" />
+      <include name="org/apache/commons/logging/impl/WeakHashtable*.class" />
       <include name="org/apache/commons/logging/impl/SimpleLog*.class" />
       <include name="org/apache/commons/logging/impl/NoOpLog*.class" />
       <include name="META-INF/LICENSE.txt"/>