From 471438fdb910055b6cea7cc080ad080f752789a2 Mon Sep 17 00:00:00 2001 From: zhouganqing Date: Thu, 17 Nov 2022 20:34:09 +0800 Subject: [PATCH] Import Debian changes 1.2-ok2 libcommons-logging-java (1.2-ok2) yangtze; urgency=medium * Build for openKylin. --- debian/ant.properties | 11 ++ debian/changelog | 6 + debian/clean | 1 + debian/control | 44 +++++ debian/copyright | 48 +++++ debian/libcommons-logging-java-doc.doc-base | 11 ++ debian/libcommons-logging-java-doc.install | 1 + debian/libcommons-logging-java.poms | 3 + debian/maven.publishedRules | 2 + debian/maven.rules | 3 + debian/patches/02_build_javadoc.patch | 53 ++++++ .../03_disable_securityallow_test.patch | 23 +++ debian/patches/06_classpath_manifest.patch | 9 + debian/patches/series | 3 + debian/pom-adapters.xml | 6 + debian/pom-api.xml | 165 ++++++++++++++++++ debian/rules | 11 ++ debian/source/format | 1 + debian/watch | 2 + 19 files changed, 403 insertions(+) create mode 100644 debian/ant.properties create mode 100644 debian/changelog create mode 100644 debian/clean create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/libcommons-logging-java-doc.doc-base create mode 100644 debian/libcommons-logging-java-doc.install create mode 100644 debian/libcommons-logging-java.poms create mode 100644 debian/maven.publishedRules create mode 100644 debian/maven.rules create mode 100644 debian/patches/02_build_javadoc.patch create mode 100644 debian/patches/03_disable_securityallow_test.patch create mode 100644 debian/patches/06_classpath_manifest.patch create mode 100644 debian/patches/series create mode 100644 debian/pom-adapters.xml create mode 100644 debian/pom-api.xml create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/ant.properties b/debian/ant.properties new file mode 100644 index 0000000..3834aa7 --- /dev/null +++ b/debian/ant.properties @@ -0,0 +1,11 @@ +log4j.jar=/usr/share/java/log4j-1.2.jar +log4j12.jar=/usr/share/java/log4j-1.2.jar +logkit.jar=/usr/share/java/excalibur-logkit.jar +avalon-framework.jar=/usr/share/java/avalon-framework.jar +junit.jar=/usr/share/java/junit.jar +servletapi.jar=/usr/share/java/servlet-api.jar +test.failonerror=false + +source.version=1.7 +target.version=1.7 + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..320c7d8 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +libcommons-logging-java (1.2-ok2) yangtze; urgency=medium + + * Build for openKylin. + + -- zhouganqing Thu, 17 Nov 2022 20:34:09 +0800 + \ No newline at end of file diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..6b9c754 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +src/main/resources/META-INF/MANIFEST.MF diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..a75ec92 --- /dev/null +++ b/debian/control @@ -0,0 +1,44 @@ +Source: libcommons-logging-java +Section: java +Priority: optional +Maintainer: OpenKylin Developers +Build-Depends: + ant-optional, + debhelper-compat (= 13), + default-jdk, + junit, + libavalon-framework-java, + libcommons-parent-java, + libexcalibur-logkit-java, + liblog4j1.2-java, + libservlet-api-java, + maven-repo-helper +Standards-Version: 4.6.0 +Vcs-Git: https://gitee.com/openkylin/libcommons-logging-java.git +Vcs-Browser: https://gitee.com/openkylin/libcommons-logging-java +Homepage: https://commons.apache.org/proper/commons-logging/ +Rules-Requires-Root: no + +Package: libcommons-logging-java +Architecture: all +Depends: libcommons-parent-java, ${misc:Depends} +Suggests: + libavalon-framework-java, + libcommons-logging-java-doc, + libexcalibur-logkit-java, + liblog4j1.2-java +Description: common wrapper interface for several logging APIs + Provides a simple, component oriented interface together with wrappers for + several existing java logging systems. The user can choose at runtime which + system he want to use for logging. + +Package: libcommons-logging-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: common wrapper interface for several logging APIs (documentation) + Provides a simple, component oriented interface together with wrappers for + several existing java logging systems. The user can choose at runtime which + system he want to use for logging. + . + This package contains the documentation. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..8996926 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,48 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Apache Commons Logging +Upstream-Contact: Apache Commons Developers +Source: https://commons.apache.org/proper/commons-logging/ + +Files: * +Copyright: 2001-2014, The Apache Software Foundation. +License: Apache-2.0 +Comment: + Upstream authors: Juozas Baliuka , + Morgan Delagrange , + Peter Donald , + Robert Burrell Donkin , + Simon Kitching , + Dennis Lundberg , + Costin Manolache , + Craig McClanahan , + Thomas Neidhart , + Scott Sanders , + Richard Sitze , + Brian Stansberry, + Rodney Waldhoff , + Matthew P. Del Buono, + Vince Eagen , + Peter Lawrey, + Berin Loritsch , + Philippe Mouawad, + Neeme Praks + +Files: debian/* +License: Apache-2.0 +Copyright: 2001-2004, Takashi Okamoto + 2005-2007, Arnaud Vandyck + 2005-2007, Wolfgang Baer + 2007, Kumar Appaiah + 2007-2009, Michael Koch, + 2007-2009, Varun Hiremath + 2009, Ludovic Claude + 2009, Niels Thykier + 2009-2010, Torsten Werner + 2012, Damien Raude-Morvan + 2013, Jakub Adam + 2013-2018, Emmanuel Bourg + 2022, tony mancill + +License: Apache-2.0 + On Debian systems, the full text of the Apache License can be found + in the file `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/libcommons-logging-java-doc.doc-base b/debian/libcommons-logging-java-doc.doc-base new file mode 100644 index 0000000..d19bd16 --- /dev/null +++ b/debian/libcommons-logging-java-doc.doc-base @@ -0,0 +1,11 @@ +Document: libcommons-logging-java +Title: Programmer API for Commons Logging +Author: Apache Commons Logging developers +Abstract: A common wrapper interface for several logging APIs, providing + a simple, component oriented interface. The user can choose at runtime + which system they want to use for logging. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-logging-java/api/index.html +Files: /usr/share/doc/libcommons-logging-java/api/* diff --git a/debian/libcommons-logging-java-doc.install b/debian/libcommons-logging-java-doc.install new file mode 100644 index 0000000..98268c4 --- /dev/null +++ b/debian/libcommons-logging-java-doc.install @@ -0,0 +1 @@ +dist/docs/api /usr/share/doc/libcommons-logging-java diff --git a/debian/libcommons-logging-java.poms b/debian/libcommons-logging-java.poms new file mode 100644 index 0000000..915cdaf --- /dev/null +++ b/debian/libcommons-logging-java.poms @@ -0,0 +1,3 @@ +pom.xml --has-package-version --java-lib --artifact=target/commons-logging-1.2.jar +debian/pom-api.xml --has-package-version --java-lib --artifact=target/commons-logging-api-1.2.jar +debian/pom-adapters.xml --has-package-version --java-lib --artifact=target/commons-logging-adapters-1.2.jar diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..4bc0edf --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1,2 @@ +# force using commons-logging instead of only the api +commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..c7c7721 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,3 @@ +junit junit jar s/3\..*/3.x/ +log4j log4j jar s/1\.2\..*/1.2.x/ +s/avalon-framework/org.apache.avalon/ avalon-framework jar s/.*/debian/ diff --git a/debian/patches/02_build_javadoc.patch b/debian/patches/02_build_javadoc.patch new file mode 100644 index 0000000..760f125 --- /dev/null +++ b/debian/patches/02_build_javadoc.patch @@ -0,0 +1,53 @@ +Description: Adds a target to generate the javadoc. +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -613,7 +613,7 @@ + + + +- + + +@@ -773,4 +773,39 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ + diff --git a/debian/patches/03_disable_securityallow_test.patch b/debian/patches/03_disable_securityallow_test.patch new file mode 100644 index 0000000..431e5c6 --- /dev/null +++ b/debian/patches/03_disable_securityallow_test.patch @@ -0,0 +1,23 @@ +Description: This patch has been added to disable the SecurityAllowedTestCase + altogether, as it fails to complete successfully on GCJ. The issue + seems to be with GCJ, so till the time that GCJ is fixed, we don't run + this test. +Author: Kumar Appaiah +Forwarded: not-needed +--- a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java ++++ b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java +@@ -92,6 +92,7 @@ + mySecurityManager.addPermission(new AllPermission()); + System.setSecurityManager(mySecurityManager); + ++ /* + try { + // Use reflection so that we can control exactly when the static + // initialiser for the LogFactory class is executed. +@@ -136,5 +137,6 @@ + t.printStackTrace(pw); + fail("Unexpected exception:" + t.getMessage() + ":" + sw.toString()); + } ++ */ + } + } diff --git a/debian/patches/06_classpath_manifest.patch b/debian/patches/06_classpath_manifest.patch new file mode 100644 index 0000000..89896e0 --- /dev/null +++ b/debian/patches/06_classpath_manifest.patch @@ -0,0 +1,9 @@ +Description: Adds the classpath entry to the manifest file +Forwarded: not-needed +--- a/src/conf/MANIFEST.MF ++++ b/src/conf/MANIFEST.MF +@@ -26,3 +26,4 @@ + Include-Resource: META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt= + LICENSE.txt + Specification-Version: 1.2 ++Class-Path: avalon-framework.jar excalibur-logkit.jar log4j-1.2.jar diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6c98189 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +02_build_javadoc.patch +03_disable_securityallow_test.patch +06_classpath_manifest.patch diff --git a/debian/pom-adapters.xml b/debian/pom-adapters.xml new file mode 100644 index 0000000..ece82be --- /dev/null +++ b/debian/pom-adapters.xml @@ -0,0 +1,6 @@ + + 4.0.0 + commons-logging + commons-logging-adapters + 1.2 + diff --git a/debian/pom-api.xml b/debian/pom-api.xml new file mode 100644 index 0000000..bf3997e --- /dev/null +++ b/debian/pom-api.xml @@ -0,0 +1,165 @@ + + 4.0.0 + commons-logging + commons-logging-api + Logging + 1.2 + Commons Logging is a thin adapter allowing configurable bridging to other, + well known logging systems. + http://jakarta.apache.org/commons/logging/ + + http://issues.apache.org/jira/browse/LOGGING + + + + + +
commons-dev@jakarta.apache.org
+ + + + + 2001 + + + Commons Dev List + commons-dev-subscribe@jakarta.apache.org + commons-dev-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/ + + + Commons User List + commons-user-subscribe@jakarta.apache.org + commons-user-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/ + + + + + morgand + Morgan Delagrange + morgand at apache dot org + Apache + + Java Developer + + + + rwaldhoff + Rodney Waldhoff + rwaldhoff at apache org + Apache Software Foundation + + + craigmcc + Craig McClanahan + craigmcc at apache org + Apache Software Foundation + + + sanders + Scott Sanders + sanders at apache dot org + Apache Software Foundation + + + rdonkin + Robert Burrell Donkin + rdonkin at apache dot org + Apache Software Foundation + + + donaldp + Peter Donald + donaldp at apache dot org + + + + costin + Costin Manolache + costin at apache dot org + Apache Software Foundation + + + rsitze + Richard Sitze + rsitze at apache dot org + Apache Software Foundation + + + baliuka + Juozas Baliuka + baliuka@apache.org + + + Java Developer + + + + skitching + Simon Kitching + skitching@apache.org + Apache Software Foundation + + + dennisl + Dennis Lundberg + dennisl@apache.org + Apache Software Foundation + + + bstansberry + Brian Stansberry + + + + + The Apache Software License, Version 2.0 + /LICENSE.txt + + + + scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/ + http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/ + + + The Apache Software Foundation + http://jakarta.apache.org + + + src/java + src/test + + + maven-xdoc-plugin + 1.9.2 + + true + <strong>Site Only</strong> - v1.9.2 (minimum) + + + + + + + junit + junit + 3.8.1 + test + true + + + + + default + Default Repository + file:///www/jakarta.apache.org/builds/jakarta-commons/logging/ + + + default + Default Site + scp://people.apache.org//www/jakarta.apache.org/commons/logging/ + + converted + + diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..afe4825 --- /dev/null +++ b/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +%: + dh $@ --buildsystem=ant --with maven-repo-helper + +override_dh_auto_build: + # copy MANIFEST.MF to src/main/resources/META-INF/ to include it in the jar + install -d src/main/resources/META-INF/ + install -m644 src/conf/MANIFEST.MF src/main/resources/META-INF/ + + dh_auto_build -- dist diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..7970380 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://archive.apache.org/dist/commons/logging/source/commons-logging-(.*)-src\.tar\.gz debian uupdate