pool/apache-commons-logging
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update to 1.1.3 (bugfix release)

Browse Source 
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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=9
This commit is contained in:
Michal Vyskocil 2013-08-27 08:54:14 +00:00 committed by Git OBS Bridge
parent c0f317d130
commit 6e85890f39
10 changed files with 130 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apache-commons-logging.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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

70
apache-commons-logging.keyring Normal file
View 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-----

73
apache-commons-logging.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package apache-commons-logging
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
@ -20,32 +20,30 @@
%define base_name logging
%define short_name commons-%{base_name}
%define with_maven 0
%define _mavenpomdir %{_datadir}/maven2/poms
Name: apache-%{short_name}
Version: 1.1.1
Version: 1.1.3
Release: 0
Summary: Apache Commons Logging
License: Apache-2.0
Group: Development/Libraries/Java
Url: http://commons.apache.org/%{base_name}
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1: %{short_name}.depmap
Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
Patch1: %{short_name}-eclipse-manifest.patch
Patch0: %{short_name}-maven-release-plugin.patch
Patch2: build.xml.patch
Source1: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
Source2: apache-commons-logging.keyring
Source3: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
BuildRequires: java-devel >= 1.6.0
BuildRequires: jpackage-utils >= 1.6
BuildRequires: junit
%if %{with_maven}
%if %with maven
BuildRequires: maven-plugin-build-helper
BuildRequires: maven-site-plugin
%endif
BuildRequires: gpg-offline
BuildRequires: servletapi5
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -70,7 +68,7 @@ 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.
%if %{with_maven}
%if %with maven
%package javadoc
Summary: API documentation for %{name}
Group: Documentation
@ -81,27 +79,26 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1.0.4
%description javadoc
API documentation for %{name}.
%endif
# -----------------------------------------------------------------------------
%prep
%gpg_verify %{SOURCE1}
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1 -b .rhbug_588142
%patch1
%patch2
# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
%pom_remove_dep :avalon-framework
%pom_add_dep avalon-framework:avalon-framework-api:4.3
%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
# -----------------------------------------------------------------------------
#FIXME
rm ./src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
# fails with recent surefire for some reason
rm src/test/org/apache/commons/logging/logkit/StandardTestCase.java
rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java
%if %{with_maven}
%if %with maven
mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
@ -111,9 +108,8 @@ export CLASSPATH=$(build-classpath \
junit \
):target/classes:target/test-classes
ant -Dmaven.mode.offline=true dist \
-lib /usr/share/java
-lib %{_javadir}
%endif
# -----------------------------------------------------------------------------
%install
# jars
@ -131,54 +127,37 @@ popd
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}.pom
install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom
install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
%add_to_maven_depmap org.apache.commons %{short_name}-api %{version} JPP %{short_name}-api
%add_to_maven_depmap org.apache.commons %{short_name}-adapters %{version} JPP %{short_name}-adapters
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-logging"
%add_maven_depmap JPP-%{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api"
# following lines are only for backwards compatibility. New packages
# should use proper groupid org.apache.commons and also artifactid
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
%add_to_maven_depmap %{short_name} %{short_name}-api %{version} JPP %{short_name}-api
%add_to_maven_depmap %{short_name} %{short_name}-adapters %{version} JPP %{short_name}-adapters
%if %{with_maven}
%if %with maven
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%endif
%post
%update_maven_depmap
%postun
%update_maven_depmap
%if %{with_maven}
%if %with maven
%pre javadoc
# workaround for rpm bug, can be removed in F-17
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%endif
# -----------------------------------------------------------------------------
%files
%defattr(0644,root,root,0755)
%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
%doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
%{_javadir}/*
%{_mavenpomdir}/JPP-%{short_name}.pom
%{_mavenpomdir}/JPP-%{short_name}-api.pom
%config %{_mavendepmapfragdir}/*
%if %{with_maven}
%if %with maven
%files javadoc
%defattr(0644,root,root,0755)
%doc LICENSE.txt
%{_javadocdir}/%{name}
%endif
# -----------------------------------------------------------------------------
%changelog

11
build.xml.patch
View File

@ -1,11 +0,0 @@
--- build.xml.orig 2011-01-27 00:54:12.000000000 -0700
+++ build.xml 2011-01-27 00:54:18.000000000 -0700
@@ -94,7 +94,7 @@
<property name="component.title" value="Logging Wrapper Library"/>
<!-- The current version number of this component -->
- <property name="component.version" value="1.1.1-SNAPSHOT"/>
+ <property name="component.version" value="1.1.1"/>
<!-- The base directory for compilation targets -->
<property name="build.home" value="${basedir}/target"/>

3
commons-logging-1.1.1-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b49a79fa78ebfae15dc46ae6f0144fee6b94ab608a25518c54609d3419909eb2
size 190670

3
commons-logging-1.1.3-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a32dfb846c58d3b3ff264235cfcbaf54ad086a793f64cbe4409f46886ceb655
size 187403

17
commons-logging-1.1.3-src.tar.gz.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJRlTv7AAoJEKQfE8mZlFKTMsAP/0wElzX8+0KXmMUsfhlaVROX
eagqUbuasCZgvnqXqNtusiH90m/EUjPpVm0eYMxeP98pMNuIv6peg34be7FbQ/Q4
YtmGCKZ2GpLLlguqFjyEnrb94UoZd8DogSq+LwAMQ/UYETr/pOyhArx8ioNelihu
Rwz62tDDa7noOVGwq9dN4YKYvTC7UEH+GFX1EoXZ5tUG60D3NeQ4blWp1Fe+i4jL
lK1F13Xb63+JkUSSCuZpZsPXfQEyso5cfqPF2sMIgmJ99uLB90R7SHuVh3PSqVwH
rwLUn3T8ySKGk3ybZvXmhhq6jjfnnbBuvqueely/9WSD3QeIkMPibIxokf+caElr
YxTkYsqtGJTaEnmn196RO4by2kFZp5F3CGrfP168cik0PAloP3io2Z1s3Y3Ph8Xk
vcfFooVV70hgWy4RzeSLCCJi+uHNSeBUg8qRHLW8idtHP5RCoRQ/pPZ1h7libjez
dlcnZQYuY0jAA0h5iBIdtJByuy63Wl1ejSSag6nn3o9xBVoBqfNfjBmrTA0bsbM7
lxdXGw7Gc6OlW+PoaheGFRZO8G9sKuWXdBQIwDR7ebDVCqcKcVSX+fAaSc3zFfmj
TZ4/tDF7so6LPZLtLVtbUbdDyoXspDb4gWWCGVAe0KwjdBF2P53ypKr5iH54KDE9
YeHfJzMLmWhsmzsMg0ap
=VV9Q
-----END PGP SIGNATURE-----

15
commons-logging-eclipse-manifest.patch
View File

@ -1,15 +0,0 @@
--- src/conf/MANIFEST.MF.orig 2007-11-22 01:27:52.000000000 +0200
+++ src/conf/MANIFEST.MF 2010-06-09 21:04:06.532857757 +0300
@@ -6,3 +6,12 @@ Implementation-Title: Commons Logging
Implementation-Vendor-Id: org.apache
Implementation-Vendor: Apache Software Foundation
Implementation-Version: 1.1.1
+Bundle-ManifestVersion: 2
+Export-Package: org.apache.commons.logging;version="1.1.1",org.apache.
+ commons.logging.impl;version="1.1.1"
+Bundle-Version: 1.1.1.v20080605-1930
+Bundle-SymbolicName: org.apache.commons.logging
+Bundle-Name: Apache Commons Logging Plug-in
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
+Bundle-Localization: plugin
+Bundle-Vendor: Apache Software Foundation

33
commons-logging-maven-release-plugin.patch
View File

@ -1,33 +0,0 @@
diff --git a/pom.xml b/pom.xml
index 8efaf6d..4b3e8f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -308,21 +308,6 @@ under the License.
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-6</version>
- <configuration>
- <!--
- - The site needs to be built prior to deploy,
- - because it is included in the assembly.
- -->
- <goals>site deploy</goals>
- <!-- Pass these arguments to the deploy plugin. -->
- <arguments>-Prelease</arguments>
- </configuration>
- </plugin>
-
- <plugin>
<!--
- Many of JCL's tests use tricky techniques to place the generated
- JCL jarfiles on the classpath in various configurations. This means
@@ -520,4 +505,4 @@ under the License.
<maven.compile.source>1.2</maven.compile.source>
<maven.compile.target>1.1</maven.compile.target>
</properties>
-</project>
\ No newline at end of file
+</project>

36
commons-logging.depmap
View File

@ -1,36 +0,0 @@
<dependencies>
<dependency>
<maven>
<groupId>logkit</groupId>
<artifactId>logkit</artifactId>
<version>1.0.1</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>avalon-logkit</artifactId>
<version>1.0.8</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
<version>4.1.3</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>avalon-framework</artifactId>
<version>4.1.4</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>tomcat6-servlet-2.5-api</artifactId>
</jpp>
</dependency>
</dependencies>