diff options
| author | Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2023-04-20 10:14:04 +0200 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2023-04-20 10:47:42 +0200 |
| commit | 47fa7cc4d2d145b71fd3c12e555bd47e55072c68 (patch) | |
| tree | e0cac0fb4f41809c6fc7178d27d6de4bf6f15b09 /dev-java/commons-logging/files | |
| parent | 9445521fdde7a87b8274b90926006af21c72a55e (diff) | |
| download | gentoo-47fa7cc4d2d145b71fd3c12e555bd47e55072c68.tar.gz gentoo-47fa7cc4d2d145b71fd3c12e555bd47e55072c68.tar.bz2 gentoo-47fa7cc4d2d145b71fd3c12e555bd47e55072c68.zip | |
dev-java/commons-logging: drop 1.2-r6
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java/commons-logging/files')
| -rw-r--r-- | dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch | 26 | ||||
| -rw-r--r-- | dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch | 42 |
2 files changed, 0 insertions, 68 deletions
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch deleted file mode 100644 index a654ce1fc763..000000000000 --- a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/build.xml -+++ b/build.xml -@@ -773,4 +773,23 @@ - </fail> - </target> - -+ <target depends="" name="javadoc" description="o Generate javadoc" > -+ <mkdir dir="${build.home}/docs" > -+ </mkdir> -+ <tstamp > -+ <format pattern="2001-yyyy" property="year" > -+ </format> -+ </tstamp> -+ <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved." > -+ </property> -+ <property name="title" value="Logging 1.1 API" > -+ </property> -+ <javadoc use="true" author="true" sourcepath="src/main/java" destdir="${build.home}/docs" version="true" private="true" packagenames="org.apache.commons.logging.*" > -+ <classpath > -+ <path refid="javadoc.classpath" > -+ </path> -+ </classpath> -+ </javadoc> -+ </target> -+ - </project> diff --git a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch deleted file mode 100644 index a9fccba8d5c1..000000000000 --- a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/build.xml -+++ b/build.xml -@@ -279,6 +279,8 @@ - classpathref="compile.classpath" - classname="org.apache.log.Logger"/> - -+ <available classname="javax.servlet.ServletContextEvent" property="servletapi.present" classpathref="compile.classpath" ignoresystemclasses="true" ></available> -+ - <available property="avalon-framework.present" - classpathref="compile.classpath" - classname="org.apache.avalon.framework.logger.Logger"/> -@@ -315,6 +317,13 @@ - </echo> - </target> - -+ <target depends="init,discovery" unless="servletapi.present" name="servletapi-warning" > -+ <echo > -+ *** WARNING *** -+ ServletAPI not found: Cannot Build ServletContextCleaner -+ </echo> -+ </target> -+ - <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'> - <echo> - *** WARNING *** -@@ -337,7 +346,7 @@ - </target> - - <target name='warning' -- depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/> -+ depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/> - - <target name="compile-only" - depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/> -@@ -365,6 +374,7 @@ - - <exclude name="org/apache/commons/logging/impl/Log4J*.java"/> - -+ <exclude unless="servletapi.present" name="org/apache/commons/logging/impl/ServletContextCleaner.java" ></exclude> - <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java" - unless="jdk.1.4.present"/> - <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java" |