From 804ce2788e215dc7c8c28d7a90c7f0bb2cdabb5b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 1/8] Remove javadoc subpackage --- junit.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/junit.spec b/junit.spec index ab5e8bb..f8eeaa5 100644 --- a/junit.spec +++ b/junit.spec @@ -30,6 +30,8 @@ BuildRequires: mvn(org.hamcrest:hamcrest-core) # itself, so explicit BR on surefire-junit4 is needed. BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 4.13.2-20 %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. @@ -43,12 +45,6 @@ Summary: Manual for %{name} %description manual Documentation for %{name}. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -69,7 +65,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %mvn_alias junit:junit junit:junit-dep %build -%mvn_build -- -DjdkVersion=1.8 -P\!restrict-doclint +%mvn_build -j -- -DjdkVersion=1.8 -P\!restrict-doclint %install %mvn_install @@ -82,8 +78,5 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %license LICENSE-junit.txt %doc doc/* -%files javadoc -f .mfiles-javadoc -%license LICENSE-junit.txt - %changelog %autochangelog From 31a931a55f064b8cc1d352c652b8ff1f46420de1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 5 Mar 2025 13:49:31 +0100 Subject: [PATCH 2/8] Fix javadoc obsoletes version --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index f8eeaa5..f34f04d 100644 --- a/junit.spec +++ b/junit.spec @@ -31,7 +31,7 @@ BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4) %endif # TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 4.13.2-20 +Obsoletes: %{name}-javadoc < 1:4.13.2-20 %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. From a03662c1049783664d53ba735941b429e49cc7bf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 3/8] 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 204bca60baa623f50e35fbb5779689bcd72e7066 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 4/8] 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 bd3acbc99f5eee237c7b58051030882497f69527 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 5/8] Build with OpenJDK 25 --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index f34f04d..e1d5b0c 100644 --- a/junit.spec +++ b/junit.spec @@ -20,7 +20,7 @@ Patch: 0002-Port-to-OpenJDK-21.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) %endif From 871864ee9cab37a84498835c33b341498f605495 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:08:47 +0000 Subject: [PATCH 6/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a571dbe6f8e3b8565794430d33e511eaada4af8d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:02:32 +0200 Subject: [PATCH 7/8] 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. From 1e9dfd0dfb37bd976c94ad0d4fbf65eab05bc45a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 9 Sep 2025 12:22:50 +0200 Subject: [PATCH 8/8] Remove build-dependency on maven-enforcer-plugin --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index e1d5b0c..0bddd0e 100644 --- a/junit.spec +++ b/junit.spec @@ -21,7 +21,6 @@ Patch: 0002-Port-to-OpenJDK-21.patch BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) %endif %if %{without bootstrap} @@ -56,6 +55,7 @@ sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >src/main/java/junit/runner/Version.java %pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin # Removing hamcrest source jar references (not available and/or necessary) %pom_remove_plugin :maven-javadoc-plugin