Workaround build issue with OpenJDK 17
This commit is contained in:
parent
0d98b65f49
commit
39ccca4ee5
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: easymock
|
Name: easymock
|
||||||
Version: 4.2
|
Version: 4.2
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Easy mock objects
|
Summary: Easy mock objects
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://www.easymock.org
|
URL: http://www.easymock.org
|
||||||
@ -103,6 +103,17 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
|
|||||||
%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']" \
|
%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']" \
|
||||||
"<configuration><testNGArtifactName>none:none</testNGArtifactName></configuration>" core
|
"<configuration><testNGArtifactName>none:none</testNGArtifactName></configuration>" core
|
||||||
|
|
||||||
|
# Workaround Java 17 compatibility issue that should be fixed in
|
||||||
|
# easymock 4.4: https://github.com/easymock/easymock/issues/274
|
||||||
|
%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" \
|
||||||
|
"<argLine>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>" core
|
||||||
|
%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" \
|
||||||
|
"<argLine>--add-opens=java.base/java.lang=ALL-UNNAMED</argLine>" test-testng
|
||||||
|
%pom_add_plugin :maven-surefire-plugin test-java8 "<configuration>
|
||||||
|
<argLine>--add-opens=java.base/java.lang=ALL-UNNAMED</argLine></configuration>"
|
||||||
|
%pom_add_plugin :maven-surefire-plugin test-junit5 "<configuration>
|
||||||
|
<argLine>--add-opens=java.base/java.lang=ALL-UNNAMED</argLine></configuration>"
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%mvn_build
|
%mvn_build
|
||||||
|
|
||||||
@ -116,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
|
|||||||
%license core/LICENSE.txt
|
%license core/LICENSE.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-5
|
||||||
|
- Workaround build issue with OpenJDK 17
|
||||||
|
|
||||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-4
|
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user