Update to upstream version 4.2.0

This commit is contained in:
Marian Koncek 2019-10-23 10:55:11 +02:00
parent 65d7ad9a79
commit 8f8455a4a8
3 changed files with 14 additions and 10 deletions

1
.gitignore vendored
View File

@ -26,3 +26,4 @@ sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz
/plexus-archiver-3.5.tar.gz /plexus-archiver-3.5.tar.gz
/plexus-archiver-3.6.0.tar.gz /plexus-archiver-3.6.0.tar.gz
/plexus-archiver-4.1.0.tar.gz /plexus-archiver-4.1.0.tar.gz
/plexus-archiver-4.2.0.tar.gz

View File

@ -1,7 +1,6 @@
Name: plexus-archiver Name: plexus-archiver
Version: 4.1.0 Version: 4.2.0
Release: 2%{?dist} Release: 1%{?dist}
Summary: Plexus Archiver Component Summary: Plexus Archiver Component
License: ASL 2.0 License: ASL 2.0
URL: http://codehaus-plexus.github.io/plexus-archiver URL: http://codehaus-plexus.github.io/plexus-archiver
@ -13,7 +12,7 @@ Patch0: 0001-Remove-support-for-snappy.patch
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(com.google.code.findbugs:jsr305)
BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.commons:commons-compress)
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
@ -21,8 +20,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-io) BuildRequires: mvn(org.codehaus.plexus:plexus-io)
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
# Missing from xmvn-builddep
BuildRequires: mvn(org.tukaani:xz) BuildRequires: mvn(org.tukaani:xz)
%description %description
@ -33,14 +30,12 @@ reusable components for hibernate, form processing, jndi, i18n,
velocity, etc. Plexus also includes an application server which velocity, etc. Plexus also includes an application server which
is like a J2EE application server, without all the baggage. is like a J2EE application server, without all the baggage.
%package javadoc %package javadoc
Summary: Javadoc for %{name} Summary: Javadoc for %{name}
%description javadoc %description javadoc
Javadoc for %{name}. Javadoc for %{name}.
%prep %prep
%setup -q -n %{name}-%{name}-%{version} %setup -q -n %{name}-%{name}-%{version}
%mvn_file :%{name} plexus/archiver %mvn_file :%{name} plexus/archiver
@ -50,9 +45,14 @@ Javadoc for %{name}.
rm -rf src/main/java/org/codehaus/plexus/archiver/snappy rm -rf src/main/java/org/codehaus/plexus/archiver/snappy
rm -f src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java rm -f src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java
rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResourceCollection.java rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResourceCollection.java
rm src/test/java/org/codehaus/plexus/archiver/snappy/SnappyArchiverTest.java
rm src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.java
# Tests use old plexus-containers-default
sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
%build %build
%mvn_build -f %mvn_build
%install %install
%mvn_install %mvn_install
@ -64,6 +64,9 @@ rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResour
%license LICENSE %license LICENSE
%changelog %changelog
* Wed Oct 23 2019 Marian Koncek <mkoncek@redhat.com> - 4.2.0-1
- Update to upstream version 4.2.0
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1.0-2 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1.0-2
- Mass rebuild for javapackages-tools 201901 - Mass rebuild for javapackages-tools 201901

View File

@ -1 +1 @@
SHA512 (plexus-archiver-4.1.0.tar.gz) = ec29b41d86ab3d727714bc012a99f8d1dcef6b758ed1ecd2e078d9cf87b4fa32ea8d8bdebf19de37d4eb21bf2efac8fda8159b6094719b22a6a7fad0a7ba6f06 SHA512 (plexus-archiver-4.2.0.tar.gz) = d990e1ef0def4d30af14bad92abf1a0f62d90ed66127c00679e503edc1019c45d1abbdadda8fe29224f63a2bbc41bac0dede073b1fec02bb3ef76df72b7c41d6