diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 068fbc6..94cbb67 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -20,21 +20,17 @@ Patch: 0001-ParseValues-NullPointerException-patch.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.testng:testng) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.82-23 %description JCommander is a very small Java framework that makes it trivial to parse command line parameters (with annotations). -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C chmod -x license.txt @@ -48,7 +44,7 @@ cp -p %SOURCE1 pom.xml %mvn_file : %{name} %build -%mvn_build +%mvn_build -j %install %mvn_install @@ -57,8 +53,5 @@ cp -p %SOURCE1 pom.xml %license license.txt notice.md %doc README.markdown -%files javadoc -f .mfiles-javadoc -%license license.txt notice.md - %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