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/testng.spec b/testng.spec index cee1b41..6173a52 100644 --- a/testng.spec +++ b/testng.spec @@ -22,7 +22,7 @@ Patch: 0002-Replace-bundled-jquery-with-CDN-link.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(com.beust:jcommander) BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(com.google.inject:guice) @@ -30,6 +30,8 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 7.8.0-20 %description TestNG is a testing framework inspired from JUnit and NUnit but introducing @@ -37,12 +39,6 @@ some new functionality, including flexible test configuration, and distributed test running. It is designed to cover unit tests as well as functional, end-to-end, integration, etc. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -72,7 +68,7 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %build # Tests extend a class written in Kotlin -%mvn_build -f -- -Dmaven.compiler.release=11 +%mvn_build -j -f -- -Dmaven.compiler.release=11 %install %mvn_install @@ -81,8 +77,5 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %doc CHANGES.txt README.md %license LICENSE.txt -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt - %changelog %autochangelog