Accepting request 645282 from Java:packages
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/645282 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-logging?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2a7894eeb1
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Tue May 15 10:56:40 UTC 2018 - fstrba@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
# published by the Open Source Initiative.
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
@ -29,7 +29,8 @@ Url: http://commons.apache.org/%{base_name}
|
|||||||
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
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
|
Source1: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
|
||||||
Source2: apache-commons-logging.keyring
|
Source2: apache-commons-logging.keyring
|
||||||
Source3: http://central.maven.org/maven2/commons-logging/commons-logging/%{version}/%{short_name}-%{version}.pom
|
Source3: http://central.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
|
||||||
|
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
|
Patch0: commons-logging-1.1.3-src-junit.diff
|
||||||
Patch1: commons-logging-1.2-sourcetarget.patch
|
Patch1: commons-logging-1.2-sourcetarget.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
@ -64,11 +65,6 @@ logging implementation.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
|
||||||
# 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
|
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
|
||||||
|
|
||||||
#FIXME
|
#FIXME
|
||||||
@ -100,18 +96,24 @@ popd
|
|||||||
|
|
||||||
# pom
|
# pom
|
||||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||||
install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}.pom
|
install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/%{short_name}-%{version}.pom
|
||||||
install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.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
|
||||||
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-logging"
|
sed -e 's#<version>1.1</version>#<version>1.2</version>#g' -e "s#%{short_name}-api#%{short_name}-adapters#g" < %{SOURCE4} > tmp.pom
|
||||||
%add_maven_depmap JPP-%{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api"
|
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
|
%files
|
||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
%doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
|
%doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
|
||||||
%{_javadir}/*
|
%{_javadir}/*
|
||||||
%{_mavenpomdir}/JPP-%{short_name}.pom
|
%{_mavenpomdir}/*
|
||||||
%{_mavenpomdir}/JPP-%{short_name}-api.pom
|
%if %{defined _maven_repository}
|
||||||
|
%{_mavendepmapfragdir}/%{name}
|
||||||
|
%else
|
||||||
%{_datadir}/maven-metadata/%{name}.xml*
|
%{_datadir}/maven-metadata/%{name}.xml*
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
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>
|
||||||
Loading…
x
Reference in New Issue
Block a user