From 6fa70865f25bac3a53b50365a850923337c454159692be38cd6b7bb1b546eed9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 19 Oct 2018 20:36:10 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=34 --- apache-commons-logging.changes | 5 +++++ apache-commons-logging.spec | 22 ++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index 148d4c7..6c992af 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 19 20:35:40 UTC 2018 - Fridrich Strba + +- Cleanup of maven pom files installation + ------------------------------------------------------------------- Tue May 15 10:56:40 UTC 2018 - fstrba@suse.com diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 598081c..78bd2fe 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # 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/ # @@ -64,11 +64,6 @@ logging implementation. %patch0 -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 #FIXME @@ -100,18 +95,21 @@ popd # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}.pom -install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom +install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/%{short_name}.pom +install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/%{short_name}-api.pom -%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" +%add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-logging" +%add_maven_depmap %{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api" %files %defattr(0644,root,root,0755) %doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt %{_javadir}/* -%{_mavenpomdir}/JPP-%{short_name}.pom -%{_mavenpomdir}/JPP-%{short_name}-api.pom +%{_mavenpomdir}/* +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else %{_datadir}/maven-metadata/%{name}.xml* +%endif %changelog From 246f67989f15523271bd700322e5c6a3bbf6a0565d0f95cd9b8bb91e78c39c8d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 22 Oct 2018 13:28:36 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=35 --- apache-commons-logging.spec | 16 ++-- commons-logging-api-1.1.pom | 165 ++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 6 deletions(-) create mode 100644 commons-logging-api-1.1.pom diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 78bd2fe..2560c07 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -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 Source1: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc 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 Patch1: commons-logging-1.2-sourcetarget.patch BuildRequires: ant @@ -95,11 +96,14 @@ popd # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/%{short_name}.pom -install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/%{short_name}-api.pom - -%add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-logging" -%add_maven_depmap %{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api" +install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/%{short_name}-%{version}.pom +sed 's#1.1#1.2#g' < %{SOURCE4} > tmp.pom +install -pm 644 tmp.pom %{buildroot}/%{_mavenpomdir}/%{short_name}-api-%{version}.pom +sed -e 's#1.1#1.2#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 %defattr(0644,root,root,0755) diff --git a/commons-logging-api-1.1.pom b/commons-logging-api-1.1.pom new file mode 100644 index 0000000..c0b8f67 --- /dev/null +++ b/commons-logging-api-1.1.pom @@ -0,0 +1,165 @@ + + 4.0.0 + commons-logging + commons-logging-api + Logging + 1.1 + 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 + + \ No newline at end of file