Update to upstream version 0.9.10

This commit is contained in:
Michael Simacek 2018-06-29 12:22:17 +02:00
parent 67785b0f81
commit 8d904908e9
3 changed files with 13 additions and 16 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/plexus-languages-0.9.3.tar.gz /plexus-languages-0.9.3.tar.gz
/LICENSE-2.0.txt /LICENSE-2.0.txt
/plexus-languages-0.9.10.tar.gz

View File

@ -1,6 +1,6 @@
Name: plexus-languages Name: plexus-languages
Version: 0.9.3 Version: 0.9.10
Release: 5%{?dist} Release: 1%{?dist}
Summary: Plexus Languages Summary: Plexus Languages
License: ASL 2.0 License: ASL 2.0
URL: https://github.com/codehaus-plexus/plexus-languages URL: https://github.com/codehaus-plexus/plexus-languages
@ -10,18 +10,13 @@ Source0: https://github.com/codehaus-plexus/plexus-languages/archive/plex
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(com.google.inject:guice)
BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(com.thoughtworks.qdox:qdox)
BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(javax.inject:javax.inject)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
BuildRequires: mvn(org.mockito:mockito-core)
BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm)
# test deps
BuildRequires: jdom
BuildRequires: objectweb-asm
%description %description
Plexus Languages is a set of Plexus components that maintain shared Plexus Languages is a set of Plexus components that maintain shared
@ -32,16 +27,14 @@ language features.
%prep %prep
%setup -q -n plexus-languages-plexus-languages-%{version} %setup -q -n plexus-languages-plexus-languages-%{version}
find -name '*.jar' -delete
find -name '*.class' -delete
cp %{SOURCE1} . cp %{SOURCE1} .
rm plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/AsmModuleInfoParserTest.java
# Replace JARs used as test resources with symlinks to system JARs
ln -sf $(find-jar jdom) plexus-java/src/test/resources/jar.unsupported/jdom-1.0.jar
ln -sf $(find-jar objectweb-asm/asm) plexus-java/src/test/resources/jar.descriptor/asm-6.0_BETA.jar
%build %build
%mvn_build # we don't have mockito 2 yet + many tests rely on bundled test jars/classes
%mvn_build -f
%install %install
%mvn_install %mvn_install
@ -50,6 +43,9 @@ ln -sf $(find-jar objectweb-asm/asm) plexus-java/src/test/resources/jar.descript
%license LICENSE-2.0.txt %license LICENSE-2.0.txt
%changelog %changelog
* Fri Jun 29 2018 Michael Simacek <msimacek@redhat.com> - 0.9.10-1
- Update to upstream version 0.9.10
* Fri Jun 29 2018 Michael Simacek <msimacek@redhat.com> - 0.9.3-5 * Fri Jun 29 2018 Michael Simacek <msimacek@redhat.com> - 0.9.3-5
- Disable broken test - Disable broken test

View File

@ -1,2 +1,2 @@
SHA512 (plexus-languages-0.9.3.tar.gz) = 122407efc06232ee7f8f303295e800b532410710810e2d3f9680e6af18e4420b69b822b210d98bd0a41f09d5e1850bfea0ea2e0a423a7690222e3f4ae6f9a74f SHA512 (plexus-languages-0.9.10.tar.gz) = e22447b91ed576742a3f5f13e58ca6022c31f583b3332ba447801eae0502b7af25adf6ff2f953598824ad6b797226815e1625ed5064b9fa94a5ded6554d847d6
SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8