Rebuild correctly as a proper JPMS module
This commit is contained in:
parent
d673c8c853
commit
eeb6f8ab81
@ -1,7 +1,7 @@
|
|||||||
Name: plexus-languages
|
Name: plexus-languages
|
||||||
Summary: Plexus Languages
|
Summary: Plexus Languages
|
||||||
Version: 1.0.5
|
Version: 1.0.5
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
|
|
||||||
URL: https://github.com/codehaus-plexus/plexus-languages
|
URL: https://github.com/codehaus-plexus/plexus-languages
|
||||||
@ -36,13 +36,9 @@ cp %{SOURCE1} .
|
|||||||
|
|
||||||
%pom_remove_plugin :maven-enforcer-plugin
|
%pom_remove_plugin :maven-enforcer-plugin
|
||||||
|
|
||||||
# Temporarily force JPMS classes to be built
|
|
||||||
%pom_xpath_remove 'pom:profiles' plexus-java
|
|
||||||
cp -p plexus-java/src/main/java9/org/codehaus/plexus/languages/java/jpms/* plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# we don't have mockito 2 yet + many tests rely on bundled test jars/classes
|
# we don't have mockito 2 yet + many tests rely on bundled test jars/classes
|
||||||
%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
|
%mvn_build -f
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -54,6 +50,9 @@ cp -p plexus-java/src/main/java9/org/codehaus/plexus/languages/java/jpms/* plexu
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.0.5-6
|
||||||
|
- Rebuild correctly as a proper JPMS module
|
||||||
|
|
||||||
* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.0.5-5
|
* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.0.5-5
|
||||||
- Bootstrap restoration of essential JPMS classes
|
- Bootstrap restoration of essential JPMS classes
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user