Sync from SUSE:SLFO:Main apache-commons-logging revision 53a8eb748a654c0ca9aa5769489240bb
This commit is contained in:
commit
b317f42d76
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
206
apache-commons-logging.changes
Normal file
206
apache-commons-logging.changes
Normal file
@ -0,0 +1,206 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 22 19:04:25 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Do not build against the log4j12 packages, use the new reload4j
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 28 07:28:43 UTC 2021 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Disable tests everywhere, not only for arm6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 24 09:22:40 UTC 2021 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch
|
||||
* no-tests.patch
|
||||
+ ignore failing tests for arm6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 1 08:45:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Build against the new compatibility log4j12-mini package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 25 17:45:27 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Remove pom parent, since we don't use it when not building with
|
||||
maven
|
||||
- Use the pom.xml distributed with the package instead of
|
||||
downloading the same file as a separate source
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 6 06:47:05 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Build against glassfish-servlet-api
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 28 12:43:50 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* commons-logging-manifests.patch
|
||||
+ Different Bundle-SymbolicName for different jars
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 19 20:35:40 UTC 2018 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Cleanup of maven pom files installation
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 15 10:56:40 UTC 2018 - fstrba@suse.com
|
||||
|
||||
- Modified patch:
|
||||
* commons-logging-1.2-sourcetarget.patch
|
||||
+ Build with source and target 8 to prepare for a possible
|
||||
removal of 1.6 compatibility
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 7 12:07:36 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Added patch:
|
||||
* commons-logging-1.2-sourcetarget.patch
|
||||
- set java source and target versions to 1.6 in order to allow
|
||||
build with jdk9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 19 11:03:15 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Remove bootstrap conditional
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 19 10:51:10 UTC 2017 - pcervinka@suse.com
|
||||
|
||||
- New build dependency: javapackages-local
|
||||
- Fixed requires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 24 13:55:36 UTC 2016 - p.drouand@gmail.com
|
||||
|
||||
- Update to version 1.2
|
||||
see http://commons.apache.org/proper/commons-logging/changes-report.html
|
||||
or RELEASE-NOTES.txt for details
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 25 09:20:20 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Drop maven conditionals that were never triggered.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 25 09:16:56 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Drop gpg offline and rely on service
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 18 09:46:00 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Fix build with new javapackages-tools
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 4 10:31:13 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Use log4j-mini to hopefully avoid build-cycle
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 20 15:14:30 UTC 2015 - dmacvicar@suse.de
|
||||
|
||||
- add the log4j adapter to commons-logging-adapters
|
||||
(bnc#918852)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 12 11:10:06 UTC 2014 - lnussel@suse.de
|
||||
|
||||
- add bcond java_bootstrap to build without unit tests
|
||||
(commons-logging-1.1.3-src-junit.diff)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 27 13:22:19 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Provides obsoletes to be versioned
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 9 11:04:11 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Move from jpackage-utils to javapackage-tools
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 27 08:51:35 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
- update to 1.1.3 (bugfix release)
|
||||
see http://commons.apache.org/proper/commons-logging/changes-report.html
|
||||
or RELEASE-NOTES.txt for details
|
||||
- add gpg verification
|
||||
- use new add_maven_depmap from javapackages-tools
|
||||
- dropped unecessary patches/sources
|
||||
* build.xml.patch
|
||||
* commons-logging-eclipse-manifest.patch
|
||||
* commons-logging-maven-release-plugin.patch
|
||||
* and commons-logging.depmap
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 2 13:39:00 UTC 2012 - mvyskocil@suse.cz
|
||||
|
||||
- provide commons-logging
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 28 13:50:53 UTC 2012 - mvyskocil@suse.cz
|
||||
|
||||
- fix build cycle, do not require avalon-* for build and use servletapi5
|
||||
instead of tomcat6 package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 8 14:16:04 UTC 2012 - mvyskocil@suse.cz
|
||||
|
||||
- rename to apache-commons-logging to follow jpackage and Fedora
|
||||
- update to 1.1.1 (bugfix release)
|
||||
* usable under security policy (catches SecurityException)
|
||||
* show content of chained exceptions
|
||||
* fix unit tests on linux an java6
|
||||
* provide maven2 pom file
|
||||
* fix thread-safety bug
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 27 20:32:52 UTC 2011 - andrea.turrini@gmail.com
|
||||
|
||||
- fixed typos in jakarta-commons-logging.spec
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 16 13:01:14 CEST 2008 - coolo@suse.de
|
||||
|
||||
- trying to reduce build requires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 8 16:43:03 CEST 2007 - kesselborn@suse.de
|
||||
|
||||
- remove avalon references ... avalon is dropped and support for it hence not needed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 25 13:26:40 CEST 2006 - skh@suse.de
|
||||
|
||||
- fix BuildRequires
|
||||
- don't use icecream
|
||||
- use source="1.4" and target="1.4" for build with java 1.5
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:46:38 CET 2006 - mls@suse.de
|
||||
|
||||
- converted neededforbuild to BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 27 17:00:36 CEST 2005 - jsmeix@suse.de
|
||||
|
||||
- Adjustments in the spec file.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 18 16:23:44 CEST 2005 - jsmeix@suse.de
|
||||
|
||||
- Current version 1.0.4 from JPackage.org
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 16 14:43:22 CEST 2004 - skh@suse.de
|
||||
|
||||
- Fix prerequires of javadoc subpackage
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 5 20:21:48 CEST 2004 - skh@suse.de
|
||||
|
||||
- Initial package created with version 1.0.4 (JPackage 1.5)
|
||||
|
70
apache-commons-logging.keyring
Normal file
70
apache-commons-logging.keyring
Normal file
@ -0,0 +1,70 @@
|
||||
pub 4096R/99945293 2012-01-19
|
||||
uid Thomas Neidhart <thomas.neidhart@gmail.com>
|
||||
uid Thomas Neidhart (CODE SIGNING KEY) <tn@apache.org>
|
||||
sub 4096R/264EE073 2012-01-19
|
||||
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
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
|
||||
WVvXdM0hFPWrUzI=
|
||||
=ChmV
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
114
apache-commons-logging.spec
Normal file
114
apache-commons-logging.spec
Normal file
@ -0,0 +1,114 @@
|
||||
#
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2000-2007, JPackage Project
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define base_name logging
|
||||
%define short_name commons-%{base_name}
|
||||
Name: apache-%{short_name}
|
||||
Version: 1.2
|
||||
Release: 0
|
||||
Summary: Apache Commons Logging
|
||||
License: Apache-2.0
|
||||
URL: http://commons.apache.org/%{base_name}
|
||||
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
||||
Source1: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
|
||||
Source2: apache-commons-logging.keyring
|
||||
Source4: http://central.maven.org/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
|
||||
Patch0: commons-logging-1.1.3-src-junit.diff
|
||||
Patch1: commons-logging-1.2-sourcetarget.patch
|
||||
Patch2: commons-logging-manifests.patch
|
||||
Patch3: no-tests.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: glassfish-servlet-api
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: reload4j
|
||||
Requires: java >= 1.8
|
||||
Provides: jakarta-%{short_name} = %{version}-%{release}
|
||||
Obsoletes: jakarta-%{short_name} < %{version}
|
||||
Provides: %{short_name} = %{version}-%{release}
|
||||
Obsoletes: %{short_name} < %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
The commons-logging package provides a simple, component oriented
|
||||
interface (org.apache.commons.logging.Log) together with wrappers for
|
||||
logging systems. The user can choose at runtime which system they want
|
||||
to use. In addition, a small number of basic implementations are
|
||||
provided to allow users to use the package standalone.
|
||||
commons-logging was heavily influenced by Avalon's Logkit and Log4J. The
|
||||
commons-logging abstraction is meant to minimize the differences between
|
||||
the two, and to allow a developer to not tie himself to a particular
|
||||
logging implementation.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{short_name}-%{version}-src
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
|
||||
|
||||
#FIXME
|
||||
rm ./src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
|
||||
|
||||
%pom_remove_parent .
|
||||
|
||||
%build
|
||||
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
|
||||
mkdir -p $MAVEN_REPO_LOCAL
|
||||
|
||||
export CLASSPATH=$(build-classpath \
|
||||
plexus/ \
|
||||
):target/classes:target/test-classes
|
||||
ant \
|
||||
-Dmaven.mode.offline=true -lib %{_javadir} \
|
||||
-Dlog4j12.jar=$(find-jar reload4j/reload4j) -Dservletapi.jar=$(find-jar glassfish-servlet-api) \
|
||||
dist
|
||||
|
||||
%install
|
||||
# jars
|
||||
install -d -m 755 %{buildroot}%{_javadir}
|
||||
install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
install -p -m 644 target/%{short_name}-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar
|
||||
install -p -m 644 target/%{short_name}-adapters-%{version}.jar %{buildroot}%{_javadir}/%{name}-adapters.jar
|
||||
|
||||
pushd %{buildroot}%{_javadir}
|
||||
for jar in %{name}*; do
|
||||
ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
|
||||
done
|
||||
popd
|
||||
|
||||
# pom
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/%{short_name}-%{version}.pom
|
||||
sed 's#<version>1.1</version>#<version>1.2</version>#g' < %{SOURCE4} > tmp.pom
|
||||
install -pm 644 tmp.pom %{buildroot}/%{_mavenpomdir}/%{short_name}-api-%{version}.pom
|
||||
sed -e 's#<version>1.1</version>#<version>1.2</version>#g' -e "s#%{short_name}-api#%{short_name}-adapters#g" < %{SOURCE4} > tmp.pom
|
||||
install -pm 644 tmp.pom %{buildroot}/%{_mavenpomdir}/%{short_name}-adapters-%{version}.pom
|
||||
%add_maven_depmap %{short_name}-%{version}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}","apache:%{short_name}"
|
||||
%add_maven_depmap %{short_name}-api-%{version}.pom %{short_name}-api.jar -a "org.apache.commons:%{short_name}-api","apache:%{short_name}-api"
|
||||
%add_maven_depmap %{short_name}-adapters-%{version}.pom %{short_name}-adapters.jar -a "org.apache.commons:%{short_name}-adapters","apache:%{short_name}-adapters"
|
||||
|
||||
%files -f .mfiles
|
||||
%{_javadir}/%{name}*.jar
|
||||
%license LICENSE.txt
|
||||
%doc PROPOSAL.html RELEASE-NOTES.txt NOTICE.txt
|
||||
|
||||
%changelog
|
28
commons-logging-1.1.3-src-junit.diff
Normal file
28
commons-logging-1.1.3-src-junit.diff
Normal file
@ -0,0 +1,28 @@
|
||||
Index: commons-logging-1.1.3-src/build.xml
|
||||
===================================================================
|
||||
--- commons-logging-1.1.3-src.orig/build.xml
|
||||
+++ commons-logging-1.1.3-src/build.xml
|
||||
@@ -719,7 +719,8 @@
|
||||
- ant -Dtestmatch=**/FooTestCase testall
|
||||
-->
|
||||
|
||||
- <target name="test" depends="log4j12-test-warning, compile.tests"
|
||||
+ <target name="test" depends="log4j12-test-warning, compile.tests, junit-present"
|
||||
+ if="junit.present"
|
||||
description="Run all unit tests">
|
||||
<echo message="Test output can be found in directory ${build.home}/test-reports."/>
|
||||
<delete dir="${build.home}/test-reports"/>
|
||||
@@ -773,4 +774,13 @@
|
||||
</fail>
|
||||
</target>
|
||||
|
||||
+ <target name="test-junit-present">
|
||||
+ <available classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" property="junit.present"/>
|
||||
+ </target>
|
||||
+ <target name="junit-present" depends="test-junit-present" unless="junit.present">
|
||||
+ <echo>================================= WARNING ================================</echo>
|
||||
+ <echo> Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. </echo>
|
||||
+ <echo>==========================================================================</echo>
|
||||
+ </target>
|
||||
+
|
||||
</project>
|
15
commons-logging-1.2-sourcetarget.patch
Normal file
15
commons-logging-1.2-sourcetarget.patch
Normal file
@ -0,0 +1,15 @@
|
||||
--- commons-logging-1.2-src/build.xml 2014-07-05 20:11:36.000000000 +0200
|
||||
+++ commons-logging-1.2-src/build.xml 2017-09-07 14:05:10.680439161 +0200
|
||||
@@ -130,10 +130,10 @@
|
||||
<!-- ========== Compiler Defaults ========================================= -->
|
||||
|
||||
<!-- Version of java class files to generate. -->
|
||||
- <property name="target.version" value="1.2"/>
|
||||
+ <property name="target.version" value="8"/>
|
||||
|
||||
<!-- Version of java source to accept -->
|
||||
- <property name="source.version" value="1.2"/>
|
||||
+ <property name="source.version" value="8"/>
|
||||
|
||||
<!-- Should Java compilations set the 'debug' compiler option? -->
|
||||
<property name="compile.debug" value="true"/>
|
BIN
commons-logging-1.2-src.tar.gz
(Stored with Git LFS)
Normal file
BIN
commons-logging-1.2-src.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
17
commons-logging-1.2-src.tar.gz.asc
Normal file
17
commons-logging-1.2-src.tar.gz.asc
Normal file
@ -0,0 +1,17 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABAgAGBQJTuEADAAoJEKQfE8mZlFKT5i0P/3nQsu5rXvr9iw3qAmcO3Rzr
|
||||
HUktzPQslltx3qBlu9No9iaXAGylerGUqv5awdsxVdZYcg7XJZmvVmv0Hz1A3ufm
|
||||
u25VW8Oj8rpntTf6uzajF1QhI6WcMuJwHCrS7dgVEnBE4LwdMxXO8d9S45wXMz1g
|
||||
yAUvXDJNUV82Df71rgfEhisupTpSVaicEh21ICdb55KT+rnR3AKaYXJAjyYfYhaQ
|
||||
b172kmY2QeZJ6Z9k0BiV4EA/rZAW+72JVQMcI3oYvfNH/Y7UwsaIdauHoTbZGcu5
|
||||
Ef2I7t9sQYDfFA5hzjaArresq8Qqtmlmb/M3xsTQ6/wRECSF9jqQXh3af6mdm32c
|
||||
X+pypF9KUk+LEPjpY5XNTLEaDv7+BPwl/16ZpewkDiwbSwJBz05ETzJIUR+Ba6nT
|
||||
1gTFtU6G9Snrf6+6uEHWhAI8KAZVR/Cxut72+n+kgFCuaXWx9HSUATnyOa1ubAlA
|
||||
juqKq8xqxqSVi9llloCR6yilNVJsTVd8Fa4NBFJDYn0UYuZ7SPwGzOnbLVdCFu1E
|
||||
xehEjrdYOPFY9lvD0gXzZ+XudpfDpZ7ei0W3A0LCPjF+imo4+vtW1C1mtZSiy65r
|
||||
KCAxdUEyVu+7VTkxN1fV6tTWSMFA0gqDoegMofJQDT516hrYfIuSsq/bmIXo6lo8
|
||||
9rzG4eXx9tpONF4H9ryS
|
||||
=lLrj
|
||||
-----END PGP SIGNATURE-----
|
165
commons-logging-api-1.1.pom
Normal file
165
commons-logging-api-1.1.pom
Normal 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.1</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><strong>Site Only</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>
|
73
commons-logging-manifests.patch
Normal file
73
commons-logging-manifests.patch
Normal file
@ -0,0 +1,73 @@
|
||||
--- commons-logging-1.2-src/build.xml 2014-07-05 20:11:36.000000000 +0200
|
||||
+++ commons-logging-1.2-src/build.xml 2019-01-28 13:41:46.362796232 +0100
|
||||
@@ -263,9 +263,31 @@
|
||||
description="Copy static files to build directory">
|
||||
<tstamp/>
|
||||
<copy todir="${build.home}/conf" filtering="on">
|
||||
- <fileset dir="${conf.home}" includes="*.MF"/>
|
||||
<fileset dir="${conf.home}" includes="*.properties"/>
|
||||
</copy>
|
||||
+ <copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/MANIFEST.MF" filtering="on">
|
||||
+ <filterset>
|
||||
+ <filter token="bsn-extension" value=""/>
|
||||
+ </filterset>
|
||||
+ </copy>
|
||||
+ <mkdir dir="${build.home}/conf/tests"/>
|
||||
+ <copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/tests/MANIFEST.MF" filtering="on">
|
||||
+ <filterset>
|
||||
+ <filter token="bsn-extension" value=".tests"/>
|
||||
+ </filterset>
|
||||
+ </copy>
|
||||
+ <mkdir dir="${build.home}/conf/api"/>
|
||||
+ <copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/api/MANIFEST.MF" filtering="on">
|
||||
+ <filterset>
|
||||
+ <filter token="bsn-extension" value=".api"/>
|
||||
+ </filterset>
|
||||
+ </copy>
|
||||
+ <mkdir dir="${build.home}/conf/adapters"/>
|
||||
+ <copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/adapters/MANIFEST.MF" filtering="on">
|
||||
+ <filterset>
|
||||
+ <filter token="bsn-extension" value=".adapters"/>
|
||||
+ </filterset>
|
||||
+ </copy>
|
||||
</target>
|
||||
|
||||
<target name="compile" depends="static,compile-only"
|
||||
@@ -478,7 +500,7 @@
|
||||
|
||||
<jar jarfile="${build.home}/${api.jar.name}"
|
||||
basedir="${build.home}/classes"
|
||||
- manifest="${build.home}/conf/MANIFEST.MF">
|
||||
+ manifest="${build.home}/conf/api/MANIFEST.MF">
|
||||
<include name="org/apache/commons/logging/*.class" />
|
||||
<include name="org/apache/commons/logging/impl/LogFactoryImpl*.class" />
|
||||
<include name="org/apache/commons/logging/impl/WeakHashtable*.class" />
|
||||
@@ -492,7 +514,7 @@
|
||||
|
||||
<jar jarfile="${build.home}/${adapters.jar.name}"
|
||||
basedir="${build.home}/classes"
|
||||
- manifest="${build.home}/conf/MANIFEST.MF">
|
||||
+ manifest="${build.home}/conf/adapters/MANIFEST.MF">
|
||||
<include name="org/apache/commons/logging/impl/**.class" />
|
||||
<include name="META-INF/LICENSE.txt"/>
|
||||
<include name="META-INF/NOTICE.txt"/>
|
||||
@@ -594,7 +616,7 @@
|
||||
</copy>
|
||||
<jar jarfile="${build.home}/commons-${component.name}-tests.jar"
|
||||
basedir="${build.home}/tests"
|
||||
- manifest="${build.home}/conf/MANIFEST.MF">
|
||||
+ manifest="${build.home}/conf/tests/MANIFEST.MF">
|
||||
<exclude name="org/apache/commons/logging/Wrapper.class"/>
|
||||
<exclude name="org/apache/commons/logging/jdk14/TestHandler.class"
|
||||
if="jdk.1.4.present"/>
|
||||
--- commons-logging-1.2-src/src/conf/MANIFEST.MF 2014-07-05 20:11:36.000000000 +0200
|
||||
+++ commons-logging-1.2-src/src/conf/MANIFEST.MF 2019-01-28 13:37:10.333359706 +0100
|
||||
@@ -6,7 +6,7 @@
|
||||
Implementation-Vendor-Id: org.apache
|
||||
Specification-Title: Commons Logging
|
||||
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||
-Bundle-SymbolicName: org.apache.commons.logging
|
||||
+Bundle-SymbolicName: org.apache.commons.logging@bsn-extension@
|
||||
X-Compile-Target-JDK: 1.2
|
||||
Implementation-Version: 1.2
|
||||
Specification-Vendor: The Apache Software Foundation
|
11
no-tests.patch
Normal file
11
no-tests.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- commons-logging-1.2-src/build.xml 2014-07-05 20:11:36.000000000 +0200
|
||||
+++ commons-logging-1.2-src/build.xml 2021-03-24 10:17:33.609764305 +0100
|
||||
@@ -613,7 +613,7 @@
|
||||
</target>
|
||||
|
||||
|
||||
- <target name="all" depends="clean,compile,test"
|
||||
+ <target name="all" depends="clean,compile"
|
||||
description="Clean and compile all components"/>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user