From efb094ed032412d0f226e6fc949186b60eaadbb1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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