From e09d03d47666909d0bdc999be68e140ad658d20f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 9 Apr 2013 12:36:44 +0200 Subject: [PATCH 01/95] Set OSGi Bundle-SymbolicName to org.apache.commons.logging --- apache-commons-logging.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 70577f1..8d46c54 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Commons Logging License: ASL 2.0 Group: Development/Libraries @@ -67,6 +67,17 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4 %pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :maven-scm-publish-plugin +# Upstream is changing Maven groupID and OSGi Bundle-SymbolicName back +# and forth, even between minor releases (such as 1.1.1 and 1.1.2). +# In case of Maven we can provide an alias, so that's not a big +# problem. But there is no alias mechanism for OSGi bundle names. +# +# I'll use Bundle-SymbolicName equal to "org.apache.commons.logging" +# because that's what upstream decided to use in future and because +# that's what most of Eclipse plugin are already using. See also +# rhbz#949842 and LOGGING-151. mizdebsk, 9 Apr 2013 +%pom_xpath_set pom:commons.osgi.symbolicName org.apache.commons.logging + sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt %build @@ -123,6 +134,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %changelog +* Tue Apr 9 2013 Mikolaj Izdebski - 1.1.2-2 +- Set OSGi Bundle-SymbolicName to org.apache.commons.logging +- Resolves: rhbz#949842 + * Mon Apr 8 2013 Mikolaj Izdebski - 1.1.2-1 - Update to upstream version 1.1.2 - Convert POM to POM macros From 421d88bcc3b8c7ce59b4bd1081990f4fd453d04f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 May 2013 07:24:33 +0200 Subject: [PATCH 02/95] Update to upstream version 1.1.3 - Remove OSGi Bundle-SymbolicName patch (accepted upstream) --- .gitignore | 1 + apache-commons-logging.spec | 19 ++++++------------- sources | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 8ea02b0..fa99b2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ commons-logging-1.1.1-src.tar.gz /commons-logging-1.1.2-src.tar.gz +/commons-logging-1.1.3-src.tar.gz diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 8d46c54..4af0900 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -3,8 +3,8 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: Apache Commons Logging License: ASL 2.0 Group: Development/Libraries @@ -67,17 +67,6 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4 %pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :maven-scm-publish-plugin -# Upstream is changing Maven groupID and OSGi Bundle-SymbolicName back -# and forth, even between minor releases (such as 1.1.1 and 1.1.2). -# In case of Maven we can provide an alias, so that's not a big -# problem. But there is no alias mechanism for OSGi bundle names. -# -# I'll use Bundle-SymbolicName equal to "org.apache.commons.logging" -# because that's what upstream decided to use in future and because -# that's what most of Eclipse plugin are already using. See also -# rhbz#949842 and LOGGING-151. mizdebsk, 9 Apr 2013 -%pom_xpath_set pom:commons.osgi.symbolicName org.apache.commons.logging - sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt %build @@ -134,6 +123,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %changelog +* Tue May 21 2013 Mikolaj Izdebski - 1.1.3-1 +- Update to upstream version 1.1.3 +- Remove OSGi Bundle-SymbolicName patch (accepted upstream) + * Tue Apr 9 2013 Mikolaj Izdebski - 1.1.2-2 - Set OSGi Bundle-SymbolicName to org.apache.commons.logging - Resolves: rhbz#949842 diff --git a/sources b/sources index 513fce3..95751b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8928a44ded8fb362974fa303900773d6 commons-logging-1.1.2-src.tar.gz +e8e197d628436490886d17cffa108fe3 commons-logging-1.1.3-src.tar.gz From 018f71eceae892af90846ab6b018f55057541e4a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 20:20:19 -0500 Subject: [PATCH 03/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 4af0900..d4054cc 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Commons Logging License: ASL 2.0 Group: Development/Libraries @@ -123,6 +123,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue May 21 2013 Mikolaj Izdebski - 1.1.3-1 - Update to upstream version 1.1.3 - Remove OSGi Bundle-SymbolicName patch (accepted upstream) From 789b784c3d963696eb492cd8347a8ebec0e43913 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 5 Aug 2013 18:27:49 +0200 Subject: [PATCH 04/95] Adapt to current guidelines --- apache-commons-logging.spec | 87 +++++++++++++------------------------ 1 file changed, 29 insertions(+), 58 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index d4054cc..89943f9 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,34 +4,22 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache Commons Logging License: ASL 2.0 -Group: Development/Libraries URL: http://commons.apache.org/%{base_name} Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom -BuildArch: noarch BuildRequires: maven-local -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils >= 0:1.6 -BuildRequires: avalon-framework >= 4.3 -BuildRequires: avalon-logkit -BuildRequires: apache-commons-parent -BuildRequires: maven-dependency-plugin -BuildRequires: maven-failsafe-plugin -BuildRequires: maven-plugin-build-helper -BuildRequires: maven-release-plugin -BuildRequires: maven-site-plugin -BuildRequires: servlet +BuildRequires: mvn(avalon-framework:avalon-framework-api) +BuildRequires: mvn(avalon-framework:avalon-framework-impl) +BuildRequires: mvn(javax.servlet:servlet-api) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(log4j:log4j) +BuildRequires: mvn(logkit:logkit) +BuildRequires: mvn(org.apache.commons:commons-parent) -Requires: java >= 1:1.6.0 -Requires: jpackage-utils >= 0:1.6 - -# This should go away with F-17 -Provides: jakarta-%{short_name} = 0:%{version}-%{release} -Obsoletes: jakarta-%{short_name} <= 0:1.0.4 %description The commons-logging package provides a simple, component oriented @@ -46,10 +34,6 @@ logging implementation. %package javadoc Summary: API documentation for %{name} -Group: Documentation -Requires: jpackage-utils - -Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4 %description javadoc %{summary}. @@ -69,60 +53,47 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4 sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt +# for compatibility reasons +%mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1" +%mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1" + %build -mvn-rpmbuild install javadoc:aggregate +%mvn_build # ----------------------------------------------------------------------------- %install -# jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -install -p -m 644 target/%{short_name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar -install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters.jar +%mvn_install -pushd $RPM_BUILD_ROOT%{_javadir} -for jar in %{name}*; do - ln -sf ${jar} `echo $jar| sed "s|apache-||g"` +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 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom -install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-api.pom +install -pm 644 %{SOURCE2} %{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}-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 - - -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%files +%files -f .mfiles %doc LICENSE.txt NOTICE.txt %doc PROPOSAL.html RELEASE-NOTES.txt -%{_javadir}/* -%{_mavenpomdir}/JPP-%{short_name}.pom -%{_mavenpomdir}/JPP-%{short_name}-api.pom -%{_mavendepmapfragdir}/* +%{_javadir}/*%{short_name}-api.jar +%{_javadir}/*%{short_name}-adapters.jar -%files javadoc +%files javadoc -f .mfiles-javadoc %doc LICENSE.txt NOTICE.txt -%{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %changelog +* Mon Aug 05 2013 Michal Srb - 1.1.3-3 +- Adapt to current guidelines + * Sat Aug 03 2013 Fedora Release Engineering - 1.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From b083637924d66af16d3868689cb5898c193a998f Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 5 Aug 2013 18:54:02 +0200 Subject: [PATCH 05/95] Add missing BR: maven-failsafe-plugin --- apache-commons-logging.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 89943f9..3ddf184 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -19,6 +19,7 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(log4j:log4j) BuildRequires: mvn(logkit:logkit) BuildRequires: mvn(org.apache.commons:commons-parent) +BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) %description @@ -91,6 +92,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po # ----------------------------------------------------------------------------- %changelog +* Mon Aug 05 2013 Michal Srb - 1.1.3-4 +- Add missing BR: maven-failsafe-plugin + * Mon Aug 05 2013 Michal Srb - 1.1.3-3 - Adapt to current guidelines From b7edd16b1172e3d5a57896306bf9cd4e3a61d289 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 5 Aug 2013 19:11:21 +0200 Subject: [PATCH 06/95] Add missing BR: maven-dependency-plugin, build-helper-maven-plugin --- apache-commons-logging.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 3ddf184..7a3ca70 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -20,6 +20,8 @@ BuildRequires: mvn(log4j:log4j) BuildRequires: mvn(logkit:logkit) BuildRequires: mvn(org.apache.commons:commons-parent) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) %description @@ -92,6 +94,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po # ----------------------------------------------------------------------------- %changelog +* Mon Aug 05 2013 Michal Srb - 1.1.3-5 +- Add missing BR: maven-dependency-plugin, build-helper-maven-plugin + * Mon Aug 05 2013 Michal Srb - 1.1.3-4 - Add missing BR: maven-failsafe-plugin From 394f50da90a1b54826dd209ac4d713703fc0955b Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 6 Aug 2013 08:46:27 +0200 Subject: [PATCH 07/95] Temporarily remove test which fails in koji --- apache-commons-logging.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 7a3ca70..f99de49 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -60,6 +60,10 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt %mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1" %mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1" +# this test fails in koji from some reason, but it works locally in mock. +# TODO: probably worth investigating +rm src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java + %build %mvn_build @@ -94,6 +98,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po # ----------------------------------------------------------------------------- %changelog +* Tue Aug 06 2013 Michal Srb - 1.1.3-6 +- Temporarily remove test which fails in koji + * Mon Aug 05 2013 Michal Srb - 1.1.3-5 - Add missing BR: maven-dependency-plugin, build-helper-maven-plugin From 12063d2aea624247a0021322d96f8cc3cdb4bab9 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Sun, 11 Aug 2013 10:32:21 +0200 Subject: [PATCH 08/95] Make this package noarch again (Resolves: rhbz#995756) --- apache-commons-logging.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index f99de49..cdb0b5c 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -23,6 +23,8 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildArch: noarch + %description The commons-logging package provides a simple, component oriented @@ -98,6 +100,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po # ----------------------------------------------------------------------------- %changelog +* Sun Aug 11 2013 Michal Srb - 1.1.3-7 +- Make this package noarch again (Resolves: rhbz#995756) + * Tue Aug 06 2013 Michal Srb - 1.1.3-6 - Temporarily remove test which fails in koji From 8a4bc2c084ebba606987401814b62895a2284910 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 22 Jan 2014 11:11:22 +0100 Subject: [PATCH 09/95] Run all the tests agains --- apache-commons-logging.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index cdb0b5c..41c0b90 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -62,9 +62,6 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt %mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1" %mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1" -# this test fails in koji from some reason, but it works locally in mock. -# TODO: probably worth investigating -rm src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java %build %mvn_build @@ -100,6 +97,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po # ----------------------------------------------------------------------------- %changelog +* Wed Jan 22 2014 Michal Srb - 1.1.3-8 +- Run all the tests agains + * Sun Aug 11 2013 Michal Srb - 1.1.3-7 - Make this package noarch again (Resolves: rhbz#995756) From 8cf430a53849fea260a9fd37a626794a9edcdd70 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 20 Feb 2014 14:54:44 +0100 Subject: [PATCH 10/95] Set avalon dependency scope to provided Signed-off-by: Michael Simacek Signed-off-by: Mikolaj Izdebski --- apache-commons-logging.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 41c0b90..43d5aec 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -50,7 +50,7 @@ Summary: API documentation for %{name} # 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-api:4.3:provided %pom_add_dep avalon-framework:avalon-framework-impl:4.3:test %pom_remove_plugin :cobertura-maven-plugin @@ -97,6 +97,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po # ----------------------------------------------------------------------------- %changelog +* Thu Feb 20 2014 Michael Simacek - 1.1.3-9 +- Set avalon dependency scope to provided + * Wed Jan 22 2014 Michal Srb - 1.1.3-8 - Run all the tests agains From 6acd3c658ef92b290b7d549e6dfb98b351e81266 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 20 Feb 2014 16:24:15 +0100 Subject: [PATCH 11/95] Set logkit dependency scope to provided Signed-off-by: Michael Simacek Signed-off-by: Mikolaj Izdebski --- apache-commons-logging.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 43d5aec..3e62512 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -53,6 +53,8 @@ Summary: API documentation for %{name} %pom_add_dep avalon-framework:avalon-framework-api:4.3:provided %pom_add_dep avalon-framework:avalon-framework-impl:4.3:test +%pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" 'provided' + %pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :maven-scm-publish-plugin @@ -97,6 +99,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po # ----------------------------------------------------------------------------- %changelog +* Thu Feb 20 2014 Michael Simacek - 1.1.3-10 +- Set logkit dependency scope to provided + * Thu Feb 20 2014 Michael Simacek - 1.1.3-9 - Set avalon dependency scope to provided From 377a51cb76f883be7c22a10475277302b98a3a65 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 4 Mar 2014 09:04:58 +0100 Subject: [PATCH 12/95] Use Requires: java-headless rebuild (#1067528) --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 3e62512..230c986 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -99,6 +99,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po # ----------------------------------------------------------------------------- %changelog +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.1.3-11 +- Use Requires: java-headless rebuild (#1067528) + * Thu Feb 20 2014 Michael Simacek - 1.1.3-10 - Set logkit dependency scope to provided From 75a3f45bbb02f32c85808265cc274254a9b81d16 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 13 May 2014 14:21:36 +0200 Subject: [PATCH 13/95] Disable tests that use log4j12 --- apache-commons-logging.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 230c986..c7da0a7 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -64,6 +64,9 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt %mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1" %mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1" +# Remove log4j12 tests +rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 + %build %mvn_build @@ -99,6 +102,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po # ----------------------------------------------------------------------------- %changelog +* Tue May 13 2014 Michael Simacek - 1.1.3-12 +- Disable tests that use log4j12 + * Tue Mar 04 2014 Stanislav Ochotnicky - 1.1.3-11 - Use Requires: java-headless rebuild (#1067528) From 5272664803858e509d7149a45cf4ccc3b6d4e4a6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:58:41 -0500 Subject: [PATCH 14/95] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index c7da0a7..6d08b54 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -102,6 +102,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po # ----------------------------------------------------------------------------- %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.1.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue May 13 2014 Michael Simacek - 1.1.3-12 - Disable tests that use log4j12 From 71bb0865a6d2730a39dfb379f97fc757dbe98fa1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 20 Jul 2014 11:30:22 +0200 Subject: [PATCH 15/95] Update to upstream version 1.2 --- .gitignore | 1 + apache-commons-logging.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fa99b2a..ac92f7c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ commons-logging-1.1.1-src.tar.gz /commons-logging-1.1.2-src.tar.gz /commons-logging-1.1.3-src.tar.gz +/commons-logging-1.2-src.tar.gz diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 6d08b54..1452c0d 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -3,8 +3,8 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.1.3 -Release: 13%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: Apache Commons Logging License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -102,6 +102,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po # ----------------------------------------------------------------------------- %changelog +* Sun Jul 20 2014 Mikolaj Izdebski - 1.2-1 +- Update to upstream version 1.2 + * Sat Jun 07 2014 Fedora Release Engineering - 1.1.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 95751b9..87aa2f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8e197d628436490886d17cffa108fe3 commons-logging-1.1.3-src.tar.gz +ce977548f1cbf46918e93cd38ac35163 commons-logging-1.2-src.tar.gz From 8994abf010eb56058e70f40499e9bfabea4485cb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 20 Jul 2014 12:52:14 +0200 Subject: [PATCH 16/95] Fix BR on commons-parent --- apache-commons-logging.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 1452c0d..eb2fd2a 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -18,7 +18,7 @@ BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(log4j:log4j) BuildRequires: mvn(logkit:logkit) -BuildRequires: mvn(org.apache.commons:commons-parent) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) From 0ccbd402b937c33543d937a9aa54e4394b9286e3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Jul 2014 12:50:24 +0200 Subject: [PATCH 17/95] Generate different Bundle-SymbolicName for different JARs - Resolves: rhbz#1123055 --- ...nt-Bundle-SymbolicName-for-different.patch | 99 +++++++++++++++++++ apache-commons-logging.spec | 9 +- 2 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 0001-Generate-different-Bundle-SymbolicName-for-different.patch diff --git a/0001-Generate-different-Bundle-SymbolicName-for-different.patch b/0001-Generate-different-Bundle-SymbolicName-for-different.patch new file mode 100644 index 0000000..52943b1 --- /dev/null +++ b/0001-Generate-different-Bundle-SymbolicName-for-different.patch @@ -0,0 +1,99 @@ +From 00823b8008bffc5dd65c9e8de604994040a3190d Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 29 Jul 2014 09:00:03 +0200 +Subject: [PATCH] Generate different Bundle-SymbolicName for different JARs + +--- + pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 55 insertions(+) + +diff --git a/pom.xml b/pom.xml +index cdad31c..5707595 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -179,6 +179,52 @@ under the License. + + + ++ ++ org.apache.felix ++ maven-bundle-plugin ++ ++ ++ tests-bundle-manifest ++ process-classes ++ ++ manifest ++ ++ ++ ${project.build.directory}/osgi-tests ++ ++ ${commons.osgi.symbolicName}.tests ++ ++ ++ ++ ++ api-bundle-manifest ++ process-classes ++ ++ manifest ++ ++ ++ ${project.build.directory}/osgi-api ++ ++ ${commons.osgi.symbolicName}.api ++ ++ ++ ++ ++ adapters-bundle-manifest ++ process-classes ++ ++ manifest ++ ++ ++ ${project.build.directory}/osgi-adapters ++ ++ ${commons.osgi.symbolicName}.adapters ++ ++ ++ ++ ++ ++ + +- org.codehaus.mojo +- build-helper-maven-plugin +- 1.0 +- +- +- attach-artifacts +- package +- +- attach-artifact +- +- +- +- +- ${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar +- jar +- adapters +- +- +- ${project.build.directory}/${project.artifactId}-api-${project.version}.jar +- jar +- api +- +- +- +- +- +- +- +- +- -- org.codehaus.mojo -- build-helper-maven-plugin -- 1.0 -- -- -- attach-artifacts -- package -- -- attach-artifact -- -- -- -- -- ${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar -- jar -- adapters -- -- -- ${project.build.directory}/${project.artifactId}-api-${project.version}.jar -- jar -- api -- -- -- -- -- -- -- -- --