Accepting request 946197 from Java:packages

1.6.3

OBS-URL: https://build.opensuse.org/request/show/946197
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-resolver?expand=0&rev=7

maven-resolver-1.3.1-java8compat.patch

@@ -1,100 +0,0 @@
-diff -auNr maven-resolver-1.6.1/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java maven-resolver-1.6.1-new/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
---- maven-resolver-1.6.1/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java	2020-10-02 18:03:58.000000000 +0800
-+++ maven-resolver-1.6.1-new/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java	2020-12-29 15:47:39.477914257 +0800
-@@ -23,6 +23,7 @@
- import java.io.FileInputStream;
- import java.io.IOException;
- import java.io.InputStream;
-+import java.nio.Buffer;
- import java.nio.ByteBuffer;
- import java.security.MessageDigest;
- import java.security.NoSuchAlgorithmException;
-@@ -164,8 +165,8 @@
-                 {
-                     read -= total - dataOffset;
-                 }
--                buffer.rewind();
--                buffer.limit( read );
-+                ((Buffer)buffer).rewind();
-+                ((Buffer)buffer).limit( read );
-                 update( buffer );
-             }
- 
-@@ -199,9 +200,9 @@
-     {
-         for ( Checksum checksum : checksums )
-         {
--            data.mark();
-+            ((Buffer)data).mark();
-             checksum.update( data );
--            data.reset();
-+            ((Buffer)data).reset();
-         }
-     }
- 
-diff -auNr maven-resolver-1.6.1/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java maven-resolver-1.6.1-new/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java
---- maven-resolver-1.6.1/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java	2020-10-02 18:03:58.000000000 +0800
-+++ maven-resolver-1.6.1-new/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java	2020-12-29 15:48:48.477927402 +0800
-@@ -25,6 +25,7 @@
- import java.io.IOException;
- import java.io.InputStream;
- import java.io.OutputStream;
-+import java.nio.Buffer;
- import java.nio.ByteBuffer;
- import java.nio.charset.StandardCharsets;
- 
-@@ -229,8 +230,8 @@
-             {
-                 try
-                 {
--                    buffer.rewind();
--                    buffer.limit( bytes );
-+                    ((Buffer)buffer).rewind();
-+                    ((Buffer)buffer).limit( bytes );
-                     listener.progressed( buffer );
-                 }
-                 catch ( Exception e )
-diff -auNr maven-resolver-1.6.1/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java maven-resolver-1.6.1-new/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
---- maven-resolver-1.6.1/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java	2020-10-02 18:03:58.000000000 +0800
-+++ maven-resolver-1.6.1-new/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java	2020-12-29 15:49:51.541939414 +0800
-@@ -22,6 +22,7 @@
- import java.io.IOException;
- import java.io.InputStream;
- import java.io.OutputStream;
-+import java.nio.Buffer;
- import java.nio.ByteBuffer;
- import java.util.concurrent.atomic.AtomicBoolean;
- 
-@@ -251,8 +252,8 @@
-         for ( int read = is.read( array ); read >= 0; read = is.read( array ) )
-         {
-             os.write( array, 0, read );
--            buffer.rewind();
--            buffer.limit( read );
-+            ((Buffer)buffer).rewind();
-+            ((Buffer)buffer).limit( read );
-             listener.transportProgressed( buffer );
-         }
-     }
-diff -auNr maven-resolver-1.6.1/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java maven-resolver-1.6.1-new/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java
---- maven-resolver-1.6.1/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java	2020-10-02 18:03:58.000000000 +0800
-+++ maven-resolver-1.6.1-new/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java	2020-12-29 15:50:56.921951864 +0800
-@@ -26,6 +26,7 @@
- import java.io.IOException;
- import java.io.InputStream;
- import java.io.OutputStream;
-+import java.nio.Buffer;
- import java.nio.ByteBuffer;
- import java.nio.charset.StandardCharsets;
- 
-@@ -218,8 +219,8 @@
-             {
-                 try
-                 {
--                    buffer.rewind();
--                    buffer.limit( bytes );
-+                    ((Buffer)buffer).rewind();
-+                    ((Buffer)buffer).limit( bytes );
-                     listener.progressed( buffer );
-                 }
-                 catch ( Exception e )

maven-resolver-1.6.2-source-release.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58c42df1833684ebfe4fd523fd3ae6f8403afe89abbe536746334374d9f7ce16
-size 1368808

maven-resolver-1.6.3-source-release.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:352359ccb5dc86706433e19b21aabbb5c07a557312b31243fee0e222ec987405
+size 1368933

maven-resolver-build.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:efdba8286e0a83c020f4b107495b93c9d8774fc953e78b0f1bc879d21d02b591
+oid sha256:bc50d72bb912d00aed4b5c25bb57ef3aadc8061d0c96abd4594133a2202f1f9c
-size 5420
+size 5536

maven-resolver.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jan 13 17:38:54 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 1.6.3
+  * Needed for maven 3.8.4
+- Removed patch:
+  * maven-resolver-1.3.1-java8compat.patch
+    + fixed upstream
+
 -------------------------------------------------------------------
 Tue May 11 15:11:15 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 

maven-resolver.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package maven-resolver
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 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 @@
 %define _buildshell /bin/bash
 %bcond_with tests
 Name:           maven-resolver
-Version:        1.6.2
+Version:        1.6.3
 Release:        0
 Summary:        Apache Maven Artifact Resolver library
 License:        Apache-2.0
@@ -27,7 +27,6 @@ Group:          Development/Libraries/Java
 URL:            http://maven.apache.org/resolver/
 Source0:        http://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip
 Source1:        %{name}-build.tar.xz
-Patch0:         maven-resolver-1.3.1-java8compat.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-lang3
 BuildRequires:  atinject
@@ -143,7 +142,6 @@ This package provides %{summary}.
 
 %prep
 %setup -q -a1
-%patch0 -p1
 
 # pointless plugin
 %pom_remove_plugin :maven-enforcer-plugin