diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 4bbc84e..48e7348 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-commons-codec -Version: 1.17.1 +Version: 1.19.0 Release: %autorelease Summary: Implementations of common encoders and decoders License: Apache-2.0 @@ -17,25 +17,21 @@ Source1: aspell-mail.txt %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.hamcrest:hamcrest) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.17.1-12 %description Commons Codec is an attempt to provide definitive implementations of commonly used encoders and decoders. Examples include Base64, Hex, Phonetic and URLs. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C cp %{SOURCE1} aspell-mail.txt @@ -45,7 +41,7 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %mvn_alias : commons-codec:commons-codec %build -%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.codec +%mvn_build -j -- -Dcommons.osgi.symbolicName=org.apache.commons.codec %install %mvn_install @@ -54,7 +50,5 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %license LICENSE.txt NOTICE.txt aspell-mail.txt %doc RELEASE-NOTES* -%files javadoc -f .mfiles-javadoc - %changelog %autochangelog diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -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 diff --git a/sources b/sources index 0831a81..a867bff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-codec-1.17.1-src.tar.gz) = c98456664396d4d9cb794c185a479e6bb4a5055ed1f526a8e358fe3a59409c057dbb16f59c251bb52976995dbca14d8f15857074c9d19fbc7bdfed625a13abf0 +SHA512 (commons-codec-1.19.0-src.tar.gz) = 65532419ea55f6d829ea46ff04806ab539a4e904950af9b780632c41011186ef1f38ebc739e3db115b2dd79266574316aa8c8e6e83c688accc8b1e8f4c2a3e83