commit ee7e1b78df2a39e5e1d64019043c859fd8b8e83d Author: Johnny Hughes Date: Wed Jan 15 13:01:54 2025 -0600 Import from Fedora diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..21564a1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +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 +/commons-logging-1.3.0-src.tar.gz +/commons-logging-1.3.4-src.tar.gz diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec new file mode 100644 index 0000000..e3b008b --- /dev/null +++ b/apache-commons-logging.spec @@ -0,0 +1,367 @@ +%bcond_with bootstrap + +Name: apache-commons-logging +Version: 1.3.4 +Release: 5%{?dist} +Summary: Apache Commons Logging +License: Apache-2.0 +URL: https://commons.apache.org/proper/commons-logging/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +Source0: https://www.apache.org/dist/commons/logging/source/commons-logging-%{version}-src.tar.gz + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +BuildRequires: mvn(javax.servlet:javax.servlet-api) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.logging.log4j:log4j-1.2-api) +BuildRequires: mvn(org.apache.logging.log4j:log4j-api) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) +BuildRequires: mvn(org.moditect:moditect-maven-plugin) +BuildRequires: mvn(org.slf4j:slf4j-api) +%endif + +%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. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. + +%prep +%autosetup -p1 -n commons-logging-%{version}-src + +%pom_remove_dep :avalon-framework +%pom_remove_dep :logkit +rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java +rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java +rm -r src/test/java/org/apache/commons/logging/{avalon,logkit} +rm src/test/java/org/apache/commons/logging/pathable/{Parent,Child}FirstTestCase.java + +# Avoid hard-coded versions in OSGi metadata +%pom_xpath_set "pom:properties/pom:commons.osgi.import" '*;resolution:=optional' + +%pom_remove_plugin :cobertura-maven-plugin +%pom_remove_plugin :maven-scm-publish-plugin + +sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt + +# for compatibility reasons +%mvn_file ":commons-logging{*}" "commons-logging@1" "%{name}@1" +%mvn_alias ":commons-logging{*}" "org.apache.commons:commons-logging@1" "apache:commons-logging@1" + +%mvn_package ":::{*}:" + +# Remove log4j12 tests +rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 + +%build +# missing test dependencies +%mvn_build -f + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE.txt NOTICE.txt +%doc PROPOSAL.html RELEASE-NOTES.txt + +%files javadoc -f .mfiles-javadoc + +%changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1.3.4-4 +- Update javapackages test plan to f42 + +* Tue Sep 03 2024 Mikolaj Izdebski - 1.3.4-3 +- Use %%autosetup -C + +* Fri Aug 23 2024 Mikolaj Izdebski - 1.3.4-2 +- In bootstrap mode build with log4j + +* Fri Aug 23 2024 Mikolaj Izdebski - 1.3.4-1 +- Update to upstream version 1.3.4 +- Resolves: rhbz#2271286 + +* Wed Jul 17 2024 Fedora Release Engineering - 1.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.3.0-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.3.0-4 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Mikolaj Izdebski - 1.3.0-1 +- Update to upstream version 1.3.0 + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.2-35 +- Rebuild + +* Wed Jul 19 2023 Jerry James - 1.2-34 +- Build with log4j support in non-bootstrap mode +- Convert the License tag to SPDX +- Update the project URL + +* Wed Jul 19 2023 Fedora Release Engineering - 1.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.2-30 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 1.2-28 +- Bump Java compiler source/target levels to 1.7 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.2-26 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Sep 10 2020 Mat Booth - 1.2-24 +- Build against log4j 2 + +* Mon Jul 27 2020 Fedora Release Engineering - 1.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.2-22 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 04 2020 Fabio Valentini - 1.2-21 +- Override javac source and target versions to fix builds with Java 11. + +* Tue Jan 28 2020 Fedora Release Engineering - 1.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Nov 09 2019 Fabio Valentini - 1.2-19 +- Disable avalon support by default. + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.2-15 +- Mass rebuild for javapackages-tools 201902 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.2-14 +- Mass rebuild for javapackages-tools 201901 + +* Thu Jan 31 2019 Fedora Release Engineering - 1.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Dec 18 2018 Mat Booth - 1.2-16 +- Fix OSGi metadata + +* Mon Dec 17 2018 Mat Booth - 1.2-15 +- Rebuild to regenerate requires, fixes rhbz#1660117 + +* Thu Jul 12 2018 Fedora Release Engineering - 1.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 29 2018 Mikolaj Izdebski - 1.2-12 +- Cleanup spec file + +* Wed Jul 26 2017 Fedora Release Engineering - 1.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 22 2017 Michael Simacek - 1.2-10 +- Avoid %%add_maven_depmap + +* Mon Feb 13 2017 Michael Simacek - 1.2-9 +- Fix conditional + +* Fri Feb 10 2017 Michael Simacek - 1.2-8 +- Use log4j12 +- Add avalon conditional + +* Fri Feb 10 2017 Fedora Release Engineering - 1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue May 31 2016 Mikolaj Izdebski - 1.2-6 +- Port to maven-jar-plugin 3.0.0 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 9 2015 Mikolaj Izdebski - 1.2-3 +- Add aliases for apache groupId + +* Tue Jul 29 2014 Mikolaj Izdebski - 1.2-2 +- Generate different Bundle-SymbolicName for different JARs +- Resolves: rhbz#1123055 + +* 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 + +* 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) + +* 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 + +* 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) + +* 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 + +* 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 + +* 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) + +* 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 +- Remove OSGi manifest patch; fixed upstream + +* Wed Feb 13 2013 Fedora Release Engineering - 1.1.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.1.1-22 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Nov 22 2012 Mikolaj Izdebski - 1.1.1-21 +- Install NOTICE file +- Resolves: rhbz#879581 + +* Wed Jul 18 2012 Fedora Release Engineering - 1.1.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue May 1 2012 Alexander Kurtakov 1.1.1-19 +- Bring back jakarta-commons-logging provides/obsoletes - the comment was misleading. + +* Mon Apr 30 2012 Alexander Kurtakov 1.1.1-18 +- Fix build with latest libs. +- Adapt to current guidelines. + +* Thu Jan 12 2012 Fedora Release Engineering - 1.1.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Apr 21 2011 Stanislav Ochotnicky - 1.1.1-16 +- Build with maven 3 +- Fix build for avalon-framework + +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 16 2010 Alexander Kurtakov 1.1.1-14 +- Bring back commons-logging* symlinks. + +* Thu Dec 16 2010 Stanislav Ochotnicky - 1.1.1-13 +- Replace tomcat6 BR with servlet25 only +- Cleanups according to new packaging guidelines +- Install maven metadata for -api jar +- Versionless jars/javadocs + +* Tue Nov 9 2010 Stanislav Ochotnicky - 1.1.1-12 +- Add depmaps for api and adapters subpackages +- Use apache-commons-parent BR instead of maven-* +- Replace tomcat5 BR with tomcat6 +- Reenable tests + +* Thu Jul 8 2010 Stanislav Ochotnicky - 1.1.1-11 +- Add license to javadoc subpackage + +* Wed Jun 9 2010 Alexander Kurtakov 1.1.1-10 +- Add osgi manifest entries. + +* Fri May 21 2010 Stanislav Ochotnicky - 1.1.1-9 +- Correct depmap filename for backward compatibility + +* Mon May 17 2010 Stanislav Ochotnicky - 1.1.1-8 +- Fix wrong depmap JPP name to short_name +- Add obsoletes to javadoc subpackage + +* Wed May 12 2010 Stanislav Ochotnicky - 1.1.1-7 +- Fix symlink problems introduced previously in r5 + +* Tue May 11 2010 Stanislav Ochotnicky - 1.1.1-6 +- Add one more add_to_maven_depmap for backward compatibility + +* Mon May 10 2010 Stanislav Ochotnicky - 1.1.1-5 +- Fix up add_to_maven_depmap +- Add jpackage-utils Requires for javadoc +- Cleanup install a bit + +* Fri May 7 2010 Stanislav Ochotnicky - 1.1.1-4 +- Fix provides + +* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-3 +- Revert to using default permissions +- Drop "Package" from summary, improve javadoc summary text + +* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-2 +- Fix EOLs on docs +- Create javadoc symlinks during install +- Use version macro in Source0 URL, use _mavenpomdir macro + +* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-1 +- Rename and rebase from jakarta-commons-logging diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/commons-logging-api-1.1.pom b/commons-logging-api-1.1.pom new file mode 100644 index 0000000..c8b5be8 --- /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 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..df26947 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,7 @@ +--- !Policy +product_versions: + - rhel-9 +decision_contexts: + - osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8ba3510 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: c9s +execute: + how: tmt diff --git a/sources b/sources new file mode 100644 index 0000000..2bb5c0a --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (commons-logging-1.3.4-src.tar.gz) = a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44