Compare commits

...
Sign in to create a new pull request.

9 commits

Author SHA1 Message Date
Fedora Release Engineering
5c69d5b65d Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 03:47:24 +00:00
Mikolaj Izdebski
d469b3fe05 Remove build-dependency on maven-enforcer-plugin 2025-09-09 12:18:13 +02:00
Jiri Vanek
757a901f64 Rebuilt for java-25-openjdk as preffered jdk
https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
2025-07-29 19:06:34 +02:00
Fedora Release Engineering
cef02c5ee9 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 17:06:10 +00:00
Mikolaj Izdebski
61e2f21283 Update to upstream version 1.3.5 2025-07-16 21:00:55 +02:00
Mikolaj Izdebski
15c98d6315 Build with OpenJDK 25 2025-07-13 09:22:51 +02:00
Mikolaj Izdebski
b51933a1fc Switch javapackages test plan to f43 ref 2025-05-22 13:35:31 +02:00
Mikolaj Izdebski
19dca87a52 Switch to javapackages tests from CentOS Stream GitLab 2025-03-26 08:43:18 +01:00
Mikolaj Izdebski
75daf2b407 Remove javadoc subpackage 2025-03-03 12:53:32 +01:00
4 changed files with 10 additions and 16 deletions

1
.gitignore vendored
View file

@ -4,3 +4,4 @@ commons-logging-1.1.1-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
/commons-logging-1.3.5-src.tar.gz

View file

@ -1,7 +1,7 @@
%bcond_with bootstrap
Name: apache-commons-logging
Version: 1.3.4
Version: 1.3.5
Release: %autorelease
Summary: Apache Commons Logging
License: Apache-2.0
@ -14,18 +14,19 @@ Source0: https://www.apache.org/dist/commons/logging/source/commons-loggi
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local
BuildRequires: maven-local-openjdk25
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
# TODO Remove in Fedora 46
Obsoletes: %{name}-javadoc < 1.3.4-8
%description
The commons-logging package provides a simple, component oriented
@ -38,12 +39,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
logging implementation.
%package javadoc
Summary: API documentation for %{name}
%description javadoc
API documentation for %{name}.
%prep
%autosetup -p1 -C
@ -57,8 +52,8 @@ rm src/test/java/org/apache/commons/logging/pathable/{Parent,Child}FirstTestCase
# 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
%pom_remove_plugin :maven-enforcer-plugin
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
@ -73,7 +68,7 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
%build
# missing test dependencies
%mvn_build -f
%mvn_build -j -f
%install
%mvn_install
@ -82,7 +77,5 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
%license LICENSE.txt NOTICE.txt
%doc PROPOSAL.html RELEASE-NOTES.txt
%files javadoc -f .mfiles-javadoc
%changelog
%autochangelog

View file

@ -1,7 +1,7 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://src.fedoraproject.org/tests/javapackages
ref: f42
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
ref: f43
execute:
how: tmt

View file

@ -1 +1 @@
SHA512 (commons-logging-1.3.4-src.tar.gz) = a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44
SHA512 (commons-logging-1.3.5-src.tar.gz) = 07463385a3d997413fd7cb996d7266d0325e0829d88ee1d844ee13cdee702da5ec5817ccdd2b4bbccc3c9f6defd0f08f0397e6218bbd658b3e8336e9f146c0c3