Compare commits

..

7 commits

Author SHA1 Message Date
Mikolaj Izdebski
4c5f6af251 Remove workaround for EasyMock 4 incompatibility with Java 17 2025-09-23 11:55:52 +02:00
Jiri Vanek
5c0e88128e 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.
2025-07-30 00:43:32 +02:00
Fedora Release Engineering
1bb4010908 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 22:13:06 +00:00
Mikolaj Izdebski
7c6ae6b01c Build with OpenJDK 25 2025-07-13 09:22:52 +02:00
Mikolaj Izdebski
8cd7b14acc Switch javapackages test plan to f43 ref 2025-05-22 13:35:32 +02:00
Mikolaj Izdebski
91a5d621bc Switch to javapackages tests from CentOS Stream GitLab 2025-03-26 08:43:19 +01:00
Mikolaj Izdebski
efb094ed03 Remove javadoc subpackage 2025-03-03 12:54:04 +01:00
2 changed files with 9 additions and 29 deletions

View file

@ -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)
@ -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}
@ -66,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 . "<configuration>
<argLine>--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED</argLine></configuration>"
# Compatibility alias
%mvn_alias org.%{name}:%{name}-core org.%{name}:%{name}-all
@ -88,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' '
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>any</version>
%pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin '
<executions>
<execution>
<phase>process-classes</phase>
@ -107,23 +94,19 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>any</version>
'
%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin '
<configuration>
<excludes>
<exclude>org/mockito/internal/creation/bytebuddy/inject/*.class</exclude>
</excludes>
</configuration>
</plugin>
'
%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 +117,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

View file

@ -1,7 +1,7 @@
summary: Run javapackages-specific tests
discover:
how: fmf
url: https://src.fedoraproject.org/tests/javapackages
ref: f42
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
ref: f43
execute:
how: tmt