From 8befe76d67ecd128a5364d14471c34c1977a3e9b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 3 Nov 2021 09:30:54 +0100 Subject: [PATCH 01/41] Workaround build issue with OpenJDK 17 --- mockito.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/mockito.spec b/mockito.spec index b717abd..7701927 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 3.7.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -54,9 +54,21 @@ This package contains the API documentation for %{name}. # TODO check status: https://github.com/mockito/mockito/issues/2162 sed -i '/add_listeners_concurrently_sanity_check/i @org.junit.Ignore' src/test/java/org/mockitousage/debugging/StubbingLookupListenerCallbackTest.java +# When ran under OpenJDK 17 test fails with "Access to private +# java.lang.String java.io.ObjectStreamClass.name was denied" error +rm src/test/java/org/mockitousage/serialization/AcrossClassLoaderSerializationTest.java + +# These tests fail for unknown reason under OpenJDK 17 +rm src/test/java/org/mockitousage/stubbing/CloningParameterTest.java + # Use our custom build script sed -e 's/@VERSION@/%{version}/' %{SOURCE2} > pom.xml +# Workaround easymock incompatibility with Java 17 that should be fixed +# in easymock 4.4: https://github.com/easymock/easymock/issues/274 +%pom_add_plugin :maven-surefire-plugin . " + --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED" + # OGGi metadata configuration cat > osgi.bnd < - 3.7.13-4 +- Workaround build issue with OpenJDK 17 + * Thu Jul 22 2021 Fedora Release Engineering - 3.7.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From acc6bab7e8240956a53acbfa886cb22fa17c991b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:11:33 +0000 Subject: [PATCH 02/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 7701927..59e36b3 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 3.7.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -103,6 +103,9 @@ mv target/classes/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispa %license LICENSE %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 3.7.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Nov 03 2021 Mikolaj Izdebski - 3.7.13-4 - Workaround build issue with OpenJDK 17 From 2750dc3c5912236f2261f838e5386bf26d3a9620 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 23 Jan 2022 16:30:03 -0700 Subject: [PATCH 03/41] Version 3.12.4 - Add inline and junit-jupiter subpackages - Drop OpenJDK 17 workarounds --- .gitignore | 1 + mockito-core.pom | 10 ++-- mockito-inline-3.12.4.pom | 71 ++++++++++++++++++++++++++++ mockito-junit-jupiter-3.12.4.pom | 77 ++++++++++++++++++++++++++++++ mockito.spec | 81 ++++++++++++++++++++++++++------ sources | 2 +- use-unbundled-asm.patch | 37 +++++++++++---- 7 files changed, 250 insertions(+), 29 deletions(-) create mode 100644 mockito-inline-3.12.4.pom create mode 100644 mockito-junit-jupiter-3.12.4.pom diff --git a/.gitignore b/.gitignore index 6783466..5e65016 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /*.src.rpm /mockito-3.5.13.tar.gz /mockito-3.7.13.tar.gz +/mockito-3.12.4.tar.gz diff --git a/mockito-core.pom b/mockito-core.pom index e305fc9..c29986a 100644 --- a/mockito-core.pom +++ b/mockito-core.pom @@ -20,19 +20,19 @@ net.bytebuddy byte-buddy - 1.9.3 + 1.11.13 compile net.bytebuddy byte-buddy-agent - 1.9.3 + 1.11.13 compile org.objenesis objenesis - 3.1 + 3.2 compile @@ -50,13 +50,13 @@ junit junit - 4.12 + 4.13.2 provided org.assertj assertj-core - 3.13.2 + 3.20.2 test diff --git a/mockito-inline-3.12.4.pom b/mockito-inline-3.12.4.pom new file mode 100644 index 0000000..d201ef9 --- /dev/null +++ b/mockito-inline-3.12.4.pom @@ -0,0 +1,71 @@ + + + 4.0.0 + org.mockito + mockito-inline + 3.12.4 + mockito-inline + Mockito preconfigured inline mock maker (intermediate and to be superseeded by automatic usage in a future version) + https://github.com/mockito/mockito + + + The MIT License + https://github.com/mockito/mockito/blob/main/LICENSE + repo + + + + + mockitoguy + Szczepan Faber + https://github.com/mockitoguy + + Core developer + + + + bric3 + Brice Dutheil + https://github.com/bric3 + + Core developer + + + + raphw + Rafael Winterhalter + https://github.com/raphw + + Core developer + + + + TimvdLippe + Tim van der Lippe + https://github.com/TimvdLippe + + Core developer + + + + + https://github.com/mockito/mockito.git + + + GitHub issues + https://github.com/mockito/mockito/issues + + + GH Actions + https://github.com/mockito/mockito/actions + + + + org.mockito + mockito-core + 3.12.4 + compile + + + diff --git a/mockito-junit-jupiter-3.12.4.pom b/mockito-junit-jupiter-3.12.4.pom new file mode 100644 index 0000000..37a0867 --- /dev/null +++ b/mockito-junit-jupiter-3.12.4.pom @@ -0,0 +1,77 @@ + + + 4.0.0 + org.mockito + mockito-junit-jupiter + 3.12.4 + mockito-junit-jupiter + Mockito JUnit 5 support + https://github.com/mockito/mockito + + + The MIT License + https://github.com/mockito/mockito/blob/main/LICENSE + repo + + + + + mockitoguy + Szczepan Faber + https://github.com/mockitoguy + + Core developer + + + + bric3 + Brice Dutheil + https://github.com/bric3 + + Core developer + + + + raphw + Rafael Winterhalter + https://github.com/raphw + + Core developer + + + + TimvdLippe + Tim van der Lippe + https://github.com/TimvdLippe + + Core developer + + + + + https://github.com/mockito/mockito.git + + + GitHub issues + https://github.com/mockito/mockito/issues + + + GH Actions + https://github.com/mockito/mockito/actions + + + + org.mockito + mockito-core + 3.12.4 + compile + + + org.junit.jupiter + junit-jupiter-api + 5.7.2 + runtime + + + diff --git a/mockito.spec b/mockito.spec index 59e36b3..ce1eb38 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: mockito -Version: 3.7.13 -Release: 5%{?dist} +Version: 3.12.4 +Release: 1%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -15,6 +15,10 @@ Source1: generate-tarball.sh # A custom build script to allow building with maven instead of gradle Source2: mockito-core.pom +# Maven central POMs for subprojects +Source3: https://repo1.maven.org/maven2/org/mockito/mockito-inline/%{version}/mockito-inline-%{version}.pom +Source4: https://repo1.maven.org/maven2/org/mockito/mockito-junit-jupiter/%{version}/mockito-junit-jupiter-%{version}.pom + # Mockito expects byte-buddy to have a shaded/bundled version of ASM, but # we don't bundle in Fedora, so this patch makes mockito use ASM explicitly Patch0: use-unbundled-asm.patch @@ -23,12 +27,15 @@ BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bnd) BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.bytebuddy:byte-buddy) BuildRequires: mvn(net.bytebuddy:byte-buddy-agent) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apiguardian:apiguardian-api) BuildRequires: mvn(org.assertj:assertj-core) BuildRequires: mvn(org.hamcrest:hamcrest) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.opentest4j:opentest4j) BuildRequires: mvn(org.ow2.asm:asm) @@ -46,21 +53,28 @@ Summary: Javadocs for %{name} %description javadoc This package contains the API documentation for %{name}. +%package inline +Summary: Mockito preconfigured inline mock maker +Requires: %{name} = %{version}-%{release} + +%description inline +Mockito preconfigured inline mock maker (intermediate and to be +superseded by automatic usage in a future version). + +%package junit-jupiter +Summary: Mockito JUnit 5 support +Requires: %{name} = %{version}-%{release} + +%description junit-jupiter +Mockito JUnit 5 support. + %prep -%setup -q -%patch0 -p1 +%autosetup -p1 # Disable failing test # TODO check status: https://github.com/mockito/mockito/issues/2162 sed -i '/add_listeners_concurrently_sanity_check/i @org.junit.Ignore' src/test/java/org/mockitousage/debugging/StubbingLookupListenerCallbackTest.java -# When ran under OpenJDK 17 test fails with "Access to private -# java.lang.String java.io.ObjectStreamClass.name was denied" error -rm src/test/java/org/mockitousage/serialization/AcrossClassLoaderSerializationTest.java - -# These tests fail for unknown reason under OpenJDK 17 -rm src/test/java/org/mockitousage/stubbing/CloningParameterTest.java - # Use our custom build script sed -e 's/@VERSION@/%{version}/' %{SOURCE2} > pom.xml @@ -69,7 +83,7 @@ sed -e 's/@VERSION@/%{version}/' %{SOURCE2} > pom.xml %pom_add_plugin :maven-surefire-plugin . " --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED" -# OGGi metadata configuration +# OSGi metadata configuration cat > osgi.bnd < osgi-junit-jupiter.bnd < - 3.12.4-1 +- Version 3.12.4 +- Add inline and junit-jupiter subpackages +- Drop OpenJDK 17 workarounds + * Thu Jan 20 2022 Fedora Release Engineering - 3.7.13-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 3e924cd..25b135c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mockito-3.7.13.tar.gz) = 96092dd0e2b872229a5f5a77b7d505d5f0a3a93beb7f67c9251ad1446d17c2984474cb75dc4191e2d64ab5070ac251e015615f4b88ba2b0c9fbb1a0d9a84500c +SHA512 (mockito-3.12.4.tar.gz) = 09d76f8e7ac0ca63ddcde6d38204e12059d0478483b195a34edee213eaf04fc4c5ce61031851ee5b7ca6960a7804b638b18429ddf1c94ef4927d445f261f94ee diff --git a/use-unbundled-asm.patch b/use-unbundled-asm.patch index 9edcf60..8ef5534 100644 --- a/use-unbundled-asm.patch +++ b/use-unbundled-asm.patch @@ -1,8 +1,8 @@ diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java -index 187f1ea..f8fa355 100644 +index 10b73c81a..5e2d8d2dc 100644 --- a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java +++ b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java -@@ -30,8 +30,8 @@ import net.bytebuddy.dynamic.ClassFileLocator; +@@ -18,8 +18,8 @@ import net.bytebuddy.dynamic.ClassFileLocator; import net.bytebuddy.dynamic.scaffold.MethodGraph; import net.bytebuddy.dynamic.scaffold.TypeValidation; import net.bytebuddy.implementation.Implementation; @@ -13,19 +13,38 @@ index 187f1ea..f8fa355 100644 import net.bytebuddy.matcher.ElementMatchers; import net.bytebuddy.pool.TypePool; import net.bytebuddy.utility.OpenedClassReader; +diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java b/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java +index 1490501ea..743a04f36 100644 +--- a/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java ++++ b/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java +@@ -37,10 +37,10 @@ import net.bytebuddy.implementation.bind.annotation.Argument; + import net.bytebuddy.implementation.bind.annotation.This; + import net.bytebuddy.implementation.bytecode.StackSize; + import net.bytebuddy.implementation.bytecode.assign.Assigner; +-import net.bytebuddy.jar.asm.Label; +-import net.bytebuddy.jar.asm.MethodVisitor; +-import net.bytebuddy.jar.asm.Opcodes; +-import net.bytebuddy.jar.asm.Type; ++import org.objectweb.asm.Label; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.Opcodes; ++import org.objectweb.asm.Type; + import net.bytebuddy.pool.TypePool; + import net.bytebuddy.utility.OpenedClassReader; + diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java b/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java -index f5b807a..c9ca662 100644 +index 93c8913ac..972753e78 100644 --- a/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java +++ b/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java -@@ -26,6 +26,7 @@ import org.mockito.plugins.MockMaker; - import org.mockito.stubbing.Answer; +@@ -21,6 +21,7 @@ import org.mockito.mock.SerializableMode; + import org.mockito.plugins.MockMaker; import org.mockitoutil.ClassLoaders; import org.mockitoutil.SimpleSerializationUtil; +import org.objectweb.asm.ClassVisitor; import org.objenesis.ObjenesisStd; - public abstract class AbstractByteBuddyMockMakerTest { -@@ -154,7 +155,7 @@ public abstract class AbstractByteBuddyMockMakerTest { + public abstract class AbstractByteBuddyMockMakerTest +@@ -126,7 +127,7 @@ public abstract class AbstractByteBuddyMockMakerTest // given ClassLoader classpath_with_objenesis = ClassLoaders.excludingClassLoader() @@ -35,7 +54,7 @@ index f5b807a..c9ca662 100644 .build(); diff --git a/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java b/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java -index f971893..63af9cd 100644 +index f971893e4..63af9cd52 100644 --- a/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java +++ b/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java @@ -8,6 +8,7 @@ import static org.junit.Assert.assertTrue; @@ -55,7 +74,7 @@ index f971893..63af9cd 100644 // This intended behavior is questionable // However, it was like that since the beginning of JUnit rule support diff --git a/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java b/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java -index 9cd47da..356a3e0 100644 +index 7b156f0aa..d488e9628 100644 --- a/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java +++ b/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java @@ -16,6 +16,7 @@ import org.junit.Test; From 417141168e40e3fb82296b4cf96ce86c9c0e094c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 23 Jan 2022 21:21:41 -0700 Subject: [PATCH 04/41] Update sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 25b135c..238415e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mockito-3.12.4.tar.gz) = 09d76f8e7ac0ca63ddcde6d38204e12059d0478483b195a34edee213eaf04fc4c5ce61031851ee5b7ca6960a7804b638b18429ddf1c94ef4927d445f261f94ee +SHA512 (mockito-3.12.4.tar.gz) = 3c0bc50a533bfd6626b993567fb585666a839ed408d51bfdd0b6d0b62a1fe6ba1678c7d2f2af4df7f3176bd2ff4ca94a166cd0c1b43ea993beefa3e30f1bc792 From d7fe8e444ae7ca4cb77394edea4c78f6b8f30040 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 27 Jan 2022 17:20:41 +0100 Subject: [PATCH 05/41] Fix bootstrap --- mockito.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index ce1eb38..7934f01 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 3.12.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -61,12 +61,14 @@ Requires: %{name} = %{version}-%{release} Mockito preconfigured inline mock maker (intermediate and to be superseded by automatic usage in a future version). +%if %{without bootstrap} %package junit-jupiter Summary: Mockito JUnit 5 support Requires: %{name} = %{version}-%{release} %description junit-jupiter Mockito JUnit 5 support. +%endif %prep %autosetup -p1 @@ -121,6 +123,7 @@ cd - %mvn_artifact %{SOURCE3} target/mockito-inline.jar %mvn_package org.mockito:mockito-inline inline +%if %{without bootstrap} # Build the junit-jupiter subproject cd subprojects/junit-jupiter mkdir -p target/classes/ @@ -135,6 +138,7 @@ bnd wrap --properties osgi-junit-jupiter.bnd --version %{version} \ target/mockito-junit-jupiter.unwrapped.jar %mvn_artifact %{SOURCE4} target/mockito-junit-jupiter.jar %mvn_package org.mockito:mockito-junit-jupiter junit-jupiter +%endif %install %mvn_install @@ -145,12 +149,17 @@ bnd wrap --properties osgi-junit-jupiter.bnd --version %{version} \ %files inline -f .mfiles-inline +%if %{without bootstrap} %files junit-jupiter -f .mfiles-junit-jupiter +%endif %files javadoc -f .mfiles-javadoc %license LICENSE %changelog +* Thu Jan 27 2022 Mikolaj Izdebski - 3.12.4-2 +- Don't build mockito-junit-jupiter in bootstrap mode + * Sat Jan 22 2022 Jerry James - 3.12.4-1 - Version 3.12.4 - Add inline and junit-jupiter subpackages From 2a8999f79015b05f6ffa970c9635e9f226d6704e Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 23:01:55 +0100 Subject: [PATCH 06/41] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 7934f01..1681844 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 3.12.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -157,6 +157,9 @@ bnd wrap --properties osgi-junit-jupiter.bnd --version %{version} \ %license LICENSE %changelog +* Sat Feb 05 2022 Jiri Vanek - 3.12.4-3 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 27 2022 Mikolaj Izdebski - 3.12.4-2 - Don't build mockito-junit-jupiter in bootstrap mode From 004253d47da87e86a8bab68dc80c8c55cc1f47fe Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Sat, 9 Apr 2022 10:15:14 +0000 Subject: [PATCH 07/41] Set javac compiler release to Java 8 --- mockito.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mockito.spec b/mockito.spec index 1681844..96d1854 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 3.12.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -111,7 +111,7 @@ EOF %build # See the usage of exec-maven-plugin in the pom mkdir -p target/classes/ -javac -d target/classes/ src/main/java/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.java +javac --release 8 -d target/classes/ src/main/java/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.java mv target/classes/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.{class,raw} %mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 @@ -128,7 +128,7 @@ cd - cd subprojects/junit-jupiter mkdir -p target/classes/ CLASSPATH=$(build-classpath apiguardian junit5/junit-jupiter-api junit5/junit-platform-commons) -javac -d target/classes/ \ +javac --release 8 -d target/classes/ \ -cp ../../target/mockito-core-%{version}.jar:$CLASSPATH \ src/main/java/org/mockito/junit/jupiter/*.java jar -cf ../../target/mockito-junit-jupiter.unwrapped.jar -C target/classes org @@ -157,6 +157,9 @@ bnd wrap --properties osgi-junit-jupiter.bnd --version %{version} \ %license LICENSE %changelog +* Sat Apr 09 2022 Didik Supriadi - 3.12.4-4 +- Set javac compiler release to Java 8 + * Sat Feb 05 2022 Jiri Vanek - 3.12.4-3 - Rebuilt for java-17-openjdk as system jdk From ee12e26221d07113eba9ab85c1c220415b4402d6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 08/41] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- mockito.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mockito.spec b/mockito.spec index 96d1854..20f1048 100644 --- a/mockito.spec +++ b/mockito.spec @@ -7,6 +7,7 @@ Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz From b3a94f1c8b2ce917b6d992038cb9daac427c3517 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 09/41] Update build-requires in bootstrap mode --- mockito.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 20f1048..edddf78 100644 --- a/mockito.spec +++ b/mockito.spec @@ -24,10 +24,10 @@ Source4: https://repo1.maven.org/maven2/org/mockito/mockito-junit-jupiter # we don't bundle in Fedora, so this patch makes mockito use ASM explicitly Patch0: use-unbundled-asm.patch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bnd) BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.bytebuddy:byte-buddy) From 362dce6e8c908ecfdc4ab0137d7f35821c68709e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 23:30:19 +0000 Subject: [PATCH 10/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index edddf78..dda7ed7 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 3.12.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -158,6 +158,9 @@ bnd wrap --properties osgi-junit-jupiter.bnd --version %{version} \ %license LICENSE %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 3.12.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Apr 09 2022 Didik Supriadi - 3.12.4-4 - Set javac compiler release to Java 8 From 7e1e1ae60eaed4904cf1fd2e96aa286d5cb9226a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 11/41] 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 3d9cb5386f5ba932d9cd3861086dfc1e3183785a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 20:29:15 +0000 Subject: [PATCH 12/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index dda7ed7..7ecf9c5 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 3.12.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -158,6 +158,9 @@ bnd wrap --properties osgi-junit-jupiter.bnd --version %{version} \ %license LICENSE %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.12.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 3.12.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From eb27e1b65340e3b11fb53d0c9fb28fa08b2f340d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 15:32:16 +0000 Subject: [PATCH 13/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 7ecf9c5..784b72c 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 3.12.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -158,6 +158,9 @@ bnd wrap --properties osgi-junit-jupiter.bnd --version %{version} \ %license LICENSE %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 3.12.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 3.12.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 99e6b462179d0e3fafbd17ba042cb3dfce7dd084 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 14:01:04 +0200 Subject: [PATCH 14/41] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 From 2533e53d870e47755d7f7fd6b050a377c014eee4 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 1 Sep 2023 15:09:50 +0200 Subject: [PATCH 15/41] Update to upstream version 5.5.0 --- .gitignore | 3 + aggregator.pom | 16 ++ generate-tarball.sh | 2 + mockito-core.pom | 678 -------------------------------------------- mockito.spec | 90 ++---- sources | 4 +- 6 files changed, 45 insertions(+), 748 deletions(-) create mode 100644 aggregator.pom delete mode 100644 mockito-core.pom diff --git a/.gitignore b/.gitignore index 5e65016..6cb2638 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ /mockito-3.5.13.tar.gz /mockito-3.7.13.tar.gz /mockito-3.12.4.tar.gz +/mockito-5.5.0.tar.gz +/mockito-core-5.5.0.pom +/mockito-junit-jupiter-5.5.0.pom diff --git a/aggregator.pom b/aggregator.pom new file mode 100644 index 0000000..3dd438d --- /dev/null +++ b/aggregator.pom @@ -0,0 +1,16 @@ + + + 4.0.0 + org.fedoraproject.xmvn.mockito + aggregator + any + pom + + UTF-8 + + + . + subprojects/junit-jupiter + + diff --git a/generate-tarball.sh b/generate-tarball.sh index 6b3c542..1819d20 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -13,9 +13,11 @@ pushd tarball-tmp tar -xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL +pushd "mockito-${version}" find -name '*.jar' -delete find -name '*.class' -delete rm -rf gradlew gradlew.bat src/javadoc +popd tar -czf "../${name}-${version}.tar.gz" * popd diff --git a/mockito-core.pom b/mockito-core.pom deleted file mode 100644 index c29986a..0000000 --- a/mockito-core.pom +++ /dev/null @@ -1,678 +0,0 @@ - - - 4.0.0 - org.mockito - mockito-core - @VERSION@ - mockito-core - jar - https://github.com/mockito/mockito - Mockito mock objects library core API and implementation - - - - org.ow2.asm - asm - 7.2 - compile - - - net.bytebuddy - byte-buddy - 1.11.13 - compile - - - net.bytebuddy - byte-buddy-agent - 1.11.13 - compile - - - org.objenesis - objenesis - 3.2 - compile - - - org.opentest4j - opentest4j - 1.2 - compile - - - org.hamcrest - hamcrest - 2.2 - provided - - - junit - junit - 4.13.2 - provided - - - org.assertj - assertj-core - 3.20.2 - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - org.apache.felix - maven-bundle-plugin - 3.5.0 - - ${project.build.directory}/osgi - - <_include>-osgi.bnd - - - - - process-classes - - manifest - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - ${project.build.directory}/osgi/MANIFEST.MF - - - **/MockMethodDispatcher.class - - - - - - - - The MIT License - https://github.com/mockito/mockito/blob/master/LICENSE - repo - - - - https://github.com/mockito/mockito.git - - - https://github.com/mockito/mockito/issues - GitHub issues - - - https://travis-ci.org/mockito/mockito - TravisCI - - - - mockitoguy - Szczepan Faber - - Core developer - - https://github.com/mockitoguy - - - bric3 - Brice Dutheil - - Core developer - - https://github.com/bric3 - - - raphw - Rafael Winterhalter - - Core developer - - https://github.com/raphw - - - TimvdLippe - Tim van der Lippe - - Core developer - - https://github.com/TimvdLippe - - - - - continuous-delivery-drone - https://github.com/continuous-delivery-drone - - - shipkit.org automated bot - https://github.com/shipkit-org - - - Marcin Zajączkowski - https://github.com/szpak - - - Pascal Schumacher - https://github.com/PascalSchumacher - - - Igor Czechowski - https://github.com/iczechowski - - - Bartosz Bańkowski - https://github.com/bbankowski - - - Erhard Pointl - https://github.com/epeee - - - Allon Murienik - https://github.com/mureinik - - - Christian Schwarz - https://github.com/ChristianSchwarz - - - Lukasz Szewc - https://github.com/lukasz-szewc - - - Marcin Grzejszczak - https://github.com/marcingrzejszczak - - - Marc Philipp - https://github.com/marcphilipp - - - Sangwoo Lee - https://github.com/marchpig - - - Philip P. Moltmann - https://github.com/moltmann - - - Tim Perry - https://github.com/pimterry - - - David J. M. Karlsen - https://github.com/davidkarlsen - - - Dawud-xx - https://github.com/Dawud-xx - - - Lovro Pandžić - https://github.com/lpandzic - - - Werner Beroux - https://github.com/wernight - - - Tsuyoshi Murakami - https://github.com/tmurakami - - - Serge Bishyr - https://github.com/SeriyBg - - - Dmitry Timofeev - https://github.com/dmitry-timofeev - - - jerzykrlk - https://github.com/jerzykrlk - - - alberskib - https://github.com/alberskib - - - Joseph Walton - https://github.com/josephw - - - Stephan Schroevers - https://github.com/Stephan202 - - - Michal Kordas - https://github.com/mkordas - - - Kamil Szymański - https://github.com/kamilszymanski - - - Hynek Mlnařík - https://github.com/hmlnarik - - - Hugh Hamill - https://github.com/hughwphamill - - - Hans Joachim Desserud - https://github.com/hansjoachim - - - Gunnar Wagenknecht - https://github.com/guw - - - Dmytro Chyzhykov - https://github.com/ffbit - - - r-smirnov - https://github.com/r-smirnov - - - ianparkinson - https://github.com/ianparkinson - - - dmac100 - https://github.com/dmac100 - - - Vineet Kumar - https://github.com/vin - - - Urs Metz - https://github.com/UrsMetz - - - Tarnowski Jan - https://github.com/tarnowskijan - - - Roman Elizarov - https://github.com/elizarov - - - Roland Hauser - https://github.com/SourcePond - - - Michał Borek - https://github.com/michalborek - - - Michael Pinnegar - https://github.com/Jazzepi - - - Marius Volkhart - https://github.com/MariusVolkhart - - - Lucas Cavalcanti - https://github.com/lucascs - - - Leonardo Carrasco - https://github.com/thesnowgoose - - - Krzysztof Wolny - https://github.com/vanta - - - Jeffrey Falgout - https://github.com/JeffreyFalgout - - - Ismael Juma - https://github.com/ijuma - - - Emory Merryman - https://github.com/AFnRFCb7 - - - Clark Brewer - https://github.com/brewerc - - - Carlos Aguayo - https://github.com/carlosaguayo - - - Arend v. Reinersdorff - https://github.com/arend-von-reinersdorff - - - Alberto Scotto - https://github.com/alb-i986 - - - yyvess - https://github.com/yyvess - - - 訾明华 - https://github.com/ziminghua - - - wuwen - https://github.com/wuwen5 - - - test111 - https://github.com/tradingreason - - - Xin Liu - https://github.com/L-KID - - - Wojtek Wilk - https://github.com/wwilk - - - Walter Scott Johnson - https://github.com/li-wjohnson - - - Walter Johnson - https://github.com/li-wjohnson - - - Vladislav - https://github.com/VChirp - - - Vivian Pennel - https://github.com/Vp3n - - - Venkata Jaswanth - https://github.com/aj-jaswanth - - - Tom Ball - https://github.com/tomball - - - Tokuhiro Matsuno - https://github.com/tokuhirom - - - Tim Cooke - https://github.com/trcooke - - - Stuart Blair - https://github.com/stuartblair - - - Simen Bekkhus - https://github.com/SimenB - - - Scott Markwell - https://github.com/smarkwell - - - Sanne Grinovero - https://github.com/Sanne - - - Roi Atalla - https://github.com/ra4king - - - Robert Stupp - https://github.com/snazy - - - Radim Kubacki - https://github.com/radimk - - - Philipp Jardas - https://github.com/phjardas - - - Oliver Drotbohm - https://github.com/odrotbohm - - - Niklas Baudy - https://github.com/vanniktech - - - Myrle Krantz - https://github.com/myrle-krantz - - - Matt Dean - https://github.com/mattbdean - - - Markus Wüstenberg - https://github.com/markuswustenberg - - - Maciej Kuster - https://github.com/NagRock - - - MEDDAH Julien - https://github.com/MeddahJ - - - Ludovic Meurillon - https://github.com/LudoMeurillon - - - Ludovic Chane - https://github.com/ludochane - - - Krisztian Milesz - https://github.com/mileszk - - - Kengo TODA - https://github.com/KengoTODA - - - Kayvan Najafzadeh - https://github.com/kayvannj - - - José Paumard - https://github.com/JosePaumard - - - Jonathan Lloyd - https://github.com/lloydjm77 - - - Johnny Lim - https://github.com/izeye - - - Jesse Englert - https://github.com/jpenglert - - - Jeremy Rickard - https://github.com/jrrickard - - - Ivan Vershinin - https://github.com/vershinin - - - Igor Kostenko - https://github.com/isanych - - - Igor Conrado Alves de Lima - https://github.com/igorcadelima - - - Gaëtan Muller - https://github.com/MGaetan89 - - - Felix W. Dekker - https://github.com/FWDekker - - - Evgeny Astafyev - https://github.com/astafev - - - Eugene Ivakhno - https://github.com/eugene-ivakhno - - - Erik Bakker - https://github.com/eamelink - - - Dmitriy Zaitsev - https://github.com/DmitriyZaitsev - - - Divyansh Gupta - https://github.com/divyansh-gupta - - - Dennis Cheung - https://github.com/hkdennis2k - - - Denis Zharkov - https://github.com/dzharkov - - - David Xia - https://github.com/davidxia - - - David Gageot - https://github.com/dgageot - - - Christian Persson - https://github.com/Saser - - - Bruno Krebs - https://github.com/brunokrebs - - - Ben Yu - https://github.com/fluentfuture - - - Bastien Jansen - https://github.com/bjansen - - - Bartosz Miller - https://github.com/BartoszMiller - - - Ariel Isaac - https://github.com/Ariel-Isaacm - - - Anuraag Agrawal - https://github.com/anuraaga - - - André Gonçalves - https://github.com/andrerigon - - - Andrey - https://github.com/andreyrmg - - - Andrei Solntsev - https://github.com/asolntsev - - - Allan Wang - https://github.com/AllanWang - - - Alex Simkin - https://github.com/SimY4 - - - rberghegger - https://github.com/rberghegger - - - philipa - https://github.com/philipa - - - paulduffin - https://github.com/paulduffin - - - mgrafl - https://github.com/mgrafl - - - jmetertea - https://github.com/jmetertea - - - geoffschoeman - https://github.com/geoffschoeman - - - bruceeddy - https://github.com/bruceeddy - - - ashleyfrieze - https://github.com/ashleyfrieze - - - Nirvanall - https://github.com/Nirvanall - - - LiamClark - https://github.com/LiamClark - - - diff --git a/mockito.spec b/mockito.spec index 784b72c..c95dd8e 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: mockito -Version: 3.12.4 -Release: 7%{?dist} +Version: 5.5.0 +Release: 1%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -14,10 +14,10 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh # A custom build script to allow building with maven instead of gradle -Source2: mockito-core.pom +Source2: aggregator.pom # Maven central POMs for subprojects -Source3: https://repo1.maven.org/maven2/org/mockito/mockito-inline/%{version}/mockito-inline-%{version}.pom +Source3: https://repo1.maven.org/maven2/org/mockito/mockito-core/%{version}/mockito-core-%{version}.pom Source4: https://repo1.maven.org/maven2/org/mockito/mockito-junit-jupiter/%{version}/mockito-junit-jupiter-%{version}.pom # Mockito expects byte-buddy to have a shaded/bundled version of ASM, but @@ -54,92 +54,45 @@ Summary: Javadocs for %{name} %description javadoc This package contains the API documentation for %{name}. -%package inline -Summary: Mockito preconfigured inline mock maker -Requires: %{name} = %{version}-%{release} - -%description inline -Mockito preconfigured inline mock maker (intermediate and to be -superseded by automatic usage in a future version). - -%if %{without bootstrap} %package junit-jupiter Summary: Mockito JUnit 5 support Requires: %{name} = %{version}-%{release} %description junit-jupiter Mockito JUnit 5 support. -%endif %prep %autosetup -p1 +cp %{SOURCE2} aggregator.pom +cp %{SOURCE3} pom.xml +cp %{SOURCE4} subprojects/junit-jupiter/pom.xml + # Disable failing test # TODO check status: https://github.com/mockito/mockito/issues/2162 sed -i '/add_listeners_concurrently_sanity_check/i @org.junit.Ignore' src/test/java/org/mockitousage/debugging/StubbingLookupListenerCallbackTest.java -# Use our custom build script -sed -e 's/@VERSION@/%{version}/' %{SOURCE2} > pom.xml - # Workaround easymock incompatibility with Java 17 that should be fixed # in easymock 4.4: https://github.com/easymock/easymock/issues/274 %pom_add_plugin :maven-surefire-plugin . " --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED" -# OSGi metadata configuration -cat > osgi.bnd < osgi-junit-jupiter.bnd < - 5.5.0-1 +- Update to upstream version 5.5.0 + * Thu Jul 20 2023 Fedora Release Engineering - 3.12.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 238415e..8ac9fca 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (mockito-3.12.4.tar.gz) = 3c0bc50a533bfd6626b993567fb585666a839ed408d51bfdd0b6d0b62a1fe6ba1678c7d2f2af4df7f3176bd2ff4ca94a166cd0c1b43ea993beefa3e30f1bc792 +SHA512 (mockito-5.5.0.tar.gz) = 4e36c396eb69fa95bb7828b2c2253c8010536f755b4b75e761b30c7f5f437e40c96503e6bb255e221c8fff3aaa795399598d6c413189e3374dec0a9268a88cc8 +SHA512 (mockito-core-5.5.0.pom) = 8f11bf7e61f1ac5d53949c30636abb50d9dd53ef71da585055857fedd592445912e83087674c59388f7e44d38f242708f6e19a988f25c4249b6a62268ac8c967 +SHA512 (mockito-junit-jupiter-5.5.0.pom) = 29a098fdeef8d154f52e547d6cffc5b17879811583a079d9cc359bfc4b651300da5feaa9974d81e613f42650fdfb345b66481ea1afdf9c12eca6c60c22ce5507 From 466aaa2b6a6d3c4942c6cf74073563fea6edfce6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 16/41] 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 eda8ca35305135967605a0d890ad97877732aafd Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 12 Dec 2023 09:46:43 +0100 Subject: [PATCH 17/41] Remove unused pom files --- mockito-inline-3.12.4.pom | 71 ----------------------------- mockito-junit-jupiter-3.12.4.pom | 77 -------------------------------- 2 files changed, 148 deletions(-) delete mode 100644 mockito-inline-3.12.4.pom delete mode 100644 mockito-junit-jupiter-3.12.4.pom diff --git a/mockito-inline-3.12.4.pom b/mockito-inline-3.12.4.pom deleted file mode 100644 index d201ef9..0000000 --- a/mockito-inline-3.12.4.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - 4.0.0 - org.mockito - mockito-inline - 3.12.4 - mockito-inline - Mockito preconfigured inline mock maker (intermediate and to be superseeded by automatic usage in a future version) - https://github.com/mockito/mockito - - - The MIT License - https://github.com/mockito/mockito/blob/main/LICENSE - repo - - - - - mockitoguy - Szczepan Faber - https://github.com/mockitoguy - - Core developer - - - - bric3 - Brice Dutheil - https://github.com/bric3 - - Core developer - - - - raphw - Rafael Winterhalter - https://github.com/raphw - - Core developer - - - - TimvdLippe - Tim van der Lippe - https://github.com/TimvdLippe - - Core developer - - - - - https://github.com/mockito/mockito.git - - - GitHub issues - https://github.com/mockito/mockito/issues - - - GH Actions - https://github.com/mockito/mockito/actions - - - - org.mockito - mockito-core - 3.12.4 - compile - - - diff --git a/mockito-junit-jupiter-3.12.4.pom b/mockito-junit-jupiter-3.12.4.pom deleted file mode 100644 index 37a0867..0000000 --- a/mockito-junit-jupiter-3.12.4.pom +++ /dev/null @@ -1,77 +0,0 @@ - - - 4.0.0 - org.mockito - mockito-junit-jupiter - 3.12.4 - mockito-junit-jupiter - Mockito JUnit 5 support - https://github.com/mockito/mockito - - - The MIT License - https://github.com/mockito/mockito/blob/main/LICENSE - repo - - - - - mockitoguy - Szczepan Faber - https://github.com/mockitoguy - - Core developer - - - - bric3 - Brice Dutheil - https://github.com/bric3 - - Core developer - - - - raphw - Rafael Winterhalter - https://github.com/raphw - - Core developer - - - - TimvdLippe - Tim van der Lippe - https://github.com/TimvdLippe - - Core developer - - - - - https://github.com/mockito/mockito.git - - - GitHub issues - https://github.com/mockito/mockito/issues - - - GH Actions - https://github.com/mockito/mockito/actions - - - - org.mockito - mockito-core - 3.12.4 - compile - - - org.junit.jupiter - junit-jupiter-api - 5.7.2 - runtime - - - From 740fc2fde4f175e8b7cf7813da5424e8edb2878b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 12 Dec 2023 09:49:04 +0100 Subject: [PATCH 18/41] Add Gradle build tasks to pom --- mockito.spec | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/mockito.spec b/mockito.spec index c95dd8e..ec57342 100644 --- a/mockito.spec +++ b/mockito.spec @@ -28,18 +28,14 @@ Patch0: use-unbundled-asm.patch BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local -BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bnd) BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.bytebuddy:byte-buddy) BuildRequires: mvn(net.bytebuddy:byte-buddy-agent) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apiguardian:apiguardian-api) -BuildRequires: mvn(org.assertj:assertj-core) -BuildRequires: mvn(org.hamcrest:hamcrest) +BuildRequires: mvn(net.bytebuddy:byte-buddy-dep) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.opentest4j:opentest4j) -BuildRequires: mvn(org.ow2.asm:asm) %endif %description @@ -89,6 +85,39 @@ sed -i '/add_listeners_concurrently_sanity_check/i @org.junit.Ignore' src/test/j %pom_remove_dep org.junit.jupiter:junit-jupiter-api subprojects/junit-jupiter %pom_add_dep org.junit.jupiter:junit-jupiter-api subprojects/junit-jupiter +# see gradle/mockito-core/inline-mock.gradle +%pom_xpath_inject 'pom:project/pom:build/pom:plugins' ' + + org.apache.maven.plugins + maven-antrun-plugin + any + + + process-classes + + + + + + + run + + + + + + org.apache.maven.plugins + maven-jar-plugin + any + + + org/mockito/internal/creation/bytebuddy/inject/*.class + + + +' + %build %mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 -f aggregator.pom From 1f16fc3089feab3f3fe5aea97a4f3611088796f7 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 12 Dec 2023 11:40:54 +0100 Subject: [PATCH 19/41] Add mock-maker-subclass default extension --- mockito.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mockito.spec b/mockito.spec index ec57342..db84c9e 100644 --- a/mockito.spec +++ b/mockito.spec @@ -85,6 +85,10 @@ sed -i '/add_listeners_concurrently_sanity_check/i @org.junit.Ignore' src/test/j %pom_remove_dep org.junit.jupiter:junit-jupiter-api subprojects/junit-jupiter %pom_add_dep org.junit.jupiter:junit-jupiter-api subprojects/junit-jupiter +mkdir -p src/main/resources/mockito-extensions +echo 'member-accessor-module' > src/main/resources/mockito-extensions/org.mockito.plugins.MemberAccessor +echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker + # see gradle/mockito-core/inline-mock.gradle %pom_xpath_inject 'pom:project/pom:build/pom:plugins' ' From 9b76606b53ccfd86c5f0f4327b63b7ba3fa49fcf Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 13 Dec 2023 08:40:06 +0100 Subject: [PATCH 20/41] Do not install the aggregator pom --- mockito.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mockito.spec b/mockito.spec index db84c9e..5beddbc 100644 --- a/mockito.spec +++ b/mockito.spec @@ -122,6 +122,8 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p ' +%mvn_package :aggregator __noinstall + %build %mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 -f aggregator.pom From 95a27ae49baea704dfa744c30d9042d7a41f9787 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 13 Dec 2023 08:49:35 +0100 Subject: [PATCH 21/41] Update to upstream version 5.8.0 --- .gitignore | 3 +++ mockito.spec | 7 +++++-- sources | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6cb2638..6dafbd8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ /mockito-5.5.0.tar.gz /mockito-core-5.5.0.pom /mockito-junit-jupiter-5.5.0.pom +/mockito-5.8.0.tar.gz +/mockito-core-5.8.0.pom +/mockito-junit-jupiter-5.8.0.pom diff --git a/mockito.spec b/mockito.spec index 5beddbc..8a30ef7 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: mockito -Version: 5.5.0 +Version: 5.8.0 Release: 1%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT @@ -125,7 +125,7 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %mvn_package :aggregator __noinstall %build -%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 -f aggregator.pom +%mvn_build -f -- -Dmaven.compiler.release=11 -Dproject.build.sourceEncoding=UTF-8 -f aggregator.pom %mvn_package org.mockito:mockito-junit-jupiter junit-jupiter @@ -142,6 +142,9 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %changelog +* Wed Dec 13 2023 Marian Koncek - 5.8.0-1 +- Update to upstream version 5.8.0 + * Fri Sep 01 2023 Marian Koncek - 5.5.0-1 - Update to upstream version 5.5.0 diff --git a/sources b/sources index 8ac9fca..b5b93fd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (mockito-5.5.0.tar.gz) = 4e36c396eb69fa95bb7828b2c2253c8010536f755b4b75e761b30c7f5f437e40c96503e6bb255e221c8fff3aaa795399598d6c413189e3374dec0a9268a88cc8 -SHA512 (mockito-core-5.5.0.pom) = 8f11bf7e61f1ac5d53949c30636abb50d9dd53ef71da585055857fedd592445912e83087674c59388f7e44d38f242708f6e19a988f25c4249b6a62268ac8c967 -SHA512 (mockito-junit-jupiter-5.5.0.pom) = 29a098fdeef8d154f52e547d6cffc5b17879811583a079d9cc359bfc4b651300da5feaa9974d81e613f42650fdfb345b66481ea1afdf9c12eca6c60c22ce5507 +SHA512 (mockito-5.8.0.tar.gz) = b820763869b00b1c2bc225f90b0e691c731464dde0bee3c1878657c29a4679f397989f750511e1ee7ea2014bb89e384d1a18cec14eeb468ee7dd65a390227eff +SHA512 (mockito-core-5.8.0.pom) = 3a88de5f77da3b91bc79611c0a11f18d6df0f25c07604b7d02b85c4546ac409e227333349f9bc3a22b4eed1b7c0593564ee4e3ff8e69f00d684a5ebf155905df +SHA512 (mockito-junit-jupiter-5.8.0.pom) = 99753beafd55261f68e29f7e021eea2adc06d03bfbf928e8469fdc72ea34df986c2205d7d1ba9b61916bced4d71c68d22879dd6d40bdea39f78079fc7a21f4d8 From fc655b8e60e4fb38136eb59aa57da5e367873c42 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:25:47 +0000 Subject: [PATCH 22/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 8a30ef7..e8dd927 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 5.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -142,6 +142,9 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 5.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Dec 13 2023 Marian Koncek - 5.8.0-1 - Update to upstream version 5.8.0 From 6faef04946c422228cb49743ebaa9a48edeb07b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 07:43:05 +0000 Subject: [PATCH 23/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index e8dd927..f5beee1 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 5.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -142,6 +142,9 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 5.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 5.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5ccafad3624bab30030179d467540b6a15f84600 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:31:29 +0100 Subject: [PATCH 24/41] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index f5beee1..8ccb9c2 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 5.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -142,6 +142,9 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %changelog +* Fri Feb 23 2024 Jiri Vanek - 5.8.0-4 +- bump of release for for java-21-openjdk as system jdk + * Thu Jan 25 2024 Fedora Release Engineering - 5.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From acac41cab8eca111658d54561c4ef0310b23a778 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 17:23:53 +0100 Subject: [PATCH 25/41] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 8ccb9c2..89ccff3 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 5.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -142,6 +142,9 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %changelog +* Tue Feb 27 2024 Jiri Vanek - 5.8.0-5 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 5.8.0-4 - bump of release for for java-21-openjdk as system jdk From 33624bf94400e80f1cc8042809c9f2349717c721 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:24:36 +0000 Subject: [PATCH 26/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 89ccff3..940666b 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 5.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -142,6 +142,9 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 5.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 5.8.0-5 - Rebuilt for java-21-openjdk as system jdk From df6887b9fd7bf0407d75cb7b2535ee3a402f1dbd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 27/41] 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 8d738b40efb6fd6555ac38371eb0304e263dd5aa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:32:53 +0200 Subject: [PATCH 28/41] Use %autosetup -C --- mockito.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 940666b..0c9acd7 100644 --- a/mockito.spec +++ b/mockito.spec @@ -58,7 +58,7 @@ Requires: %{name} = %{version}-%{release} Mockito JUnit 5 support. %prep -%autosetup -p1 +%autosetup -p1 -C cp %{SOURCE2} aggregator.pom cp %{SOURCE3} pom.xml From 3e01842ad54ee72194cb4ad6d78ae43bc87307c1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:19 +0200 Subject: [PATCH 29/41] Switch to non-numdered patches --- mockito.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 0c9acd7..07c88fe 100644 --- a/mockito.spec +++ b/mockito.spec @@ -22,7 +22,7 @@ Source4: https://repo1.maven.org/maven2/org/mockito/mockito-junit-jupiter # Mockito expects byte-buddy to have a shaded/bundled version of ASM, but # we don't bundle in Fedora, so this patch makes mockito use ASM explicitly -Patch0: use-unbundled-asm.patch +Patch: use-unbundled-asm.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 47306d3af002049f777906fae0b25b98679b45a6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:15 +0200 Subject: [PATCH 30/41] Convert to %autorelease and %autochangelog --- changelog | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++ mockito.spec | 236 +-------------------------------------------------- 2 files changed, 235 insertions(+), 234 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..5458ada --- /dev/null +++ b/changelog @@ -0,0 +1,233 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 5.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 5.8.0-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 5.8.0-4 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 5.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 5.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Dec 13 2023 Marian Koncek - 5.8.0-1 +- Update to upstream version 5.8.0 + +* Fri Sep 01 2023 Marian Koncek - 5.5.0-1 +- Update to upstream version 5.5.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.12.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.12.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.12.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Apr 09 2022 Didik Supriadi - 3.12.4-4 +- Set javac compiler release to Java 8 + +* Sat Feb 05 2022 Jiri Vanek - 3.12.4-3 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 27 2022 Mikolaj Izdebski - 3.12.4-2 +- Don't build mockito-junit-jupiter in bootstrap mode + +* Sat Jan 22 2022 Jerry James - 3.12.4-1 +- Version 3.12.4 +- Add inline and junit-jupiter subpackages +- Drop OpenJDK 17 workarounds + +* Thu Jan 20 2022 Fedora Release Engineering - 3.7.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Nov 03 2021 Mikolaj Izdebski - 3.7.13-4 +- Workaround build issue with OpenJDK 17 + +* Thu Jul 22 2021 Fedora Release Engineering - 3.7.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.7.13-2 +- Bootstrap build +- Non-bootstrap build + +* Thu Feb 04 2021 Marian Koncek - 3.7.13-1 +- Update to upstream version 3.7.13 + +* Tue Jan 26 2021 Fedora Release Engineering - 3.5.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Oct 9 2020 Stuart Gathman - 3.5.13-1 +- Update to version 3.5.13 + +* Wed Sep 30 2020 Marian Koncek - 3.5.13-1 +- Update to ustream version 3.5.13 + +* Sun Aug 23 2020 Jerry James - 3.5.5-1 +- Update to version 3.5.5 + +* Fri Aug 14 2020 Jerry James - 2.28.2-1 +- Update to version 2.28.2 + +* Tue Jul 28 2020 Fedora Release Engineering - 2.23.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 22 2020 Marian Koncek - 3.4.5-1 +- Update to upstream version 3.4.5 + +* Sat Jul 11 2020 Jiri Vanek - 2.23.9-7 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 2.23.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 3.1.2-2 +- Mass rebuild for javapackages-tools 201902 + +* Wed Oct 16 2019 Marian Koncek - 3.1.2-1 +- Update to upstream version 3.1.2 + +* Thu Sep 19 2019 Marian Koncek - 3.0.8-1 +- Update to upstream version 3.0.8 + +* Thu Jul 25 2019 Fedora Release Engineering - 2.23.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 2.23.9-4 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 2.23.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Dec 12 2018 Mat Booth - 2.23.9-3 +- Set the source encoding for the build + +* Wed Dec 05 2018 Mat Booth - 2.23.9-2 +- Re-add compatibility alias for 'mockito-all' + +* Tue Dec 04 2018 Mat Booth - 2.23.9-1 +- Update to latest upstream version +- Switch to maven build system using a custom pom to avoid a dep on gradle + +* Fri Aug 03 2018 Michael Simacek - 1.10.19-17 +- Remove bundled minified js from javadoc + +* Fri Jul 13 2018 Fedora Release Engineering - 1.10.19-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Igor Gnatenko - 1.10.19-15 +- Escape macros in %%changelog + +* Thu Feb 08 2018 Fedora Release Engineering - 1.10.19-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.10.19-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 16 2017 Michael Simacek - 1.10.19-12 +- Remove conditional for EOL Fedora + +* Fri Feb 10 2017 Fedora Release Engineering - 1.10.19-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Feb 22 2016 Mat Booth - 1.10.19-10 +- Explicitly import more cglib packages in OSGi metadata to prevent mockito + failing under certain circumstances during Eclipse test suites + +* Fri Feb 12 2016 Mat Booth - 1.10.19-9 +- Require hamcrest explicitly in OSGi metadata + +* Thu Feb 04 2016 Fedora Release Engineering - 1.10.19-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Dec 25 2015 Raphael Groner - 1.10.19-7 +- introduce License tag + +* Fri Dec 25 2015 Raphael Groner - 1.10.19-6 +- reenable osgi + +* Fri Dec 18 2015 Raphael Groner - 1.10.19-5 +- workaround rhbz#1292777 stylesheet.css not found + +* Thu Jul 16 2015 Michael Simacek - 1.10.19-4 +- Use aqute-bnd-2.4.1 + +* Mon Jun 22 2015 Mat Booth - 1.10.19-3 +- Switch to mvn_install + +* Wed Jun 17 2015 Fedora Release Engineering - 1.10.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 29 2015 Michal Srb - 1.10.19-1 +- Update to 1.10.19 + +* Mon Aug 25 2014 Darryl L. Pierce - 1.9.0-18 +- First build for EPEL7 +- Resolves: BZ#1110030 + +* Mon Jun 09 2014 Omair Majid - 1.9.0-17 +- Use .mfiles to pick up xmvn metadata +- Don't use obsolete _mavenpomdir and _mavendepmapfragdir macros +- Fix FTBFS + +* Sat Jun 07 2014 Fedora Release Engineering - 1.9.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 22 2014 Severin Gehwolf - 1.9.0-16 +- Use junit R/BR over junit4. + +* Fri Mar 28 2014 Michael Simacek - 1.9.0-15 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Dec 11 2013 Michael Simacek - 1.9.0-14 +- Workaround for NPE in setting NamingPolicy + +* Sat Aug 03 2013 Fedora Release Engineering - 1.9.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Mar 25 2013 Tomas Radej - 1.9.0-12 +- Patched LocalizedMatcher due to hamcrest update, (bug upstream) + +* Thu Feb 14 2013 Fedora Release Engineering - 1.9.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Sep 6 2012 Severin Gehwolf 1.9.0-10 +- More Import-Package fixes. Note that fix-cglib-refs.patch is + not suitable for upstream: issue id=373 + +* Tue Sep 4 2012 Severin Gehwolf 1.9.0-9 +- Fix missing Import-Package in manifest. + +* Mon Aug 27 2012 Severin Gehwolf 1.9.0-8 +- Add aqute bnd instructions for OSGi metadata + +* Fri Jul 20 2012 Fedora Release Engineering - 1.9.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Apr 30 2012 Roman Kennke 1.9.0-6 +- Place JavaDoc in directly under %%{_javadocdir}/%%{name} instead + of %%{_javadocdir}/%%{name}/javadoc + +* Wed Apr 25 2012 Roman Kennke 1.9.0-5 +- Removed post/postun hook for update_maven_depmap + +* Tue Apr 24 2012 Roman Kennke 1.9.0-4 +- Fix groupId of cglib dependency +- Add additional depmap for mockito-all +- Update depmap on post and postun +- Fix version in pom + +* Wed Feb 22 2012 Roman Kennke 1.9.0-3 +- Added cglib dependency to pom + +* Tue Feb 21 2012 Roman Kennke 1.9.0-2 +- Include upstream Maven pom.xml in package +- Added missing Requires for cglib, junit4, hamcrest, objenesis +- Added source tarball generating script to sources + +* Thu Feb 16 2012 Roman Kennke 1.9.0-1 +- Initial package diff --git a/mockito.spec b/mockito.spec index 07c88fe..9c01e29 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 5.8.0 -Release: 6%{?dist} +Release: %autorelease Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -142,236 +142,4 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 5.8.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 5.8.0-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 5.8.0-4 -- bump of release for for java-21-openjdk as system jdk - -* Thu Jan 25 2024 Fedora Release Engineering - 5.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 5.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Dec 13 2023 Marian Koncek - 5.8.0-1 -- Update to upstream version 5.8.0 - -* Fri Sep 01 2023 Marian Koncek - 5.5.0-1 -- Update to upstream version 5.5.0 - -* Thu Jul 20 2023 Fedora Release Engineering - 3.12.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 3.12.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 3.12.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Apr 09 2022 Didik Supriadi - 3.12.4-4 -- Set javac compiler release to Java 8 - -* Sat Feb 05 2022 Jiri Vanek - 3.12.4-3 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 27 2022 Mikolaj Izdebski - 3.12.4-2 -- Don't build mockito-junit-jupiter in bootstrap mode - -* Sat Jan 22 2022 Jerry James - 3.12.4-1 -- Version 3.12.4 -- Add inline and junit-jupiter subpackages -- Drop OpenJDK 17 workarounds - -* Thu Jan 20 2022 Fedora Release Engineering - 3.7.13-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Nov 03 2021 Mikolaj Izdebski - 3.7.13-4 -- Workaround build issue with OpenJDK 17 - -* Thu Jul 22 2021 Fedora Release Engineering - 3.7.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 3.7.13-2 -- Bootstrap build -- Non-bootstrap build - -* Thu Feb 04 2021 Marian Koncek - 3.7.13-1 -- Update to upstream version 3.7.13 - -* Tue Jan 26 2021 Fedora Release Engineering - 3.5.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Oct 9 2020 Stuart Gathman - 3.5.13-1 -- Update to version 3.5.13 - -* Wed Sep 30 2020 Marian Koncek - 3.5.13-1 -- Update to ustream version 3.5.13 - -* Sun Aug 23 2020 Jerry James - 3.5.5-1 -- Update to version 3.5.5 - -* Fri Aug 14 2020 Jerry James - 2.28.2-1 -- Update to version 2.28.2 - -* Tue Jul 28 2020 Fedora Release Engineering - 2.23.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 22 2020 Marian Koncek - 3.4.5-1 -- Update to upstream version 3.4.5 - -* Sat Jul 11 2020 Jiri Vanek - 2.23.9-7 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jan 29 2020 Fedora Release Engineering - 2.23.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 3.1.2-2 -- Mass rebuild for javapackages-tools 201902 - -* Wed Oct 16 2019 Marian Koncek - 3.1.2-1 -- Update to upstream version 3.1.2 - -* Thu Sep 19 2019 Marian Koncek - 3.0.8-1 -- Update to upstream version 3.0.8 - -* Thu Jul 25 2019 Fedora Release Engineering - 2.23.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 2.23.9-4 -- Mass rebuild for javapackages-tools 201901 - -* Fri Feb 01 2019 Fedora Release Engineering - 2.23.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Dec 12 2018 Mat Booth - 2.23.9-3 -- Set the source encoding for the build - -* Wed Dec 05 2018 Mat Booth - 2.23.9-2 -- Re-add compatibility alias for 'mockito-all' - -* Tue Dec 04 2018 Mat Booth - 2.23.9-1 -- Update to latest upstream version -- Switch to maven build system using a custom pom to avoid a dep on gradle - -* Fri Aug 03 2018 Michael Simacek - 1.10.19-17 -- Remove bundled minified js from javadoc - -* Fri Jul 13 2018 Fedora Release Engineering - 1.10.19-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Igor Gnatenko - 1.10.19-15 -- Escape macros in %%changelog - -* Thu Feb 08 2018 Fedora Release Engineering - 1.10.19-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.10.19-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Feb 16 2017 Michael Simacek - 1.10.19-12 -- Remove conditional for EOL Fedora - -* Fri Feb 10 2017 Fedora Release Engineering - 1.10.19-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Feb 22 2016 Mat Booth - 1.10.19-10 -- Explicitly import more cglib packages in OSGi metadata to prevent mockito - failing under certain circumstances during Eclipse test suites - -* Fri Feb 12 2016 Mat Booth - 1.10.19-9 -- Require hamcrest explicitly in OSGi metadata - -* Thu Feb 04 2016 Fedora Release Engineering - 1.10.19-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Dec 25 2015 Raphael Groner - 1.10.19-7 -- introduce License tag - -* Fri Dec 25 2015 Raphael Groner - 1.10.19-6 -- reenable osgi - -* Fri Dec 18 2015 Raphael Groner - 1.10.19-5 -- workaround rhbz#1292777 stylesheet.css not found - -* Thu Jul 16 2015 Michael Simacek - 1.10.19-4 -- Use aqute-bnd-2.4.1 - -* Mon Jun 22 2015 Mat Booth - 1.10.19-3 -- Switch to mvn_install - -* Wed Jun 17 2015 Fedora Release Engineering - 1.10.19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Apr 29 2015 Michal Srb - 1.10.19-1 -- Update to 1.10.19 - -* Mon Aug 25 2014 Darryl L. Pierce - 1.9.0-18 -- First build for EPEL7 -- Resolves: BZ#1110030 - -* Mon Jun 09 2014 Omair Majid - 1.9.0-17 -- Use .mfiles to pick up xmvn metadata -- Don't use obsolete _mavenpomdir and _mavendepmapfragdir macros -- Fix FTBFS - -* Sat Jun 07 2014 Fedora Release Engineering - 1.9.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 22 2014 Severin Gehwolf - 1.9.0-16 -- Use junit R/BR over junit4. - -* Fri Mar 28 2014 Michael Simacek - 1.9.0-15 -- Use Requires: java-headless rebuild (#1067528) - -* Wed Dec 11 2013 Michael Simacek - 1.9.0-14 -- Workaround for NPE in setting NamingPolicy - -* Sat Aug 03 2013 Fedora Release Engineering - 1.9.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Mar 25 2013 Tomas Radej - 1.9.0-12 -- Patched LocalizedMatcher due to hamcrest update, (bug upstream) - -* Thu Feb 14 2013 Fedora Release Engineering - 1.9.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Sep 6 2012 Severin Gehwolf 1.9.0-10 -- More Import-Package fixes. Note that fix-cglib-refs.patch is - not suitable for upstream: issue id=373 - -* Tue Sep 4 2012 Severin Gehwolf 1.9.0-9 -- Fix missing Import-Package in manifest. - -* Mon Aug 27 2012 Severin Gehwolf 1.9.0-8 -- Add aqute bnd instructions for OSGi metadata - -* Fri Jul 20 2012 Fedora Release Engineering - 1.9.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Apr 30 2012 Roman Kennke 1.9.0-6 -- Place JavaDoc in directly under %%{_javadocdir}/%%{name} instead - of %%{_javadocdir}/%%{name}/javadoc - -* Wed Apr 25 2012 Roman Kennke 1.9.0-5 -- Removed post/postun hook for update_maven_depmap - -* Tue Apr 24 2012 Roman Kennke 1.9.0-4 -- Fix groupId of cglib dependency -- Add additional depmap for mockito-all -- Update depmap on post and postun -- Fix version in pom - -* Wed Feb 22 2012 Roman Kennke 1.9.0-3 -- Added cglib dependency to pom - -* Tue Feb 21 2012 Roman Kennke 1.9.0-2 -- Include upstream Maven pom.xml in package -- Added missing Requires for cglib, junit4, hamcrest, objenesis -- Added source tarball generating script to sources - -* Thu Feb 16 2012 Roman Kennke 1.9.0-1 -- Initial package +%autochangelog From 9a2b655987cdd4da00a061a51f562f2ae156a671 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 31/41] 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 6aea715365ae785fc523532af79643b318bf2198 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:19 +0100 Subject: [PATCH 32/41] Unify spec style with the rest of Java/Maven packages [skip changelog] --- mockito.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mockito.spec b/mockito.spec index 9c01e29..41dd213 100644 --- a/mockito.spec +++ b/mockito.spec @@ -12,10 +12,8 @@ ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh - # A custom build script to allow building with maven instead of gradle Source2: aggregator.pom - # Maven central POMs for subprojects Source3: https://repo1.maven.org/maven2/org/mockito/mockito-core/%{version}/mockito-core-%{version}.pom Source4: https://repo1.maven.org/maven2/org/mockito/mockito-junit-jupiter/%{version}/mockito-junit-jupiter-%{version}.pom @@ -45,7 +43,7 @@ because the tests are very readable and they produce clean verification errors. %package javadoc -Summary: Javadocs for %{name} +Summary: Javadocs for %{name} %description javadoc This package contains the API documentation for %{name}. @@ -136,10 +134,10 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %doc README.md doc/design-docs/custom-argument-matching.md -%files junit-jupiter -f .mfiles-junit-jupiter - %files javadoc -f .mfiles-javadoc %license LICENSE +%files junit-jupiter -f .mfiles-junit-jupiter + %changelog %autochangelog From 8ad792545c2674347cb130d660ff726925493233 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 33/41] Update javadoc package description [skip changelog] --- mockito.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mockito.spec b/mockito.spec index 41dd213..db18569 100644 --- a/mockito.spec +++ b/mockito.spec @@ -43,10 +43,10 @@ because the tests are very readable and they produce clean verification errors. %package javadoc -Summary: Javadocs for %{name} +Summary: API documentation for %{name} %description javadoc -This package contains the API documentation for %{name}. +API documentation for %{name}. %package junit-jupiter Summary: Mockito JUnit 5 support From 067be367fd1c73aa8020b4dc346f9ad831c44cdc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 18:49:35 +0000 Subject: [PATCH 34/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From efb094ed032412d0f226e6fc949186b60eaadbb1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 35/41] Remove javadoc subpackage --- mockito.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/mockito.spec b/mockito.spec index db18569..54a7206 100644 --- a/mockito.spec +++ b/mockito.spec @@ -35,6 +35,8 @@ BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.opentest4j:opentest4j) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 5.8.0-16 %description Mockito is a mocking framework that tastes really good. It lets you write @@ -42,12 +44,6 @@ beautiful tests with clean & simple API. Mockito doesn't give you hangover because the tests are very readable and they produce clean verification errors. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %package junit-jupiter Summary: Mockito JUnit 5 support Requires: %{name} = %{version}-%{release} @@ -123,7 +119,7 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %mvn_package :aggregator __noinstall %build -%mvn_build -f -- -Dmaven.compiler.release=11 -Dproject.build.sourceEncoding=UTF-8 -f aggregator.pom +%mvn_build -j -f -- -Dmaven.compiler.release=11 -Dproject.build.sourceEncoding=UTF-8 -f aggregator.pom %mvn_package org.mockito:mockito-junit-jupiter junit-jupiter @@ -134,9 +130,6 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %doc README.md doc/design-docs/custom-argument-matching.md -%files javadoc -f .mfiles-javadoc -%license LICENSE - %files junit-jupiter -f .mfiles-junit-jupiter %changelog From 91a5d621bc4dfb36a100bba5611e55cbc98d8941 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 36/41] 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 8cd7b14acc49b4d164746ddc4b94b1db23c4f8b9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 37/41] 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 7c6ae6b01ceb483591c8f05a14e43bec1dfd0de1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 38/41] Build with OpenJDK 25 --- mockito.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 54a7206..73b1435 100644 --- a/mockito.spec +++ b/mockito.spec @@ -25,7 +25,7 @@ Patch: use-unbundled-asm.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.bytebuddy:byte-buddy) BuildRequires: mvn(net.bytebuddy:byte-buddy-agent) From 1bb40109081e80a8464cd719ea38085babb228f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:13:06 +0000 Subject: [PATCH 39/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5c0e88128e78313fbf7d60081aa7a17989f56583 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:43:32 +0200 Subject: [PATCH 40/41] 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 4c5f6af2518158d00e90afe76cf30f97346f7a59 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 23 Sep 2025 11:44:53 +0200 Subject: [PATCH 41/41] Remove workaround for EasyMock 4 incompatibility with Java 17 --- mockito.spec | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/mockito.spec b/mockito.spec index 73b1435..3bfe5b8 100644 --- a/mockito.spec +++ b/mockito.spec @@ -62,11 +62,6 @@ cp %{SOURCE4} subprojects/junit-jupiter/pom.xml # TODO check status: https://github.com/mockito/mockito/issues/2162 sed -i '/add_listeners_concurrently_sanity_check/i @org.junit.Ignore' src/test/java/org/mockitousage/debugging/StubbingLookupListenerCallbackTest.java -# Workaround easymock incompatibility with Java 17 that should be fixed -# in easymock 4.4: https://github.com/easymock/easymock/issues/274 -%pom_add_plugin :maven-surefire-plugin . " - --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED" - # Compatibility alias %mvn_alias org.%{name}:%{name}-core org.%{name}:%{name}-all @@ -84,11 +79,7 @@ echo 'member-accessor-module' > src/main/resources/mockito-extensions/org.mockit echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker # see gradle/mockito-core/inline-mock.gradle -%pom_xpath_inject 'pom:project/pom:build/pom:plugins' ' - - org.apache.maven.plugins - maven-antrun-plugin - any +%pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin ' process-classes @@ -103,17 +94,13 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p - - - org.apache.maven.plugins - maven-jar-plugin - any +' +%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin ' org/mockito/internal/creation/bytebuddy/inject/*.class - ' %mvn_package :aggregator __noinstall