Accepting request 750560 from Java:packages

4.2.1

OBS-URL: https://build.opensuse.org/request/show/750560
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-archiver?expand=0&rev=2

0001-Remove-support-for-snappy.patch

@@ -25,7 +25,7 @@ index 398ecf1..0d46cfc 100644
          else if ( TarCompressionMethod.snappy.equals( tarCompressionMethod ) )
          {
 -            return new SnappyOutputStream( bufferedOutputStream( ostream ) );
-+            throw new UnsupportedOperationException( "This version of plexus-archiver does not support snappy compression" );
++            throw new UnsupportedOperationException( "This version of plexus-archiver does not upport snappy compression" );
          }
          else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) )
          {
@@ -33,20 +33,20 @@ diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b
 index 4bc94a4..15f0494 100644
 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
 +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
-@@ -30,7 +30,6 @@
+@@ -31,7 +31,6 @@
- import org.codehaus.plexus.archiver.ArchiverException;
  import org.codehaus.plexus.archiver.util.Streams;
+ import org.codehaus.plexus.components.io.filemappers.FileMapper;
  import org.codehaus.plexus.util.IOUtil;
 -import org.iq80.snappy.SnappyInputStream;
  
  /**
   * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
-@@ -153,7 +152,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 )
+@@ -154,7 +153,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 )
          }
          else if ( compression == UntarCompressionMethod.SNAPPY )
          {
 -            return new SnappyInputStream( istream, true );
-+            throw new UnsupportedOperationException( "This version of plexus-archiver does not support snappy compression" );
++            throw new UnsupportedOperationException( "This version of plexus-archiver does not upport snappy compression" );
          }
          else if ( compression == UntarCompressionMethod.XZ )
          {

plexus-archiver-3.6.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c023487c261e07d11c874bc437a33e2fdefccf679af55cf8c579aa819a9e4f4
-size 564479

plexus-archiver-build.xml

@@ -10,7 +10,7 @@
 
   <property name="project.groupId" value="org.codehaus.plexus"/>
   <property name="project.artifactId" value="plexus-archiver"/>
-  <property name="project.version" value="3.6.0"/>
+  <property name="project.version" value="4.2.1"/>
 
   <property name="compiler.source" value="1.7"/>
   <property name="compiler.target" value="${compiler.source}"/>
@@ -32,18 +32,11 @@
 
   <path id="build.classpath">
     <fileset dir="lib">
-      <!-- plexus-container-default-1.0-alpha-30 plexus-classworlds-1.2-alpha-9
-           plexus-utils-3.1.0 plexus-io-3.0.1 commons-io-2.6
-           commons-compress-1.16.1 objenesis-2.6 jsr305-3.0.2 -->
       <include name="**/*"/>
     </fileset>
   </path>
   <path id="build.test.classpath">
     <fileset dir="lib">
-      <!-- plexus-container-default-1.0-alpha-30 plexus-classworlds-1.2-alpha-9
-           plexus-utils-3.1.0 plexus-io-3.0.1 commons-io-2.6
-           commons-compress-1.16.1 objenesis-2.6 jsr305-3.0.2
-           junit-4.12 hamcrest-core-1.3 xz-1.8 -->
       <include name="**/*"/>
     </fileset>
   </path>

plexus-archiver.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Nov 24 14:42:08 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 4.2.1
+- Modified patch:
+  * 0001-Remove-support-for-snappy.patch
+    + rediff to changed context
+
 -------------------------------------------------------------------
 Mon Apr  1 23:12:20 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

plexus-archiver.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-archiver
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %bcond_with tests
 %bcond_with snappy
 Name:           plexus-archiver
-Version:        3.6.0
+Version:        4.2.1
 Release:        0
 Summary:        Plexus Archiver Component
 License:        Apache-2.0
@@ -35,9 +35,9 @@ BuildRequires:  apache-commons-io
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local
 BuildRequires:  jsr-305
-BuildRequires:  plexus-containers-container-default
+BuildRequires:  plexus-containers-container-default >= 2.1
-BuildRequires:  plexus-io
+BuildRequires:  plexus-io >= 3.2
-BuildRequires:  plexus-utils
+BuildRequires:  plexus-utils >= 3.3
 BuildRequires:  xz-java
 Requires:       mvn(org.apache.commons:commons-compress)
 Requires:       mvn(org.codehaus.plexus:plexus-io)