diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2013-10-27 23:12:14 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-02 05:43:38 -0500 |
| commit | 2c92030ff07aff9b10e49844343390925b81545c (patch) | |
| tree | 384cf5b8ed3bc1da3ea19f330ccba511baac0d58 /external/apache-commons | |
| parent | 78e4b97a18a18f84c228de64fc48cee48138fbfe (diff) | |
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>
Diffstat (limited to 'external/apache-commons')
| -rw-r--r-- | external/apache-commons/ExternalProject_apache_commons_logging.mk | 8 | ||||
| -rw-r--r-- | external/apache-commons/patches/logging.patch | 24 |
2 files changed, 22 insertions, 10 deletions
diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk index 785224b0c5c5..afb2f0178d22 100644 --- a/external/apache-commons/ExternalProject_apache_commons_logging.mk +++ b/external/apache-commons/ExternalProject_apache_commons_logging.mk @@ -9,10 +9,6 @@ $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging)) -$(eval $(call gb_ExternalProject_use_externals,apache_commons_logging,\ - servlet_api \ -)) - $(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\ build \ )) @@ -24,10 +20,6 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) : -q \ -f build.xml \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(filter YES,$(SYSTEM_TOMCAT))\ - ,-Dservletapi.jar=$(SERVLETAPI_JAR) \ - ,-Dservletapi.jar=$(call gb_UnpackedTarball_get_dir,tomcat)/servletapi/jsr154/dist/lib/servlet-api.jar \ - )\ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ diff --git a/external/apache-commons/patches/logging.patch b/external/apache-commons/patches/logging.patch index f96eda38075c..9514aaed6f6e 100644 --- a/external/apache-commons/patches/logging.patch +++ b/external/apache-commons/patches/logging.patch @@ -1,5 +1,5 @@ ---- 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 +--- 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 ========================================= --> @@ -13,3 +13,23 @@ <!-- 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> + |