From 40de6aa7f320a09753134053c0dd867f7ac9a570 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:14 +0100 Subject: [PATCH 1/6] Remove javadoc subpackage --- testng.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/testng.spec b/testng.spec index cee1b41..922f954 100644 --- a/testng.spec +++ b/testng.spec @@ -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 From e12be2f374497ac816ea945d2a67d26b654ec8ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 2/6] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 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 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 1ae91a77b999b2d71e6afe13d9f76e6217d91a5e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 3/6] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 3fc566ac891cd6e25d61fcdaba79a75f0c3f38f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 4/6] Build with OpenJDK 25 --- testng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index 922f954..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) From 1fdd38ec1d2c063aa7694a3ff8a9ca28072d1244 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:13:09 +0000 Subject: [PATCH 5/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ec0b345eaf52ebf96ff510a6958e1bf7637cb949 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:22:25 +0200 Subject: [PATCH 6/6] 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.