Bootstrap restoration of essential JPMS classes

This commit is contained in:
Mat Booth 2020-08-10 12:33:35 +01:00
parent 558bb2ce1a
commit d673c8c853
3 changed files with 9 additions and 6 deletions

View File

@ -16,6 +16,6 @@ tar xf "../${name}-${version}.orig.tar.gz"
find -name '*.jar' -delete find -name '*.jar' -delete
find -name '*.class' -delete find -name '*.class' -delete
tar cf "../${name}-${version}.tar.gz" * tar caf "../${name}-${version}.tar.gz" *
cd .. cd ..
rm -r tarball-tmp "${name}-${version}.orig.tar.gz" rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

View File

@ -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: 4%{?dist} Release: 5%{?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,13 @@ cp %{SOURCE1} .
%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-enforcer-plugin
# can't figure out how to correctly build Java 9 specific stuff # Temporarily force JPMS classes to be built
%pom_xpath_remove 'pom:profiles' plexus-java %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 %mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
%install %install
@ -54,6 +54,9 @@ cp %{SOURCE1} .
%changelog %changelog
* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.0.5-5
- Bootstrap restoration of essential JPMS classes
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

View File

@ -1,2 +1,2 @@
SHA512 (plexus-languages-1.0.5.tar.gz) = acee4e573f220bd5945c65c6c34520b8e4cfe2da8f0b4c2bf61d8336154e7faacbcd9639c1157dce4480c42b1db18fb60e45263e0e0c8b4bcb541898c50c0c7e SHA512 (plexus-languages-1.0.5.tar.gz) = 5320355315b96a566c816a67a5301c92ae2ed2c2d4dc68efa8e843e0de0faefc5ad25522e5f9262800f1960b6955790887fe88eb382adda32c95914e0bd80a6f
SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8