Update to upstream version 1.3.4

Related: RHEL-74141
This commit is contained in:
Mikolaj Izdebski 2025-01-16 15:47:46 +01:00
parent 75e2c63d57
commit e3fe8aefb3
3 changed files with 15 additions and 13 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ commons-logging-1.1.1-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

View File

@ -1,8 +1,8 @@
%bcond_with bootstrap
Name: apache-commons-logging
Version: 1.3.0
Release: 6%{?dist}
Version: 1.3.4
Release: 1%{?dist}
Summary: Apache Commons Logging
License: Apache-2.0
URL: https://commons.apache.org/proper/commons-logging/
@ -15,13 +15,16 @@ Source0: https://www.apache.org/dist/commons/logging/source/commons-loggi
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(log4j:log4j)
BuildRequires: mvn(javax.servlet:javax.servlet-api)
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
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.codehaus.mojo:build-helper-maven-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
@ -47,11 +50,6 @@ 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
%if %{with bootstrap}
%pom_remove_dep :log4j
%pom_remove_dep :log4j-core
%endif
# Avoid hard-coded versions in OSGi metadata
%pom_xpath_set "pom:properties/pom:commons.osgi.import" '*;resolution:=optional'
@ -81,6 +79,9 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
%doc PROPOSAL.html RELEASE-NOTES.txt
%changelog
* Thu Jan 16 2025 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.4-1
- Update to upstream version 1.3.4
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.3.0-6
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018

View File

@ -1 +1 @@
SHA512 (commons-logging-1.3.0-src.tar.gz) = 20cc40c7d7848da618801a86333f3984151d3089f806e5d7a1e92c83c1f90d330f1c7ded5d0ae70e48dd9de684f2e5da32de24fa2c406f6b419f77704c0e74f8
SHA512 (commons-logging-1.3.4-src.tar.gz) = a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44