Import Debian changes 1.2-ok2

libcommons-logging-java (1.2-ok2) yangtze; urgency=medium

  * Build for openKylin.
This commit is contained in:
zhouganqing 2022-11-17 20:34:09 +08:00
parent e8a71d016c
commit 471438fdb9
19 changed files with 403 additions and 0 deletions

11
debian/ant.properties vendored Normal file
View File

@ -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

6
debian/changelog vendored Normal file
View File

@ -0,0 +1,6 @@
libcommons-logging-java (1.2-ok2) yangtze; urgency=medium
* Build for openKylin.
-- zhouganqing <zhouganqing@kylinos.cn> Thu, 17 Nov 2022 20:34:09 +0800

1
debian/clean vendored Normal file
View File

@ -0,0 +1 @@
src/main/resources/META-INF/MANIFEST.MF

44
debian/control vendored Normal file
View File

@ -0,0 +1,44 @@
Source: libcommons-logging-java
Section: java
Priority: optional
Maintainer: OpenKylin Developers <packaging@lists.openkylin.top>
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.

48
debian/copyright vendored Normal file
View File

@ -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 <dev@commons.apache.org>
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 <baliuka@apache.org>,
Morgan Delagrange <morgand@apache.org>,
Peter Donald <donaldp@apache.org>,
Robert Burrell Donkin <rdonkin@apache.org>,
Simon Kitching <skitching@apache.org>,
Dennis Lundberg <dennisl@apache.org>,
Costin Manolache <costin@apache.org>,
Craig McClanahan <craigmcc@apache.org>,
Thomas Neidhart <tn@apache.org>,
Scott Sanders <sanders@apache.org>,
Richard Sitze <rsitze@apache.org>,
Brian Stansberry,
Rodney Waldhoff <rwaldhoff@apache.org>,
Matthew P. Del Buono,
Vince Eagen <vince256@comcast.net>,
Peter Lawrey,
Berin Loritsch <bloritsch@apache.org>,
Philippe Mouawad,
Neeme Praks <neeme@apache.org>
Files: debian/*
License: Apache-2.0
Copyright: 2001-2004, Takashi Okamoto <tora@debian.org>
2005-2007, Arnaud Vandyck <avdyk@debian.org>
2005-2007, Wolfgang Baer <WBaer@gmx.de>
2007, Kumar Appaiah <akumar@debian.org>
2007-2009, Michael Koch, <konqueror@gmx.de>
2007-2009, Varun Hiremath <varun@debian.org>
2009, Ludovic Claude <ludovic.claude@laposte.net>
2009, Niels Thykier <niels@thykier.net>
2009-2010, Torsten Werner <twerner@debian.org>
2012, Damien Raude-Morvan <drazzib@debian.org>
2013, Jakub Adam <jakub.adam@ktknet.cz>
2013-2018, Emmanuel Bourg <ebourg@apache.org>
2022, tony mancill <tmancill@debian.org>
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'.

View File

@ -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/*

View File

@ -0,0 +1 @@
dist/docs/api /usr/share/doc/libcommons-logging-java

3
debian/libcommons-logging-java.poms vendored Normal file
View File

@ -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

2
debian/maven.publishedRules vendored Normal file
View File

@ -0,0 +1,2 @@
# force using commons-logging instead of only the api
commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/

3
debian/maven.rules vendored Normal file
View File

@ -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/

53
debian/patches/02_build_javadoc.patch vendored Normal file
View File

@ -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 @@
</target>
- <target name="all" depends="clean,compile,test"
+ <target name="all" depends="clean,compile,test,javadoc"
description="Clean and compile all components"/>
@@ -773,4 +773,39 @@
</fail>
</target>
+ <target name="javadoc" depends="compile"
+ description="Create component Javadoc documentation">
+ <mkdir dir="${dist.home}"/>
+ <mkdir dir="${dist.home}/docs"/>
+ <mkdir dir="${dist.home}/docs/api"/>
+ <javadoc sourcepath="${source.home}"
+ destdir="${dist.home}/docs/api"
+ overview="${source.home}/overview.html"
+ packagenames="org.apache.commons.*"
+ author="true"
+ private="true"
+ version="true"
+ doctitle="&lt;h1&gt;${component.title} (Version
+ ${component.version})&lt;/h1&gt;"
+ windowtitle="${component.title} (Version
+ ${component.version})"
+ bottom='Copyright 2002-2013 The Apache Software
+ Foundation.&lt;!--
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied.
+See the License for the specific language governing permissions and
+limitations under the License.--&gt;'>
+ <classpath refid="test.classpath"/>
+ </javadoc>
+ </target>
+
</project>

View File

@ -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 <akumar@ee.iitm.ac.in>
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());
}
+ */
}
}

View File

@ -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

3
debian/patches/series vendored Normal file
View File

@ -0,0 +1,3 @@
02_build_javadoc.patch
03_disable_securityallow_test.patch
06_classpath_manifest.patch

6
debian/pom-adapters.xml vendored Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?><project>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-adapters</artifactId>
<version>1.2</version>
</project>

165
debian/pom-api.xml vendored Normal file
View File

@ -0,0 +1,165 @@
<?xml version="1.0" encoding="UTF-8"?><project>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
<name>Logging</name>
<version>1.2</version>
<description>Commons Logging is a thin adapter allowing configurable bridging to other,
well known logging systems.</description>
<url>http://jakarta.apache.org/commons/logging/</url>
<issueManagement>
<url>http://issues.apache.org/jira/browse/LOGGING</url>
</issueManagement>
<ciManagement>
<notifiers>
<notifier>
<configuration>
<address>commons-dev@jakarta.apache.org</address>
</configuration>
</notifier>
</notifiers>
</ciManagement>
<inceptionYear>2001</inceptionYear>
<mailingLists>
<mailingList>
<name>Commons Dev List</name>
<subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
<unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
</mailingList>
<mailingList>
<name>Commons User List</name>
<subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
<unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>morgand</id>
<name>Morgan Delagrange</name>
<email>morgand at apache dot org</email>
<organization>Apache</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>rwaldhoff</id>
<name>Rodney Waldhoff</name>
<email>rwaldhoff at apache org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>craigmcc</id>
<name>Craig McClanahan</name>
<email>craigmcc at apache org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>sanders</id>
<name>Scott Sanders</name>
<email>sanders at apache dot org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>rdonkin</id>
<name>Robert Burrell Donkin</name>
<email>rdonkin at apache dot org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>donaldp</id>
<name>Peter Donald</name>
<email>donaldp at apache dot org</email>
<organization></organization>
</developer>
<developer>
<id>costin</id>
<name>Costin Manolache</name>
<email>costin at apache dot org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>rsitze</id>
<name>Richard Sitze</name>
<email>rsitze at apache dot org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>baliuka</id>
<name>Juozas Baliuka</name>
<email>baliuka@apache.org</email>
<organization></organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>skitching</id>
<name>Simon Kitching</name>
<email>skitching@apache.org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>dennisl</id>
<name>Dennis Lundberg</name>
<email>dennisl@apache.org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>bstansberry</id>
<name>Brian Stansberry</name>
</developer>
</developers>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>/LICENSE.txt</url>
</license>
</licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/</connection>
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/</url>
</scm>
<organization>
<name>The Apache Software Foundation</name>
<url>http://jakarta.apache.org</url>
</organization>
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<plugins>
<plugin>
<artifactId>maven-xdoc-plugin</artifactId>
<version>1.9.2</version>
<configuration>
<optional>true</optional>
<comment>&lt;strong>Site Only&lt;/strong> - v1.9.2 (minimum)</comment>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>default</id>
<name>Default Repository</name>
<url>file:///www/jakarta.apache.org/builds/jakarta-commons/logging/</url>
</repository>
<site>
<id>default</id>
<name>Default Site</name>
<url>scp://people.apache.org//www/jakarta.apache.org/commons/logging/</url>
</site>
<status>converted</status>
</distributionManagement>
</project>

11
debian/rules vendored Executable file
View File

@ -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

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (quilt)

2
debian/watch vendored Normal file
View File

@ -0,0 +1,2 @@
version=3
https://archive.apache.org/dist/commons/logging/source/commons-logging-(.*)-src\.tar\.gz debian uupdate