diff --git a/.gitignore b/.gitignore index 80385b6..21564a1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ 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 diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index c0736f1..81df12e 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-commons-logging -Version: 1.3.5 +Version: 1.3.4 Release: %autorelease Summary: Apache Commons Logging License: Apache-2.0 @@ -14,19 +14,18 @@ Source0: https://www.apache.org/dist/commons/logging/source/commons-loggi %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk25 +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 -# TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 1.3.4-8 %description The commons-logging package provides a simple, component oriented @@ -39,6 +38,12 @@ 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 @@ -52,8 +57,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 @@ -68,7 +73,7 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 %build # missing test dependencies -%mvn_build -j -f +%mvn_build -f %install %mvn_install @@ -77,5 +82,7 @@ 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 diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index ae17c0c..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 + url: https://src.fedoraproject.org/tests/javapackages + ref: f42 execute: how: tmt diff --git a/sources b/sources index ab4f76c..2bb5c0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-logging-1.3.5-src.tar.gz) = 07463385a3d997413fd7cb996d7266d0325e0829d88ee1d844ee13cdee702da5ec5817ccdd2b4bbccc3c9f6defd0f08f0397e6218bbd658b3e8336e9f146c0c3 +SHA512 (commons-logging-1.3.4-src.tar.gz) = a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44