Compare commits

..

No commits in common. "c8-stream-201902" and "c9-beta" have entirely different histories.

View File

@ -1,6 +1,8 @@
%bcond_with bootstrap
Name: apache-commons-logging Name: apache-commons-logging
Version: 1.2 Version: 1.2
Release: 15%{?dist} Release: 29%{?dist}
Summary: Apache Commons Logging Summary: Apache Commons Logging
License: ASL 2.0 License: ASL 2.0
URL: http://commons.apache.org/logging URL: http://commons.apache.org/logging
@ -13,13 +15,16 @@ Patch0: 0001-Generate-different-Bundle-SymbolicName-for-different.patch
Patch1: 0002-Port-to-maven-jar-plugin-3.0.0.patch Patch1: 0002-Port-to-maven-jar-plugin-3.0.0.patch
BuildRequires: maven-local BuildRequires: maven-local
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(log4j:log4j:12)
BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
%endif
%description %description
The commons-logging package provides a simple, component oriented The commons-logging package provides a simple, component oriented
@ -32,7 +37,6 @@ commons-logging abstraction is meant to minimize the differences between
the two, and to allow a developer to not tie himself to a particular the two, and to allow a developer to not tie himself to a particular
logging implementation. logging implementation.
%{?module_package}
%{?javadoc_package} %{?javadoc_package}
%prep %prep
@ -40,9 +44,16 @@ logging implementation.
%pom_remove_dep -r :avalon-framework %pom_remove_dep -r :avalon-framework
%pom_remove_dep -r :logkit %pom_remove_dep -r :logkit
rm -r src/test/java/org/apache/commons/logging/{avalon,logkit} %pom_remove_dep -r :log4j
rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java
rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java
rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java
rm -r src/test/java/org/apache/commons/logging/{avalon,log4j,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 :cobertura-maven-plugin
%pom_remove_plugin :maven-scm-publish-plugin %pom_remove_plugin :maven-scm-publish-plugin
@ -57,8 +68,7 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
%build %build
# Test failures, need to investigate and fix them %mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 -Dcommons.osgi.symbolicName=org.apache.commons.logging
%mvn_build -f -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6
# The build produces more artifacts from one pom # The build produces more artifacts from one pom
%mvn_artifact %{SOURCE2} target/commons-logging-%{version}-api.jar %mvn_artifact %{SOURCE2} target/commons-logging-%{version}-api.jar
@ -67,17 +77,67 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
%install %install
%mvn_install %mvn_install
%files -n %{?module_prefix}%{name} -f .mfiles %files -f .mfiles
%license LICENSE.txt NOTICE.txt %license LICENSE.txt NOTICE.txt
%doc PROPOSAL.html RELEASE-NOTES.txt %doc PROPOSAL.html RELEASE-NOTES.txt
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2-29
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-28
- Rebuild to workaround DistroBaker issue
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-27
- Bootstrap Maven for CentOS Stream 9
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-26
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Sep 10 2020 Mat Booth <mat.booth@redhat.com> - 1.2-24
- Build against log4j 2
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.2-22
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Thu Jun 04 2020 Fabio Valentini <decathorpe@gmail.com> - 1.2-21
- Override javac source and target versions to fix builds with Java 11.
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Nov 09 2019 Fabio Valentini <decathorpe@gmail.com> - 1.2-19
- Disable avalon support by default.
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-15 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-15
- Mass rebuild for javapackages-tools 201902 - Mass rebuild for javapackages-tools 201902
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-14 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-14
- Mass rebuild for javapackages-tools 201901 - Mass rebuild for javapackages-tools 201901
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Dec 18 2018 Mat Booth <mat.booth@redhat.com> - 1.2-16
- Fix OSGi metadata
* Mon Dec 17 2018 Mat Booth <mat.booth@redhat.com> - 1.2-15
- Rebuild to regenerate requires, fixes rhbz#1660117
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild