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
This commit is contained in:
@@ -13,7 +13,7 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
# Apache Log4j 1.2.x series
|
# 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
|
# Apache Log4j 1.3.x series
|
||||||
log4j13.jar=lib/log4j-1.3.0.jar
|
log4j13.jar=lib/log4j-1.3.0.jar
|
||||||
|
|||||||
@@ -67,7 +67,7 @@
|
|||||||
|
|
||||||
<!-- The locations of necessary jar files -->
|
<!-- The locations of necessary jar files -->
|
||||||
<property name="junit.jar" value="junit-3.8.1.jar"/>
|
<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="log4j13.jar" value="log4j-1.3.0.jar"/>
|
||||||
<property name="logkit.jar" value="logkit-1.0.1.jar"/>
|
<property name="logkit.jar" value="logkit-1.0.1.jar"/>
|
||||||
<property name="avalon-framework.jar" value="avalon-framework-4.1.3.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/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/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/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"/>
|
<get dest="lib/servletapi-2.3.jar" src="${getlibs.base}/servletapi/jars/servletapi-2.3.jar"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
@@ -429,7 +429,7 @@
|
|||||||
manifest="${build.home}/conf/MANIFEST.MF">
|
manifest="${build.home}/conf/MANIFEST.MF">
|
||||||
<include name="org/apache/commons/logging/*.class" />
|
<include name="org/apache/commons/logging/*.class" />
|
||||||
<include name="org/apache/commons/logging/impl/LogFactoryImpl*.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/SimpleLog*.class" />
|
||||||
<include name="org/apache/commons/logging/impl/NoOpLog*.class" />
|
<include name="org/apache/commons/logging/impl/NoOpLog*.class" />
|
||||||
<include name="META-INF/LICENSE.txt"/>
|
<include name="META-INF/LICENSE.txt"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user