Files
loongoffice/external/apache-commons/patches/logging.patch
David Ostrovsky 2c92030ff0 Kill servlet-api and tomcat
Change-Id: I630da3fa37144b2e5fb5117017f43841ba89c42a
Reviewed-on: https://gerrit.libreoffice.org/6454
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-02 05:43:38 -05:00

36 lines
1.5 KiB
Diff

--- misc/commons-logging-1.1.1-src/build.xml 2007-11-22 00:27:52.000000000 +0100
+++ misc/build/commons-logging-1.1.1-src/build.xml 2008-06-24 14:23:56.316301736 +0200
@@ -127,10 +127,10 @@
<!-- ========== Compiler Defaults ========================================= -->
<!-- Version of java class files to generate. -->
- <property name="target.version" value="1.1"/>
+ <property name="target.version" value="1.5"/>
<!-- Version of java source to accept -->
- <property name="source.version" value="1.2"/>
+ <property name="source.version" value="1.3"/>
<!-- Should Java compilations set the 'debug' compiler option? -->
<property name="compile.debug" value="true"/>
@@ -280,6 +280,10 @@
classpathref="compile.classpath"
classname="org.apache.avalon.framework.logger.Logger"/>
+ <available property="servlet-api.present"
+ classpathref="compile.classpath"
+ classname="javax.servlet.ServletContextListener"/>
+
<available file="${log4j12.jar}" property="log4j12.present"/>
<available file="${log4j13.jar}" property="log4j13.present"/>
<available file="${build.home}/docs" property="maven.generated.docs.present"/>
@@ -370,6 +374,8 @@
unless="logkit.present"/>
<exclude name="org/apache/commons/logging/impl/AvalonLogger.java"
unless="avalon-framework.present"/>
+ <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"
+ unless="servlet-api.present"/>
</javac>
</target>