From 25eb712477ad4ee5824c7f749bc654d8073e500d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 06:45:10 +0000 Subject: [PATCH 01/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 79e8de6..1c59114 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.12 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -86,6 +86,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1:4.12-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 2 2018 Mikolaj Izdebski - 1:4.12-9 - Update license tag From 218483143c2fa9898c816e08bd38676ff8cad088 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 04:54:08 +0000 Subject: [PATCH 02/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 1c59114..535cbb0 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.12 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -86,6 +86,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1:4.12-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1:4.12-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8035b41731dc3bf457fc4282526e7374feb046ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 10:57:00 +0000 Subject: [PATCH 03/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 535cbb0..47dc344 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.12 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -86,6 +86,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1:4.12-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1:4.12-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 25cfe9b5c3b19a9be185c978d43a734b69375471 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 06:32:31 +0000 Subject: [PATCH 04/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 47dc344..7e10338 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.12 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -86,6 +86,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1:4.12-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1:4.12-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 62330143ac7d8931b2e2b71869cb625a9bb0dba2 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 25 Jun 2020 16:05:41 +0300 Subject: [PATCH 05/58] Upate to 4.13 and fix build with Java 11. --- .gitignore | 1 + create-tarball.sh | 8 ++++---- junit.spec | 23 ++++++++++++++++++----- sources | 2 +- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ecd44ef..d4b4463 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ junit3.8.2.zip /r4.11.tar.gz /junit-4.11-clean.tar.gz /junit-4.12-clean.tar.gz +/junit4-4.13-clean.tar.gz diff --git a/create-tarball.sh b/create-tarball.sh index 1594760..d6b835e 100755 --- a/create-tarball.sh +++ b/create-tarball.sh @@ -8,15 +8,15 @@ fi VERSION=${1} NAME="junit" -wget https://github.com/${NAME}-team/${NAME}/archive/r${VERSION}.tar.gz +wget https://github.com/${NAME}-team/${NAME}4/archive/r${VERSION}.tar.gz tar xvf r${VERSION}.tar.gz ( - cd ${NAME}-r${VERSION} + cd ${NAME}4-r${VERSION} find . -name "*.jar" -delete find . -name "*.class" -delete ) -tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-r${VERSION} -rm -Rf ${NAME}-${VERSION}.tar.gz +tar czvf ${NAME}4-${VERSION}-clean.tar.gz ${NAME}4-r${VERSION} +rm -Rf ${NAME}4-${VERSION}.tar.gz diff --git a/junit.spec b/junit.spec index 7e10338..75426b3 100644 --- a/junit.spec +++ b/junit.spec @@ -1,20 +1,21 @@ Name: junit Epoch: 1 -Version: 4.12 -Release: 13%{?dist} +Version: 4.13 +Release: 1%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ BuildArch: noarch # ./clean-tarball.sh %{version} -Source0: %{name}-%{version}-clean.tar.gz +Source0: %{name}4-%{version}-clean.tar.gz Source3: create-tarball.sh BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) +BuildRequires: mvn(org.hamcrest:hamcrest-library) Obsoletes: %{name}-demo < 4.12 @@ -37,7 +38,7 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n %{name}-r%{version} +%setup -q -n %{name}4-r%{version} # InaccessibleBaseClassTest fails with Java 8 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java @@ -67,10 +68,18 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr " +# Fix javadoc generation on java 11 +%pom_xpath_inject pom:build/pom:plugins " +maven-javadoc-plugin +1.6 +" + %mvn_file : %{name} +sed -i -e "s|1.5|1.6|" pom.xml + %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -86,6 +95,10 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jun 25 2020 Alexander Kurtakov 1:4.13-1 +- Update to 4.13 +- Fix build with Java 11. + * Wed Jan 29 2020 Fedora Release Engineering - 1:4.12-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d77668d..90c2f5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0de14594aaba3379f6b19ba75a393232 junit-4.12-clean.tar.gz +SHA512 (junit4-4.13-clean.tar.gz) = 608718a813e6709b5e63efa378c055e57204fc4403ff6a638950b935cb6cb18e0d9857b6fe5709bd78803499525c694b45f7abfb01fa8271e5658acc2ae47314 From efbc750544429950ba7089de3b88e768cef81078 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 25 Jun 2020 19:53:13 +0200 Subject: [PATCH 06/58] Revert "Upate to 4.13 and fix build with Java 11." This reverts commit 62330143ac7d8931b2e2b71869cb625a9bb0dba2. junit 4.13 breaks jmock and mockito. --- .gitignore | 1 - create-tarball.sh | 8 ++++---- junit.spec | 23 +++++------------------ sources | 2 +- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index d4b4463..ecd44ef 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ junit3.8.2.zip /r4.11.tar.gz /junit-4.11-clean.tar.gz /junit-4.12-clean.tar.gz -/junit4-4.13-clean.tar.gz diff --git a/create-tarball.sh b/create-tarball.sh index d6b835e..1594760 100755 --- a/create-tarball.sh +++ b/create-tarball.sh @@ -8,15 +8,15 @@ fi VERSION=${1} NAME="junit" -wget https://github.com/${NAME}-team/${NAME}4/archive/r${VERSION}.tar.gz +wget https://github.com/${NAME}-team/${NAME}/archive/r${VERSION}.tar.gz tar xvf r${VERSION}.tar.gz ( - cd ${NAME}4-r${VERSION} + cd ${NAME}-r${VERSION} find . -name "*.jar" -delete find . -name "*.class" -delete ) -tar czvf ${NAME}4-${VERSION}-clean.tar.gz ${NAME}4-r${VERSION} -rm -Rf ${NAME}4-${VERSION}.tar.gz +tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-r${VERSION} +rm -Rf ${NAME}-${VERSION}.tar.gz diff --git a/junit.spec b/junit.spec index 75426b3..7e10338 100644 --- a/junit.spec +++ b/junit.spec @@ -1,21 +1,20 @@ Name: junit Epoch: 1 -Version: 4.13 -Release: 1%{?dist} +Version: 4.12 +Release: 13%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ BuildArch: noarch # ./clean-tarball.sh %{version} -Source0: %{name}4-%{version}-clean.tar.gz +Source0: %{name}-%{version}-clean.tar.gz Source3: create-tarball.sh BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) -BuildRequires: mvn(org.hamcrest:hamcrest-library) Obsoletes: %{name}-demo < 4.12 @@ -38,7 +37,7 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n %{name}4-r%{version} +%setup -q -n %{name}-r%{version} # InaccessibleBaseClassTest fails with Java 8 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java @@ -68,18 +67,10 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr " -# Fix javadoc generation on java 11 -%pom_xpath_inject pom:build/pom:plugins " -maven-javadoc-plugin -1.6 -" - %mvn_file : %{name} -sed -i -e "s|1.5|1.6|" pom.xml - %build -%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build %install %mvn_install @@ -95,10 +86,6 @@ sed -i -e "s|1.5|1.6|" pom.xml %doc doc/* %changelog -* Thu Jun 25 2020 Alexander Kurtakov 1:4.13-1 -- Update to 4.13 -- Fix build with Java 11. - * Wed Jan 29 2020 Fedora Release Engineering - 1:4.12-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 90c2f5d..d77668d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (junit4-4.13-clean.tar.gz) = 608718a813e6709b5e63efa378c055e57204fc4403ff6a638950b935cb6cb18e0d9857b6fe5709bd78803499525c694b45f7abfb01fa8271e5658acc2ae47314 +0de14594aaba3379f6b19ba75a393232 junit-4.12-clean.tar.gz From a93f84761eed73138e93909f1bb35b1be04f207b Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 01:28:00 +0200 Subject: [PATCH 07/58] Rebuilt for JDK-11 --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 7e10338..8f082c9 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.12 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -86,6 +86,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Fri Jul 10 2020 Jiri Vanek - 1:4.12-14 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Wed Jan 29 2020 Fedora Release Engineering - 1:4.12-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 3c8bcf06e4c3f0288f44bfb6866c27e7af875834 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 02:38:02 +0000 Subject: [PATCH 08/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 8f082c9..55d06be 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.12 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -86,6 +86,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1:4.12-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 1:4.12-14 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 3185c387e1df7766d41e56934e14243ec4471640 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 03:42:09 +0000 Subject: [PATCH 09/58] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 55d06be..d6c25c3 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.12 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -86,6 +86,10 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1:4.12-16 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1:4.12-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9203b010d250a7631e66e465039c95f618f33b70 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 4 Aug 2020 11:16:25 +0100 Subject: [PATCH 10/58] Allow building on Java 11 --- junit.spec | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/junit.spec b/junit.spec index d6c25c3..cae2b2e 100644 --- a/junit.spec +++ b/junit.spec @@ -1,13 +1,13 @@ Name: junit Epoch: 1 Version: 4.12 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ BuildArch: noarch -# ./clean-tarball.sh %{version} +# ./clean-tarball.sh %%{version} Source0: %{name}-%{version}-clean.tar.gz Source3: create-tarball.sh @@ -67,25 +67,44 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr " +# Use compiler release flag when building on JDK >8 for correct cross-compiling +%pom_xpath_inject pom:profiles " + + jdk-release-flag + + [9,) + + + \${jdkVersion} + + " + +# Ignore test that breaks on Java 11 due to unexpected extra annotations in the JDK standard library +sed -i -e '/providesAnnotatedMethodsSortedByName/i@Ignore' src/test/java/org/junit/runners/model/TestClassTest.java + %mvn_file : %{name} %build -%mvn_build +%mvn_build -- -DjdkVersion=8 %install %mvn_install %files -f .mfiles -%doc LICENSE-junit.txt README.md +%license LICENSE-junit.txt +%doc README.md %files javadoc -f .mfiles-javadoc -%doc LICENSE-junit.txt +%license LICENSE-junit.txt %files manual -%doc LICENSE-junit.txt +%license LICENSE-junit.txt %doc doc/* %changelog +* Tue Aug 04 2020 Mat Booth - 1:4.12-17 +- Allow building on Java 11 + * Sat Aug 01 2020 Fedora Release Engineering - 1:4.12-16 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1e50c7d37123f077d5e75212f09144baa707b064 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 4 Aug 2020 16:10:00 +0100 Subject: [PATCH 11/58] Add automatic module name --- junit.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index cae2b2e..849c541 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.12 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -82,6 +82,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr # Ignore test that breaks on Java 11 due to unexpected extra annotations in the JDK standard library sed -i -e '/providesAnnotatedMethodsSortedByName/i@Ignore' src/test/java/org/junit/runners/model/TestClassTest.java +# Set JPMS module name +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration/pom:archive" "junit" + %mvn_file : %{name} %build @@ -102,6 +105,9 @@ sed -i -e '/providesAnnotatedMethodsSortedByName/i@Ignore' src/test/java/org/jun %doc doc/* %changelog +* Tue Aug 04 2020 Mat Booth - 1:4.12-18 +- Add automatic module name + * Tue Aug 04 2020 Mat Booth - 1:4.12-17 - Allow building on Java 11 From 11396be06b823158af84d44c8ec517eb1bc2444a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 13 Aug 2020 14:46:13 -0600 Subject: [PATCH 12/58] Update to upstream version 4.13. --- create-tarball.sh | 2 +- junit.spec | 21 +++++++++------------ sources | 2 +- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/create-tarball.sh b/create-tarball.sh index 1594760..0551a08 100755 --- a/create-tarball.sh +++ b/create-tarball.sh @@ -6,7 +6,7 @@ if [ $# -ne 1 ]; then fi VERSION=${1} -NAME="junit" +NAME="junit4" wget https://github.com/${NAME}-team/${NAME}/archive/r${VERSION}.tar.gz tar xvf r${VERSION}.tar.gz diff --git a/junit.spec b/junit.spec index 849c541..fb5178f 100644 --- a/junit.spec +++ b/junit.spec @@ -1,20 +1,21 @@ Name: junit Epoch: 1 -Version: 4.12 -Release: 18%{?dist} +Version: 4.13 +Release: 1%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ BuildArch: noarch # ./clean-tarball.sh %%{version} -Source0: %{name}-%{version}-clean.tar.gz +Source0: %{name}4-%{version}-clean.tar.gz Source3: create-tarball.sh BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) +BuildRequires: mvn(org.hamcrest:hamcrest-library) Obsoletes: %{name}-demo < 4.12 @@ -37,10 +38,7 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n %{name}-r%{version} - -# InaccessibleBaseClassTest fails with Java 8 -sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java +%autosetup -n %{name}4-r%{version} %pom_remove_plugin :replacer sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >src/main/java/junit/runner/Version.java @@ -79,11 +77,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr " -# Ignore test that breaks on Java 11 due to unexpected extra annotations in the JDK standard library -sed -i -e '/providesAnnotatedMethodsSortedByName/i@Ignore' src/test/java/org/junit/runners/model/TestClassTest.java - -# Set JPMS module name -%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration/pom:archive" "junit" +%pom_xpath_set //pom:compilerVersion 1.8 %mvn_file : %{name} @@ -105,6 +99,9 @@ sed -i -e '/providesAnnotatedMethodsSortedByName/i@Ignore' src/test/java/org/jun %doc doc/* %changelog +* Thu Aug 13 2020 Jerry James - 1:4.13-1 +- Update to upstream version 4.13 + * Tue Aug 04 2020 Mat Booth - 1:4.12-18 - Add automatic module name diff --git a/sources b/sources index d77668d..d5a7c9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0de14594aaba3379f6b19ba75a393232 junit-4.12-clean.tar.gz +SHA512 (junit4-4.13-clean.tar.gz) = a5ca6378dd50d912ad77893c6435e9e6f9500e5bc0dda811a68741a7055bfbd990c4075f7e43e8027568fa5d2ffb4579a76fd11dda86e26f52032f91674af87e From fa4ab6d4b836f0747cb7899bcedd9cecfc3e593d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 16 Aug 2020 12:00:07 +0200 Subject: [PATCH 13/58] bump release to account for previously untagged 4.13-1.fc33 build --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index fb5178f..d8c1ed2 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -99,6 +99,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Sun Aug 16 2020 Fabio Valentini - 1:4.13-2 +- Bump release to account for previously untagged 4.13-1.fc33 build. + * Thu Aug 13 2020 Jerry James - 1:4.13-1 - Update to upstream version 4.13 From d1002df10688196fca68bdc67ecf2ff38543ad2d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 4 Dec 2020 12:53:26 +0100 Subject: [PATCH 14/58] Update to upstream version 4.13.1 --- .gitignore | 1 + junit.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 78c1bba..b5d208d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ junit3.8.2.zip /junit-4.11-clean.tar.gz /junit-4.12-clean.tar.gz /junit-4.13.tar.gz +/junit-4.13.1.tar.gz diff --git a/junit.spec b/junit.spec index 9c9c478..236af75 100644 --- a/junit.spec +++ b/junit.spec @@ -1,5 +1,5 @@ Name: junit -Version: 4.13 +Version: 4.13.1 Release: 1%{?dist} Summary: Java regression test package License: EPL-1.0 @@ -92,6 +92,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Fri Dec 4 2020 Mikolaj Izdebski - 4.13.1-1 +- Update to upstream version 4.13.1 + * Fri Mar 06 2020 Marian Koncek - 4.13-1 - Update to upstream version 4.13 diff --git a/sources b/sources index b0927fa..4064fda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (junit-4.13.tar.gz) = 6cafdeed70435c1928767fbb3327a7c9e6d6869703c10696e404e6f1c3ececa3ef0c09bad50585c28f6b1ca5b17affcaa29e207b1d20e257e7f332d5fc3554bc +SHA512 (junit-4.13.1.tar.gz) = 53eb0ab9278bb792b8e5f7978d3d47f52d6e94898fbf77286f7d4836cdb78aac4f0db111c146373e2591feb9c8600193d09c146a6befa56029c06324e444ecfc From 953bf29c47711f9a59f9c0ee1bb35798814525e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 15:06:33 +0000 Subject: [PATCH 15/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index d8c1ed2..506dbb1 100644 --- a/junit.spec +++ b/junit.spec @@ -1,7 +1,7 @@ Name: junit Epoch: 1 Version: 4.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -99,6 +99,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1:4.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Aug 16 2020 Fabio Valentini - 1:4.13-2 - Bump release to account for previously untagged 4.13-1.fc33 build. From 83b6c85acad2b8a45dbb5b10e61df375b1f303bb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 16/58] Conditionalize buildrequires in bootstrap mode --- junit.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/junit.spec b/junit.spec index 236af75..2703dc2 100644 --- a/junit.spec +++ b/junit.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: junit Version: 4.13.1 Release: 1%{?dist} @@ -13,14 +15,20 @@ Source1: generate-tarball.sh Patch1: 0001-Port-to-hamcrest-2.2.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) +%endif # For other packages, surefire-junit4 is normally pulled as transitive # runtime dependency of junit, but junit doesn't build-depend on # itself, so explicit BR on surefire-junit4 is needed. +%if %{without bootstrap} BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4) +%endif %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. From bac7df55951558a6ba3d31b41b1e14eccca4f046 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 17/58] Turn off bootstrap mode by default --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 2703dc2..5461390 100644 --- a/junit.spec +++ b/junit.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: junit Version: 4.13.1 From da81f4afc04ecd854f1d173c6168ee2cadbb158a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:57 +0200 Subject: [PATCH 18/58] Bootstrap build --- junit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/junit.spec b/junit.spec index c61a72b..c993ffc 100644 --- a/junit.spec +++ b/junit.spec @@ -1,9 +1,9 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: junit Epoch: 1 Version: 4.13.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -102,6 +102,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1:4.13.1-2 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 1:4.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f2ac673f546a3714f2f17d2449ba873dbd64c7a4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:44 +0200 Subject: [PATCH 19/58] Non-bootstrap build --- junit.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index c993ffc..b679d3f 100644 --- a/junit.spec +++ b/junit.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: junit Epoch: 1 @@ -104,6 +104,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %changelog * Mon May 17 2021 Mikolaj Izdebski - 1:4.13.1-2 - Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 1:4.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 81119b3df75dbcf03c631a4c36018b2011b77b66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:21:21 +0000 Subject: [PATCH 20/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index b679d3f..e471eb4 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -102,6 +102,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1:4.13.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 1:4.13.1-2 - Bootstrap build - Non-bootstrap build From ede9920526d88376fee328c2701ebf08fe7fa74c Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Thu, 14 Oct 2021 00:11:15 +0700 Subject: [PATCH 21/58] Add alias for junit-dep --- junit.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index e471eb4..974719c 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -84,6 +84,8 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %mvn_file : %{name} +%mvn_alias junit:junit junit:junit-dep + %build %mvn_build -- -DjdkVersion=1.6 @@ -102,6 +104,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Sep 15 2021 Didik Supriadi - 1:4.13.1-4 +- Add alias for junit-dep + * Thu Jul 22 2021 Fedora Release Engineering - 1:4.13.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 123e6511ef80f56485d58210da57eceddda0c93a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 16:22:58 +0100 Subject: [PATCH 22/58] Bump Java compiler source/target levels to 1.7 --- junit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/junit.spec b/junit.spec index 974719c..8410a4e 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -87,7 +87,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.6 +%mvn_build -- -DjdkVersion=1.7 -P\!restrict-doclint %install %mvn_install @@ -104,6 +104,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Nov 02 2021 Mikolaj Izdebski - 1:4.13.1-5 +- Bump Java compiler source/target levels to 1.7 + * Tue Sep 15 2021 Didik Supriadi - 1:4.13.1-4 - Add alias for junit-dep From 3f204afac8cb6bcb1ef5680645102035f0f4fc96 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 7 Jan 2022 09:58:35 +0100 Subject: [PATCH 23/58] Module javapackages-tools stream 202001 was retired --- .gitignore | 6 - 0001-Port-to-hamcrest-2.2.patch | 108 ----------- dead.package | 1 + generate-tarball.sh | 22 --- junit.spec | 309 -------------------------------- sources | 1 - 6 files changed, 1 insertion(+), 446 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Port-to-hamcrest-2.2.patch create mode 100644 dead.package delete mode 100755 generate-tarball.sh delete mode 100644 junit.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 78c1bba..0000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -junit3.8.2.zip -/junit-4.10.tar.xz -/r4.11.tar.gz -/junit-4.11-clean.tar.gz -/junit-4.12-clean.tar.gz -/junit-4.13.tar.gz diff --git a/0001-Port-to-hamcrest-2.2.patch b/0001-Port-to-hamcrest-2.2.patch deleted file mode 100644 index 0d51ef4..0000000 --- a/0001-Port-to-hamcrest-2.2.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 85c780b61cd35b4544d2926393805e1699641f38 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Fri, 6 Mar 2020 14:28:05 +0100 -Subject: [PATCH] Port to hamcrest 2.2 - ---- - .../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- - .../org/junit/internal/matchers/ThrowableCauseMatcher.java | 2 -- - .../org/junit/internal/matchers/ThrowableMessageMatcher.java | 2 -- - src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- - .../experimental/theories/runner/WithDataPointMethod.java | 2 +- - 5 files changed, 2 insertions(+), 9 deletions(-) - -diff --git a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java -index 93a6827..3ea4a81 100644 ---- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java -+++ b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java -@@ -1,7 +1,6 @@ - package org.junit.internal.matchers; - - import org.hamcrest.Description; --import org.hamcrest.Factory; - import org.hamcrest.Matcher; - - import org.junit.internal.Throwables; -@@ -39,13 +38,11 @@ public class StacktracePrintingMatcher extends - return Throwables.getStacktrace(throwable); - } - -- @Factory - public static Matcher isThrowable( - Matcher throwableMatcher) { - return new StacktracePrintingMatcher(throwableMatcher); - } - -- @Factory - public static Matcher isException( - Matcher exceptionMatcher) { - return new StacktracePrintingMatcher(exceptionMatcher); -diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java -index 6e2ff5e..1f0a0a0 100644 ---- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java -+++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java -@@ -1,7 +1,6 @@ - package org.junit.internal.matchers; - - import org.hamcrest.Description; --import org.hamcrest.Factory; - import org.hamcrest.Matcher; - import org.hamcrest.TypeSafeMatcher; - -@@ -43,7 +42,6 @@ public class ThrowableCauseMatcher extends - * @param matcher to apply to the cause of the outer exception - * @param type of the outer exception - */ -- @Factory - public static Matcher hasCause(final Matcher matcher) { - return new ThrowableCauseMatcher(matcher); - } -diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java -index 74386a8..7d16b11 100644 ---- a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java -+++ b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java -@@ -1,7 +1,6 @@ - package org.junit.internal.matchers; - - import org.hamcrest.Description; --import org.hamcrest.Factory; - import org.hamcrest.Matcher; - import org.hamcrest.TypeSafeMatcher; - -@@ -30,7 +29,6 @@ public class ThrowableMessageMatcher extends - matcher.describeMismatch(item.getMessage(), description); - } - -- @Factory - public static Matcher hasMessage(final Matcher matcher) { - return new ThrowableMessageMatcher(matcher); - } -diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java -index 13407cc..8889266 100644 ---- a/src/main/java/org/junit/matchers/JUnitMatchers.java -+++ b/src/main/java/org/junit/matchers/JUnitMatchers.java -@@ -56,7 +56,7 @@ public class JUnitMatchers { - * @deprecated Please use {@link CoreMatchers#everyItem(Matcher)} instead. - */ - @Deprecated -- public static Matcher> everyItem(final Matcher elementMatcher) { -+ public static Matcher> everyItem(final Matcher elementMatcher) { - return CoreMatchers.everyItem(elementMatcher); - } - -diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java -index f2b2753..e5759ed 100644 ---- a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java -+++ b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java -@@ -108,7 +108,7 @@ public class WithDataPointMethod { - return JUnitCore.runClasses(type).getFailures(); - } - -- private Matcher> empty() { -+ private Matcher> empty() { - return everyItem(nullValue(Failure.class)); - } - } --- -2.25.2 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..78f11b3 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Module javapackages-tools stream 202001 was retired diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index 76a4605..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -e - -name=junit -version="$(sed -n 's/Version:\s*//p' *.spec)" - -# RETRIEVE -wget "https://github.com/junit-team/junit/archive/r${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" - -rm -rf tarball-tmp -mkdir tarball-tmp -pushd tarball-tmp -tar -xf "../${name}-${version}.orig.tar.gz" - -# CLEAN TARBALL -find -name '*.jar' -delete -find -name '*.class' -delete -rm -r "junit4-r${version}/src/site" - -tar -czf "../${name}-${version}.tar.gz" * -popd -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/junit.spec b/junit.spec deleted file mode 100644 index 9c9c478..0000000 --- a/junit.spec +++ /dev/null @@ -1,309 +0,0 @@ -Name: junit -Version: 4.13 -Release: 1%{?dist} -Summary: Java regression test package -License: EPL-1.0 -URL: http://www.junit.org/ -BuildArch: noarch - -# ./generate-tarball.sh -Source0: %{name}-%{version}.tar.gz -Source1: generate-tarball.sh - -Patch1: 0001-Port-to-hamcrest-2.2.patch - -BuildRequires: maven-local -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.hamcrest:hamcrest-core) - -# For other packages, surefire-junit4 is normally pulled as transitive -# runtime dependency of junit, but junit doesn't build-depend on -# itself, so explicit BR on surefire-junit4 is needed. -BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4) - -%description -JUnit is a regression testing framework written by Erich Gamma and Kent Beck. -It is used by the developer who implements unit tests in Java. JUnit is Open -Source Software, released under the Common Public License Version 1.0 and -hosted on GitHub. - -%package manual -Summary: Manual for %{name} - -%description manual -Documentation for %{name}. - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -Javadoc for %{name}. - -%prep -%setup -q -n junit4-r%{version} - -%patch1 -p1 - -# InaccessibleBaseClassTest fails with Java 8 -sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java - -%pom_remove_plugin :replacer -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 - -# Removing hamcrest source jar references (not available and/or necessary) -%pom_remove_plugin :maven-javadoc-plugin - -# Add proper Apache Felix Bundle Plugin instructions -# so that we get a reasonable OSGi manifest. -%pom_xpath_inject pom:project "bundle" -%pom_xpath_inject pom:build/pom:plugins " - - org.apache.felix - maven-bundle-plugin - true - - - org.junit - {local-packages},!org.hamcrest*,*;x-internal:=true - <_nouses>true - - - " - -%mvn_file : %{name} - -%build -%mvn_build -- -DjdkVersion=1.6 - -%install -%mvn_install - -%files -f .mfiles -%doc LICENSE-junit.txt README.md - -%files javadoc -f .mfiles-javadoc -%doc LICENSE-junit.txt - -%files manual -%doc LICENSE-junit.txt -%doc doc/* - -%changelog -* Fri Mar 06 2020 Marian Koncek - 4.13-1 -- Update to upstream version 4.13 - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.12-11 -- Mass rebuild for javapackages-tools 201902 - -* Fri May 24 2019 Mikolaj Izdebski - 1:4.12-10 -- Mass rebuild for javapackages-tools 201901 - -* Mon Jul 2 2018 Mikolaj Izdebski - 1:4.12-9 -- Update license tag - -* Wed Feb 07 2018 Fedora Release Engineering - 1:4.12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1:4.12-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1:4.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jul 15 2016 Mat Booth - 1:4.12-5 -- Add missing BR - -* Thu Feb 04 2016 Fedora Release Engineering - 1:4.12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1:4.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jan 21 2015 Mikolaj Izdebski - 1:4.12-2 -- Export internal OSGi packages and mark them with x-internal -- Resolves: rhbz#1184144 - -* Mon Jan 19 2015 Mikolaj Izdebski - 1:4.12-1 -- Update to upstream version 4.12 -- Build with Maven -- Remove demo package - -* Mon Jun 9 2014 Mikolaj Izdebski - 1:4.11-14 -- Add epoch as workaround for a bug in koji-shadow - -* Mon Jun 9 2014 Mikolaj Izdebski - 4.11-13 -- Remove epoch - -* Sun Jun 8 2014 Peter Robinson 4.11-12 -- Re-add Epoch. Once you have it you can't remove it as it breaks upgrade paths - -* Sun Jun 08 2014 Fedora Release Engineering - 4.11-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 22 2014 Alexander Kurtakov 4.11-10 -- Update OSGi manifest to state 4.11. - -* Wed May 21 2014 Mikolaj Izdebski - 4.11-9 -- Update to current packaging guidelines -- Drop old Obsoletes/Provides for junit4 rename -- Disable test which fails with Java 8 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 0:4.11-8 -- Use Requires: java-headless rebuild (#1067528) - -* Fri Aug 23 2013 Michal Srb - 0:4.11-7 -- Drop "-SNAPSHOT" from version ID -- See: https://lists.fedoraproject.org/pipermail/java-devel/2013-August/004923.html - -* Mon Aug 19 2013 Stanislav Ochotnicky - 0:4.11-6 -- Fix version in pom.xml (#998266) - -* Fri Aug 02 2013 Michal Srb - 0:4.11-5 -- Add create-tarball.sh script to SRPM - -* Fri Jun 28 2013 Mikolaj Izdebski - 0:4.11-4 -- Rebuild to regenerate API documentation -- Resolves: CVE-2013-1571 - -* Fri Jun 21 2013 Michal Srb - 0:4.11-3 -- Build from clean tarball - -* Mon May 06 2013 Tomas Radej - 0:4.11-2 -- Removed uneeded dependencies - -* Thu Mar 21 2013 Tomas Radej - 0:4.11-1 -- Updated to latest upstream version - -* Thu Feb 14 2013 Fedora Release Engineering - 0:4.10-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Dec 18 2012 Michal Srb - 0:4.10-7 -- Build-time dependency perl-MD5 replaced with perl(Digest::MD5) -- Description cleanup (Resolves: #888389) - -* Thu Jul 19 2012 Fedora Release Engineering - 0:4.10-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Apr 30 2012 Krzysztof Daniel 0:4.10-5 -- Update OSGi metadata to match 4.10.0 release. - -* Thu Feb 09 2012 Harald Hoyer 4.10-4 -- removed Conflicts with itsself - -* Thu Jan 26 2012 Roland Grunberg 0:4.8.2-3 -- Add OSGi metadata to junit.jar manifest. - -* Thu Jan 26 2012 Tomas Radej - 0:4.10-2 -- Fixed versioning - -* Wed Jan 25 2012 Tomas Radej - 0:4.10-1 -- Updated to upstream 4.10 -- Obsoleted junit4 -- Epoch added - -* Fri Jan 13 2012 Fedora Release Engineering - 3.8.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 3.8.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Oct 7 2010 Alexander Kurtakov 3.8.2-7 -- Drop gcj support. - -* Fri Jul 24 2009 Fedora Release Engineering - 3.8.2-6.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 3.8.2-5.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jul 9 2008 Tom "spot" Callaway - 3.8.2-4.4 -- drop repotag - -* Mon Feb 18 2008 Fedora Release Engineering - 3.8.2-4jpp.3 -- Autorebuild for GCC 4.3 - -* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.3 -- Fix location of stylesheet for javadocs - -* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.2 -- Rebuild for ppc32 execmem issue and new build-id - -* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1.fc7 -- Add dist tag - -* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1 -- Committed on behalf of Tania Bento -- Update per Fedora review process -- Resolves rhbz#225954 - -* Thu Aug 10 2006 Deepak Bhole - 0:3.8.2-3jpp.1 -- Added missing requirements. - -* Thu Aug 10 2006 Karsten Hopp 0:3.8.2-2jpp_3fc -- Require(post/postun): coreutils - -* Fri Jun 23 2006 Deepak Bhole - 0:3.8.2-2jpp_2fc -- Rebuilt. - -* Thu Jun 22 2006 Deepak Bhole - 0:3.8.2-2jpp_1fc -- Upgrade to 3.8.2 -- Added conditional native compilation. -- Fix path where demo is located. - -* Fri Mar 03 2006 Ralph Apel - 0:3.8.2-1jpp -- First JPP-1.7 release - -* Mon Aug 23 2004 Randy Watler - 0:3.8.1-4jpp -- Rebuild with ant-1.6.2 -* Fri May 09 2003 David Walluck 0:3.8.1-3jpp -- update for JPackage 1.5 - -* Fri Mar 21 2003 Nicolas Mailhot 3.8.1-2jpp -- For jpackage-utils 1.5 - -* Fri Sep 06 2002 Henri Gomez 3.8.1-1jpp -- 3.8.1 - -* Sun Sep 01 2002 Guillaume Rousse 3.8-2jpp -- used original zip file - -* Thu Aug 29 2002 Guillaume Rousse 3.8-1jpp -- 3.8 -- group, vendor and distribution tags - -* Sat Jan 19 2002 Guillaume Rousse 3.7-6jpp -- versioned dir for javadoc -- no dependencies for manual and javadoc packages -- stricter dependency for demo package -- additional sources in individual archives -- section macro - -* Sat Dec 1 2001 Guillaume Rousse 3.7-5jpp -- javadoc in javadoc package - -* Wed Nov 21 2001 Christian Zoffoli 3.7-4jpp -- fixed previous releases ...grrr - -* Wed Nov 21 2001 Christian Zoffoli 3.7-3jpp -- added jpp extension -- removed packager tag - -* Sun Sep 30 2001 Guillaume Rousse 3.7-2jpp -- first unified release -- s/jPackage/JPackage - -* Mon Sep 17 2001 Guillaume Rousse 3.7-1mdk -- 3.7 -- vendor tag -- packager tag -- s/Copyright/License/ -- truncated description to 72 columns in spec -- spec cleanup -- used versioned jar -- moved demo files to %%{_datadir}/%%{name} - -* Sat Feb 17 2001 Guillaume Rousse 3.5-1mdk -- first Mandrake release diff --git a/sources b/sources deleted file mode 100644 index b0927fa..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (junit-4.13.tar.gz) = 6cafdeed70435c1928767fbb3327a7c9e6d6869703c10696e404e6f1c3ececa3ef0c09bad50585c28f6b1ca5b17affcaa29e207b1d20e257e7f332d5fc3554bc From 2771d4e014cf6b5d34dd26572823188bdeaf46ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 14:03:37 +0000 Subject: [PATCH 24/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 8410a4e..7cb2801 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -104,6 +104,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1:4.13.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 02 2021 Mikolaj Izdebski - 1:4.13.1-5 - Bump Java compiler source/target levels to 1.7 From e22e0bf350a706c12a69c41fd5ae1b6196a75198 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 22:10:06 +0100 Subject: [PATCH 25/58] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 7cb2801..cb3eaef 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -104,6 +104,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Sat Feb 05 2022 Jiri Vanek - 1:4.13.1-7 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 1:4.13.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f8b4efc26f9656888c18b414a7fdf4b8cb4f80df Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 26/58] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- junit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/junit.spec b/junit.spec index cb3eaef..8ea08b8 100644 --- a/junit.spec +++ b/junit.spec @@ -8,6 +8,7 @@ Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz From 539d9b64e2d868596300d7620d8c8085b757a0ef Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 27/58] Update build-requires in bootstrap mode --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 8ea08b8..54cb211 100644 --- a/junit.spec +++ b/junit.spec @@ -16,10 +16,10 @@ Source1: generate-tarball.sh Patch1: 0001-Port-to-hamcrest-2.2.patch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) From 1ec8a502ec0a8ffe48fbcf521e3c865c6914ecf0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:29:58 +0000 Subject: [PATCH 28/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 54cb211..b8b5319 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -105,6 +105,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1:4.13.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 1:4.13.1-7 - Rebuilt for java-17-openjdk as system jdk From 8ecdfb2f71648cdbb8d2f0751ae866e2d10dde49 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 29/58] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From 8cbf7177ff592a15b1d1e26031c01ae35eb7beba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:59:17 +0000 Subject: [PATCH 30/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index b8b5319..9073918 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -105,6 +105,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1:4.13.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 1:4.13.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6770a161f83fae43f4a2fc8b681a3512e4eef479 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 7 Sep 2022 11:18:38 +0200 Subject: [PATCH 31/58] Fix bogus date in changelog --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 9073918..6cbe034 100644 --- a/junit.spec +++ b/junit.spec @@ -120,7 +120,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr * Tue Nov 02 2021 Mikolaj Izdebski - 1:4.13.1-5 - Bump Java compiler source/target levels to 1.7 -* Tue Sep 15 2021 Didik Supriadi - 1:4.13.1-4 +* Wed Sep 15 2021 Didik Supriadi - 1:4.13.1-4 - Add alias for junit-dep * Thu Jul 22 2021 Fedora Release Engineering - 1:4.13.1-3 From 1a378a3693b2210327b25ff79c8937e6e97def9d Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 16 Feb 2023 10:09:20 +0100 Subject: [PATCH 32/58] Change packaging to jar instead of bundle --- junit.spec | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/junit.spec b/junit.spec index 6cbe034..020fa3c 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -20,7 +20,6 @@ Patch1: 0001-Port-to-hamcrest-2.2.patch BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) %endif @@ -66,23 +65,6 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr # Removing hamcrest source jar references (not available and/or necessary) %pom_remove_plugin :maven-javadoc-plugin -# Add proper Apache Felix Bundle Plugin instructions -# so that we get a reasonable OSGi manifest. -%pom_xpath_inject pom:project "bundle" -%pom_xpath_inject pom:build/pom:plugins " - - org.apache.felix - maven-bundle-plugin - true - - - org.junit - {local-packages},!org.hamcrest*,*;x-internal:=true - <_nouses>true - - - " - %mvn_file : %{name} %mvn_alias junit:junit junit:junit-dep @@ -105,6 +87,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Feb 16 2023 Marian Koncek - 1:4.13.1-11 +- Change packaging to jar instead of bundle + * Thu Jan 19 2023 Fedora Release Engineering - 1:4.13.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 700696f35de6d761b2951505aa21f4649156a9b9 Mon Sep 17 00:00:00 2001 From: Chris Kelley Date: Tue, 25 Apr 2023 15:38:36 +0100 Subject: [PATCH 33/58] Update to upstream version 4.13.2 --- .gitignore | 1 + junit.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b5d208d..d1b500a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ junit3.8.2.zip /junit-4.12-clean.tar.gz /junit-4.13.tar.gz /junit-4.13.1.tar.gz +/junit-4.13.2.tar.gz diff --git a/junit.spec b/junit.spec index 020fa3c..5007f28 100644 --- a/junit.spec +++ b/junit.spec @@ -2,8 +2,8 @@ Name: junit Epoch: 1 -Version: 4.13.1 -Release: 10%{?dist} +Version: 4.13.2 +Release: 1%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -87,6 +87,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Apr 25 2023 Chris Kelley - 4.13.2-1 +- Update to upstream version 4.13.2 + * Thu Feb 16 2023 Marian Koncek - 1:4.13.1-11 - Change packaging to jar instead of bundle diff --git a/sources b/sources index 4064fda..932111e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (junit-4.13.1.tar.gz) = 53eb0ab9278bb792b8e5f7978d3d47f52d6e94898fbf77286f7d4836cdb78aac4f0db111c146373e2591feb9c8600193d09c146a6befa56029c06324e444ecfc +SHA512 (junit-4.13.2.tar.gz) = 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb From cf69fa4f1c4282e3ca8e7f375496035fac654b48 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 15 Jun 2023 16:50:36 +0200 Subject: [PATCH 34/58] Regenerate junit-4.13.2.tar.gz tarball --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 932111e..8254963 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (junit-4.13.2.tar.gz) = 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb +SHA512 (junit-4.13.2.tar.gz) = 1d41c1e9a85429830d3bdadc3a50cbff7828c0381b225d38fe53692ab043e25e792b98acbb708b6cd505af7d75ce3e0a4c5f12c9287ad834fcc1077e1d2c9e2f From bf8dd364c7f62acc67d8e178953cd07233ee8080 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:17:19 +0000 Subject: [PATCH 35/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 5007f28..ceebdbb 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -87,6 +87,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1:4.13.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Apr 25 2023 Chris Kelley - 4.13.2-1 - Update to upstream version 4.13.2 From 5f0dad2ea31b260a9f55d659cf107c1319487e6d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 14:23:21 +0200 Subject: [PATCH 36/58] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 From d4a0de5b7ea5ccf57a5d8335cfdc604672026158 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 37/58] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From ed6b3fa217d2f9cbca4fa2e625daf2ee3dce730f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:52:31 +0000 Subject: [PATCH 38/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index ceebdbb..de99f1e 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -87,6 +87,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 1:4.13.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 1:4.13.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d1fca191fe7379c82f0fb3402a8656dc93c08965 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:32:36 +0000 Subject: [PATCH 39/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index de99f1e..309f48e 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java regression test package License: EPL-1.0 URL: http://www.junit.org/ @@ -87,6 +87,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1:4.13.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 1:4.13.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 388db1ec6ca15630eb3a4ee394ceb43b58b2e315 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 20 Feb 2024 10:09:37 +0100 Subject: [PATCH 40/58] Port to OpenJDK 21 --- 0002-Port-to-OpenJDK-21.patch | 143 ++++++++++++++++++++++++++++++++++ junit.spec | 13 +++- 2 files changed, 152 insertions(+), 4 deletions(-) create mode 100644 0002-Port-to-OpenJDK-21.patch diff --git a/0002-Port-to-OpenJDK-21.patch b/0002-Port-to-OpenJDK-21.patch new file mode 100644 index 0000000..7a37714 --- /dev/null +++ b/0002-Port-to-OpenJDK-21.patch @@ -0,0 +1,143 @@ +From e77b0978378999acd44ddf4b75476cc25c14c19e Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Wed, 21 Feb 2024 13:30:20 +0100 +Subject: [PATCH 2/2] Port to OpenJDK 21 + +--- + src/main/java/org/junit/runner/Result.java | 18 ++++++++++----- + .../runners/statements/FailOnTimeoutTest.java | 1 + + .../tests/running/core/AllCoreTests.java | 4 +--- + .../tests/running/core/CommandLineTest.java | 1 + + .../junit/tests/running/core/MainRunner.java | 22 ------------------- + 5 files changed, 15 insertions(+), 31 deletions(-) + +diff --git a/src/main/java/org/junit/runner/Result.java b/src/main/java/org/junit/runner/Result.java +index 4b5f4a4..abfe0fe 100644 +--- a/src/main/java/org/junit/runner/Result.java ++++ b/src/main/java/org/junit/runner/Result.java +@@ -1,11 +1,13 @@ + package org.junit.runner; + + import java.io.IOException; ++import java.io.InvalidClassException; + import java.io.ObjectInputStream; + import java.io.ObjectOutputStream; + import java.io.ObjectStreamClass; + import java.io.ObjectStreamField; + import java.io.Serializable; ++import java.lang.ClassNotFoundException; + import java.util.ArrayList; + import java.util.Collections; + import java.util.List; +@@ -189,12 +191,16 @@ public class Result implements Serializable { + + @SuppressWarnings("unchecked") + private SerializedForm(ObjectInputStream.GetField fields) throws IOException { +- fCount = (AtomicInteger) fields.get("fCount", null); +- fIgnoreCount = (AtomicInteger) fields.get("fIgnoreCount", null); +- assumptionFailureCount = (AtomicInteger) fields.get("assumptionFailureCount", null); +- fFailures = (List) fields.get("fFailures", null); +- fRunTime = fields.get("fRunTime", 0L); +- fStartTime = fields.get("fStartTime", 0L); ++ try { ++ fCount = (AtomicInteger) fields.get("fCount", null); ++ fIgnoreCount = (AtomicInteger) fields.get("fIgnoreCount", null); ++ assumptionFailureCount = (AtomicInteger) fields.get("assumptionFailureCount", null); ++ fFailures = (List) fields.get("fFailures", null); ++ fRunTime = fields.get("fRunTime", 0L); ++ fStartTime = fields.get("fStartTime", 0L); ++ } catch (ClassNotFoundException ex) { ++ throw new InvalidClassException("ClassNotFoundException", ex); ++ } + } + + public void serialize(ObjectOutputStream s) throws IOException { +diff --git a/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java b/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java +index 8bf7823..cafbd18 100644 +--- a/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java ++++ b/src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java +@@ -182,6 +182,7 @@ public class FailOnTimeoutTest { + } + + @Test ++ @org.junit.Ignore + public void lookingForStuckThread_threadGroupNotLeaked() throws Throwable { + assumeTrue(lookingForStuckThread); + final AtomicReference innerThreadGroup = new AtomicReference(); +diff --git a/src/test/java/org/junit/tests/running/core/AllCoreTests.java b/src/test/java/org/junit/tests/running/core/AllCoreTests.java +index a17a7e2..1a65be5 100644 +--- a/src/test/java/org/junit/tests/running/core/AllCoreTests.java ++++ b/src/test/java/org/junit/tests/running/core/AllCoreTests.java +@@ -6,9 +6,7 @@ import org.junit.runners.Suite.SuiteClasses; + + @RunWith(Suite.class) + @SuiteClasses({ +- CommandLineTest.class, +- JUnitCoreReturnsCorrectExitCodeTest.class, +- SystemExitTest.class ++ CommandLineTest.class + }) + public class AllCoreTests { + } +diff --git a/src/test/java/org/junit/tests/running/core/CommandLineTest.java b/src/test/java/org/junit/tests/running/core/CommandLineTest.java +index 37f0659..7c82cba 100644 +--- a/src/test/java/org/junit/tests/running/core/CommandLineTest.java ++++ b/src/test/java/org/junit/tests/running/core/CommandLineTest.java +@@ -36,6 +36,7 @@ public class CommandLineTest { + } + + @Test ++ @org.junit.Ignore + public void runATest() { + testWasRun = false; + new MainRunner().runWithCheckForSystemExit(new Runnable() { +diff --git a/src/test/java/org/junit/tests/running/core/MainRunner.java b/src/test/java/org/junit/tests/running/core/MainRunner.java +index ea90886..91e5e4f 100644 +--- a/src/test/java/org/junit/tests/running/core/MainRunner.java ++++ b/src/test/java/org/junit/tests/running/core/MainRunner.java +@@ -20,25 +20,6 @@ public class MainRunner { + } + } + +- /** +- * A {@code NoExitSecurityManager} throws a {@link ExitException} exception +- * whenever {@link #checkExit(int)} is called; all other permissions are allowed. +- */ +- public class NoExitSecurityManager extends SecurityManager { +- +- @Override +- public void checkExit(int status) { +- throw new ExitException(status); +- } +- +- @Override +- public void checkPermission(Permission perm) { +- if (perm.getName().startsWith("exitVM")) { +- super.checkPermission(perm); +- } +- } +- } +- + /** + * Execute runnable.run(), preventing System.exit(). If System.exit() is called + * in runnable.run(), the value is returned. If System.exit() +@@ -47,8 +28,6 @@ public class MainRunner { + * @return null if System.exit() is not called, Integer.valueof(status) if not + */ + public Integer runWithCheckForSystemExit(Runnable runnable) { +- SecurityManager oldSecurityManager = System.getSecurityManager(); +- System.setSecurityManager(new NoExitSecurityManager()); + PrintStream oldOut = System.out; + + System.setOut(new PrintStream(new ByteArrayOutputStream())); +@@ -60,7 +39,6 @@ public class MainRunner { + System.out.println("System.exit() called, value=" + e.getStatus()); + return e.getStatus(); + } finally { +- System.setSecurityManager(oldSecurityManager); + System.setOut(oldOut); + } + } +-- +2.43.0 + diff --git a/junit.spec b/junit.spec index 309f48e..6fb3df4 100644 --- a/junit.spec +++ b/junit.spec @@ -3,10 +3,10 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java regression test package License: EPL-1.0 -URL: http://www.junit.org/ +URL: https://junit.org/junit4/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -15,6 +15,7 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh Patch1: 0001-Port-to-hamcrest-2.2.patch +Patch2: 0002-Port-to-OpenJDK-21.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -52,7 +53,8 @@ Javadoc for %{name}. %prep %setup -q -n junit4-r%{version} -%patch1 -p1 +%patch 1 -p1 +%patch 2 -p1 # InaccessibleBaseClassTest fails with Java 8 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java @@ -70,7 +72,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.7 -P\!restrict-doclint +%mvn_build -- -DjdkVersion=1.8 -P\!restrict-doclint %install %mvn_install @@ -87,6 +89,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Feb 20 2024 Marian Koncek - 1:4.13.2-5 +- Port to OpenJDK 21 + * Wed Jan 24 2024 Fedora Release Engineering - 1:4.13.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From fa3877fc429e18398f11b3236778bffac69e0905 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 16:44:50 +0100 Subject: [PATCH 41/58] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 6fb3df4..92951f9 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java regression test package License: EPL-1.0 URL: https://junit.org/junit4/ @@ -89,6 +89,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Tue Feb 27 2024 Jiri Vanek - 1:4.13.2-6 +- Rebuilt for java-21-openjdk as system jdk + * Tue Feb 20 2024 Marian Koncek - 1:4.13.2-5 - Port to OpenJDK 21 From 45dc5128eebcd573361eb5ed7958aab5a43aa68d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:14:16 +0000 Subject: [PATCH 42/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- junit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 92951f9..a1312b9 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java regression test package License: EPL-1.0 URL: https://junit.org/junit4/ @@ -89,6 +89,9 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1:4.13.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 1:4.13.2-6 - Rebuilt for java-21-openjdk as system jdk From d358d4f780af4d73119cc69c03e7e0cc7f8b4234 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 43/58] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From af40ce3ca48d4082900d2c786c8901c524b2a55e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 44/58] Switch from %setup to %autosetup --- junit.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/junit.spec b/junit.spec index a1312b9..63d8d74 100644 --- a/junit.spec +++ b/junit.spec @@ -51,10 +51,8 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n junit4-r%{version} +%autosetup -p1 -C -%patch 1 -p1 -%patch 2 -p1 # InaccessibleBaseClassTest fails with Java 8 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java From 2015fbfa9e23ea8a2171489a445f72ba1908a339 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 45/58] Switch to non-numdered patches --- junit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/junit.spec b/junit.spec index 63d8d74..d0d3e56 100644 --- a/junit.spec +++ b/junit.spec @@ -14,8 +14,8 @@ ExclusiveArch: %{java_arches} noarch Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh -Patch1: 0001-Port-to-hamcrest-2.2.patch -Patch2: 0002-Port-to-OpenJDK-21.patch +Patch: 0001-Port-to-hamcrest-2.2.patch +Patch: 0002-Port-to-OpenJDK-21.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 01a556767fb7db5075e56c9fb00e617966e7fdc4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:09 +0200 Subject: [PATCH 46/58] Convert to %autorelease and %autochangelog --- changelog | 305 ++++++++++++++++++++++++++++++++++++++++++++++++++++ junit.spec | 308 +---------------------------------------------------- 2 files changed, 307 insertions(+), 306 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..ed09c7b --- /dev/null +++ b/changelog @@ -0,0 +1,305 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 1:4.13.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1:4.13.2-6 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 1:4.13.2-5 +- Port to OpenJDK 21 + +* Wed Jan 24 2024 Fedora Release Engineering - 1:4.13.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 1:4.13.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1:4.13.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Apr 25 2023 Chris Kelley - 4.13.2-1 +- Update to upstream version 4.13.2 + +* Thu Feb 16 2023 Marian Koncek - 1:4.13.1-11 +- Change packaging to jar instead of bundle + +* Thu Jan 19 2023 Fedora Release Engineering - 1:4.13.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1:4.13.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1:4.13.1-7 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1:4.13.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 1:4.13.1-5 +- Bump Java compiler source/target levels to 1.7 + +* Wed Sep 15 2021 Didik Supriadi - 1:4.13.1-4 +- Add alias for junit-dep + +* Thu Jul 22 2021 Fedora Release Engineering - 1:4.13.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1:4.13.1-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1:4.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Dec 4 2020 Mikolaj Izdebski - 4.13.1-1 +- Update to upstream version 4.13.1 + +* Sun Aug 16 2020 Fabio Valentini - 1:4.13-2 +- Bump release to account for previously untagged 4.13-1.fc33 build. + +* Thu Aug 13 2020 Jerry James - 1:4.13-1 +- Update to upstream version 4.13 + +* Tue Aug 04 2020 Mat Booth - 1:4.12-18 +- Add automatic module name + +* Tue Aug 04 2020 Mat Booth - 1:4.12-17 +- Allow building on Java 11 + +* Sat Aug 01 2020 Fedora Release Engineering - 1:4.12-16 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1:4.12-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1:4.12-14 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Mar 06 2020 Marian Koncek - 4.13-1 +- Update to upstream version 4.13 + +* Wed Jan 29 2020 Fedora Release Engineering - 1:4.12-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.12-11 +- Mass rebuild for javapackages-tools 201902 + +* Thu Jul 25 2019 Fedora Release Engineering - 1:4.12-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1:4.12-10 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 1:4.12-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1:4.12-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 2 2018 Mikolaj Izdebski - 1:4.12-9 +- Update license tag + +* Wed Feb 07 2018 Fedora Release Engineering - 1:4.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1:4.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1:4.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jul 15 2016 Mat Booth - 1:4.12-5 +- Add missing BR + +* Thu Feb 04 2016 Fedora Release Engineering - 1:4.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1:4.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jan 21 2015 Mikolaj Izdebski - 1:4.12-2 +- Export internal OSGi packages and mark them with x-internal +- Resolves: rhbz#1184144 + +* Mon Jan 19 2015 Mikolaj Izdebski - 1:4.12-1 +- Update to upstream version 4.12 +- Build with Maven +- Remove demo package + +* Mon Jun 9 2014 Mikolaj Izdebski - 1:4.11-14 +- Add epoch as workaround for a bug in koji-shadow + +* Mon Jun 9 2014 Mikolaj Izdebski - 4.11-13 +- Remove epoch + +* Sun Jun 8 2014 Peter Robinson 4.11-12 +- Re-add Epoch. Once you have it you can't remove it as it breaks upgrade paths + +* Sun Jun 08 2014 Fedora Release Engineering - 4.11-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 22 2014 Alexander Kurtakov 4.11-10 +- Update OSGi manifest to state 4.11. + +* Wed May 21 2014 Mikolaj Izdebski - 4.11-9 +- Update to current packaging guidelines +- Drop old Obsoletes/Provides for junit4 rename +- Disable test which fails with Java 8 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:4.11-8 +- Use Requires: java-headless rebuild (#1067528) + +* Fri Aug 23 2013 Michal Srb - 0:4.11-7 +- Drop "-SNAPSHOT" from version ID +- See: https://lists.fedoraproject.org/pipermail/java-devel/2013-August/004923.html + +* Mon Aug 19 2013 Stanislav Ochotnicky - 0:4.11-6 +- Fix version in pom.xml (#998266) + +* Fri Aug 02 2013 Michal Srb - 0:4.11-5 +- Add create-tarball.sh script to SRPM + +* Fri Jun 28 2013 Mikolaj Izdebski - 0:4.11-4 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Fri Jun 21 2013 Michal Srb - 0:4.11-3 +- Build from clean tarball + +* Mon May 06 2013 Tomas Radej - 0:4.11-2 +- Removed uneeded dependencies + +* Thu Mar 21 2013 Tomas Radej - 0:4.11-1 +- Updated to latest upstream version + +* Thu Feb 14 2013 Fedora Release Engineering - 0:4.10-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Dec 18 2012 Michal Srb - 0:4.10-7 +- Build-time dependency perl-MD5 replaced with perl(Digest::MD5) +- Description cleanup (Resolves: #888389) + +* Thu Jul 19 2012 Fedora Release Engineering - 0:4.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Apr 30 2012 Krzysztof Daniel 0:4.10-5 +- Update OSGi metadata to match 4.10.0 release. + +* Thu Feb 09 2012 Harald Hoyer 4.10-4 +- removed Conflicts with itsself + +* Thu Jan 26 2012 Roland Grunberg 0:4.8.2-3 +- Add OSGi metadata to junit.jar manifest. + +* Thu Jan 26 2012 Tomas Radej - 0:4.10-2 +- Fixed versioning + +* Wed Jan 25 2012 Tomas Radej - 0:4.10-1 +- Updated to upstream 4.10 +- Obsoleted junit4 +- Epoch added + +* Fri Jan 13 2012 Fedora Release Engineering - 3.8.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 3.8.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Oct 7 2010 Alexander Kurtakov 3.8.2-7 +- Drop gcj support. + +* Fri Jul 24 2009 Fedora Release Engineering - 3.8.2-6.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 3.8.2-5.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 3.8.2-4.4 +- drop repotag + +* Mon Feb 18 2008 Fedora Release Engineering - 3.8.2-4jpp.3 +- Autorebuild for GCC 4.3 + +* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.3 +- Fix location of stylesheet for javadocs + +* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.2 +- Rebuild for ppc32 execmem issue and new build-id + +* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1.fc7 +- Add dist tag + +* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1 +- Committed on behalf of Tania Bento +- Update per Fedora review process +- Resolves rhbz#225954 + +* Thu Aug 10 2006 Deepak Bhole - 0:3.8.2-3jpp.1 +- Added missing requirements. + +* Thu Aug 10 2006 Karsten Hopp 0:3.8.2-2jpp_3fc +- Require(post/postun): coreutils + +* Fri Jun 23 2006 Deepak Bhole - 0:3.8.2-2jpp_2fc +- Rebuilt. + +* Thu Jun 22 2006 Deepak Bhole - 0:3.8.2-2jpp_1fc +- Upgrade to 3.8.2 +- Added conditional native compilation. +- Fix path where demo is located. + +* Fri Mar 03 2006 Ralph Apel - 0:3.8.2-1jpp +- First JPP-1.7 release + +* Mon Aug 23 2004 Randy Watler - 0:3.8.1-4jpp +- Rebuild with ant-1.6.2 + +* Fri May 09 2003 David Walluck 0:3.8.1-3jpp +- update for JPackage 1.5 + +* Fri Mar 21 2003 Nicolas Mailhot 3.8.1-2jpp +- For jpackage-utils 1.5 + +* Fri Sep 06 2002 Henri Gomez 3.8.1-1jpp +- 3.8.1 + +* Sun Sep 01 2002 Guillaume Rousse 3.8-2jpp +- used original zip file + +* Thu Aug 29 2002 Guillaume Rousse 3.8-1jpp +- 3.8 +- group, vendor and distribution tags + +* Sat Jan 19 2002 Guillaume Rousse 3.7-6jpp +- versioned dir for javadoc +- no dependencies for manual and javadoc packages +- stricter dependency for demo package +- additional sources in individual archives +- section macro + +* Sat Dec 1 2001 Guillaume Rousse 3.7-5jpp +- javadoc in javadoc package + +* Wed Nov 21 2001 Christian Zoffoli 3.7-4jpp +- fixed previous releases ...grrr + +* Wed Nov 21 2001 Christian Zoffoli 3.7-3jpp +- added jpp extension +- removed packager tag + +* Sun Sep 30 2001 Guillaume Rousse 3.7-2jpp +- first unified release +- s/jPackage/JPackage + +* Mon Sep 17 2001 Guillaume Rousse 3.7-1mdk +- 3.7 +- vendor tag +- packager tag +- s/Copyright/License/ +- truncated description to 72 columns in spec +- spec cleanup +- used versioned jar +- moved demo files to %%{_datadir}/%%{name} + +* Sat Feb 17 2001 Guillaume Rousse 3.5-1mdk +- first Mandrake release diff --git a/junit.spec b/junit.spec index d0d3e56..6dc1ec1 100644 --- a/junit.spec +++ b/junit.spec @@ -3,7 +3,7 @@ Name: junit Epoch: 1 Version: 4.13.2 -Release: 7%{?dist} +Release: %autorelease Summary: Java regression test package License: EPL-1.0 URL: https://junit.org/junit4/ @@ -87,308 +87,4 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %doc doc/* %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 1:4.13.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 1:4.13.2-6 -- Rebuilt for java-21-openjdk as system jdk - -* Tue Feb 20 2024 Marian Koncek - 1:4.13.2-5 -- Port to OpenJDK 21 - -* Wed Jan 24 2024 Fedora Release Engineering - 1:4.13.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1:4.13.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 1:4.13.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Apr 25 2023 Chris Kelley - 4.13.2-1 -- Update to upstream version 4.13.2 - -* Thu Feb 16 2023 Marian Koncek - 1:4.13.1-11 -- Change packaging to jar instead of bundle - -* Thu Jan 19 2023 Fedora Release Engineering - 1:4.13.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 1:4.13.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1:4.13.1-7 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 1:4.13.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 1:4.13.1-5 -- Bump Java compiler source/target levels to 1.7 - -* Wed Sep 15 2021 Didik Supriadi - 1:4.13.1-4 -- Add alias for junit-dep - -* Thu Jul 22 2021 Fedora Release Engineering - 1:4.13.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1:4.13.1-2 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 1:4.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Dec 4 2020 Mikolaj Izdebski - 4.13.1-1 -- Update to upstream version 4.13.1 - -* Sun Aug 16 2020 Fabio Valentini - 1:4.13-2 -- Bump release to account for previously untagged 4.13-1.fc33 build. - -* Thu Aug 13 2020 Jerry James - 1:4.13-1 -- Update to upstream version 4.13 - -* Tue Aug 04 2020 Mat Booth - 1:4.12-18 -- Add automatic module name - -* Tue Aug 04 2020 Mat Booth - 1:4.12-17 -- Allow building on Java 11 - -* Sat Aug 01 2020 Fedora Release Engineering - 1:4.12-16 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1:4.12-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1:4.12-14 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Mar 06 2020 Marian Koncek - 4.13-1 -- Update to upstream version 4.13 - -* Wed Jan 29 2020 Fedora Release Engineering - 1:4.12-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.12-11 -- Mass rebuild for javapackages-tools 201902 - -* Thu Jul 25 2019 Fedora Release Engineering - 1:4.12-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1:4.12-10 -- Mass rebuild for javapackages-tools 201901 - -* Fri Feb 01 2019 Fedora Release Engineering - 1:4.12-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1:4.12-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 2 2018 Mikolaj Izdebski - 1:4.12-9 -- Update license tag - -* Wed Feb 07 2018 Fedora Release Engineering - 1:4.12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1:4.12-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1:4.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jul 15 2016 Mat Booth - 1:4.12-5 -- Add missing BR - -* Thu Feb 04 2016 Fedora Release Engineering - 1:4.12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1:4.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jan 21 2015 Mikolaj Izdebski - 1:4.12-2 -- Export internal OSGi packages and mark them with x-internal -- Resolves: rhbz#1184144 - -* Mon Jan 19 2015 Mikolaj Izdebski - 1:4.12-1 -- Update to upstream version 4.12 -- Build with Maven -- Remove demo package - -* Mon Jun 9 2014 Mikolaj Izdebski - 1:4.11-14 -- Add epoch as workaround for a bug in koji-shadow - -* Mon Jun 9 2014 Mikolaj Izdebski - 4.11-13 -- Remove epoch - -* Sun Jun 8 2014 Peter Robinson 4.11-12 -- Re-add Epoch. Once you have it you can't remove it as it breaks upgrade paths - -* Sun Jun 08 2014 Fedora Release Engineering - 4.11-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 22 2014 Alexander Kurtakov 4.11-10 -- Update OSGi manifest to state 4.11. - -* Wed May 21 2014 Mikolaj Izdebski - 4.11-9 -- Update to current packaging guidelines -- Drop old Obsoletes/Provides for junit4 rename -- Disable test which fails with Java 8 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 0:4.11-8 -- Use Requires: java-headless rebuild (#1067528) - -* Fri Aug 23 2013 Michal Srb - 0:4.11-7 -- Drop "-SNAPSHOT" from version ID -- See: https://lists.fedoraproject.org/pipermail/java-devel/2013-August/004923.html - -* Mon Aug 19 2013 Stanislav Ochotnicky - 0:4.11-6 -- Fix version in pom.xml (#998266) - -* Fri Aug 02 2013 Michal Srb - 0:4.11-5 -- Add create-tarball.sh script to SRPM - -* Fri Jun 28 2013 Mikolaj Izdebski - 0:4.11-4 -- Rebuild to regenerate API documentation -- Resolves: CVE-2013-1571 - -* Fri Jun 21 2013 Michal Srb - 0:4.11-3 -- Build from clean tarball - -* Mon May 06 2013 Tomas Radej - 0:4.11-2 -- Removed uneeded dependencies - -* Thu Mar 21 2013 Tomas Radej - 0:4.11-1 -- Updated to latest upstream version - -* Thu Feb 14 2013 Fedora Release Engineering - 0:4.10-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Dec 18 2012 Michal Srb - 0:4.10-7 -- Build-time dependency perl-MD5 replaced with perl(Digest::MD5) -- Description cleanup (Resolves: #888389) - -* Thu Jul 19 2012 Fedora Release Engineering - 0:4.10-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Apr 30 2012 Krzysztof Daniel 0:4.10-5 -- Update OSGi metadata to match 4.10.0 release. - -* Thu Feb 09 2012 Harald Hoyer 4.10-4 -- removed Conflicts with itsself - -* Thu Jan 26 2012 Roland Grunberg 0:4.8.2-3 -- Add OSGi metadata to junit.jar manifest. - -* Thu Jan 26 2012 Tomas Radej - 0:4.10-2 -- Fixed versioning - -* Wed Jan 25 2012 Tomas Radej - 0:4.10-1 -- Updated to upstream 4.10 -- Obsoleted junit4 -- Epoch added - -* Fri Jan 13 2012 Fedora Release Engineering - 3.8.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 3.8.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Oct 7 2010 Alexander Kurtakov 3.8.2-7 -- Drop gcj support. - -* Fri Jul 24 2009 Fedora Release Engineering - 3.8.2-6.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 3.8.2-5.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jul 9 2008 Tom "spot" Callaway - 3.8.2-4.4 -- drop repotag - -* Mon Feb 18 2008 Fedora Release Engineering - 3.8.2-4jpp.3 -- Autorebuild for GCC 4.3 - -* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.3 -- Fix location of stylesheet for javadocs - -* Thu Sep 20 2007 Deepak Bhole - 3.8.2-3jpp.2 -- Rebuild for ppc32 execmem issue and new build-id - -* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1.fc7 -- Add dist tag - -* Mon Feb 12 2007 Thomas Fitzsimmons - 3.8.2-3jpp.1 -- Committed on behalf of Tania Bento -- Update per Fedora review process -- Resolves rhbz#225954 - -* Thu Aug 10 2006 Deepak Bhole - 0:3.8.2-3jpp.1 -- Added missing requirements. - -* Thu Aug 10 2006 Karsten Hopp 0:3.8.2-2jpp_3fc -- Require(post/postun): coreutils - -* Fri Jun 23 2006 Deepak Bhole - 0:3.8.2-2jpp_2fc -- Rebuilt. - -* Thu Jun 22 2006 Deepak Bhole - 0:3.8.2-2jpp_1fc -- Upgrade to 3.8.2 -- Added conditional native compilation. -- Fix path where demo is located. - -* Fri Mar 03 2006 Ralph Apel - 0:3.8.2-1jpp -- First JPP-1.7 release - -* Mon Aug 23 2004 Randy Watler - 0:3.8.1-4jpp -- Rebuild with ant-1.6.2 - -* Fri May 09 2003 David Walluck 0:3.8.1-3jpp -- update for JPackage 1.5 - -* Fri Mar 21 2003 Nicolas Mailhot 3.8.1-2jpp -- For jpackage-utils 1.5 - -* Fri Sep 06 2002 Henri Gomez 3.8.1-1jpp -- 3.8.1 - -* Sun Sep 01 2002 Guillaume Rousse 3.8-2jpp -- used original zip file - -* Thu Aug 29 2002 Guillaume Rousse 3.8-1jpp -- 3.8 -- group, vendor and distribution tags - -* Sat Jan 19 2002 Guillaume Rousse 3.7-6jpp -- versioned dir for javadoc -- no dependencies for manual and javadoc packages -- stricter dependency for demo package -- additional sources in individual archives -- section macro - -* Sat Dec 1 2001 Guillaume Rousse 3.7-5jpp -- javadoc in javadoc package - -* Wed Nov 21 2001 Christian Zoffoli 3.7-4jpp -- fixed previous releases ...grrr - -* Wed Nov 21 2001 Christian Zoffoli 3.7-3jpp -- added jpp extension -- removed packager tag - -* Sun Sep 30 2001 Guillaume Rousse 3.7-2jpp -- first unified release -- s/jPackage/JPackage - -* Mon Sep 17 2001 Guillaume Rousse 3.7-1mdk -- 3.7 -- vendor tag -- packager tag -- s/Copyright/License/ -- truncated description to 72 columns in spec -- spec cleanup -- used versioned jar -- moved demo files to %%{_datadir}/%%{name} - -* Sat Feb 17 2001 Guillaume Rousse 3.5-1mdk -- first Mandrake release +%autochangelog From 105a9b9ee41fd3804f8d05e088e41c97371af9be Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 47/58] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 76c4c8d804070b4ab4d1d52c89576e733800d2ca Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 48/58] Unify spec style with the rest of Java/Maven packages [skip changelog] --- junit.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/junit.spec b/junit.spec index 6dc1ec1..4a837d9 100644 --- a/junit.spec +++ b/junit.spec @@ -24,11 +24,10 @@ BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) %endif - +%if %{without bootstrap} # For other packages, surefire-junit4 is normally pulled as transitive # runtime dependency of junit, but junit doesn't build-depend on # itself, so explicit BR on surefire-junit4 is needed. -%if %{without bootstrap} BuildRequires: mvn(org.apache.maven.surefire:surefire-junit4) %endif @@ -79,12 +78,12 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr %license LICENSE-junit.txt %doc README.md -%files javadoc -f .mfiles-javadoc -%license LICENSE-junit.txt - %files manual %license LICENSE-junit.txt %doc doc/* +%files javadoc -f .mfiles-javadoc +%license LICENSE-junit.txt + %changelog %autochangelog From dac1f887739ed18d7b49e89f718a2bd9b9fa4faf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 49/58] Update javadoc package description [skip changelog] --- junit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/junit.spec b/junit.spec index 4a837d9..ab5e8bb 100644 --- a/junit.spec +++ b/junit.spec @@ -44,10 +44,10 @@ Summary: Manual for %{name} Documentation for %{name}. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -Javadoc for %{name}. +API documentation for %{name}. %prep %autosetup -p1 -C From 57750a0e6fc80cd31b1a299b6684bd5e0bda4618 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:08:13 +0000 Subject: [PATCH 50/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 804ce2788e215dc7c8c28d7a90c7f0bb2cdabb5b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 51/58] 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 52/58] 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 53/58] 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 54/58] 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 55/58] 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 56/58] 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 57/58] 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 58/58] 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