diff --git a/maven-resolver-1.3.1-java8compat.patch b/maven-resolver-1.3.1-java8compat.patch index be53a6b..52f423a 100644 --- a/maven-resolver-1.3.1-java8compat.patch +++ b/maven-resolver-1.3.1-java8compat.patch @@ -1,96 +1,100 @@ ---- maven-resolver-1.3.1/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java 2018-11-01 17:20:57.663142972 +0100 -+++ maven-resolver-1.3.1/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java 2018-11-16 12:47:37.324328358 +0100 +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; + 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 ); - } - + { + 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(); - } - } - ---- maven-resolver-1.3.1/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java 2018-11-01 17:20:57.667142992 +0100 -+++ maven-resolver-1.3.1/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java 2018-11-16 12:53:34.318211356 +0100 + { + 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; - + 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 ) ---- maven-resolver-1.3.1/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java 2018-11-01 17:20:57.691143110 +0100 -+++ maven-resolver-1.3.1/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java 2018-11-16 12:51:22.725517276 +0100 + { + 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; - + 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 ); - } - } ---- maven-resolver-1.3.1/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java 2018-11-01 17:20:57.695143130 +0100 -+++ maven-resolver-1.3.1/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java 2018-11-16 12:50:32.565252686 +0100 + 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; - + 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 ) + { + try + { +- buffer.rewind(); +- buffer.limit( bytes ); ++ ((Buffer)buffer).rewind(); ++ ((Buffer)buffer).limit( bytes ); + listener.progressed( buffer ); + } + catch ( Exception e ) diff --git a/maven-resolver-1.4.1-source-release.zip b/maven-resolver-1.4.1-source-release.zip deleted file mode 100644 index 9b107a5..0000000 --- a/maven-resolver-1.4.1-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:941ef5a059fd469ffab2e835c762a4d487f31d2a64736bd6f304baa896c261c9 -size 1344636 diff --git a/maven-resolver-1.4.2-source-release.zip b/maven-resolver-1.4.2-source-release.zip new file mode 100644 index 0000000..f36b5df --- /dev/null +++ b/maven-resolver-1.4.2-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88714e1bd1983f763ce93a6a096b00b2205726bddcee1f548cfe5598f37ae644 +size 1335490 diff --git a/maven-resolver-build.tar.xz b/maven-resolver-build.tar.xz index b5e23c2..bd49828 100644 --- a/maven-resolver-build.tar.xz +++ b/maven-resolver-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1052b5e7d9f775a8e4535ec938f22a07f496231a0a3479d44dd668152f5a8099 -size 5388 +oid sha256:83df9a89af0917b698feab69cba61215dd92ecef6a2342f24f7fe42f7d819508 +size 5528 diff --git a/maven-resolver.changes b/maven-resolver.changes index 0804247..77f3fe3 100644 --- a/maven-resolver.changes +++ b/maven-resolver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 29 09:03:53 UTC 2020 - Wang Jun + +- Upgrade to upstream version 1.4.2 + ------------------------------------------------------------------- Mon Dec 9 15:35:35 UTC 2019 - Fridrich Strba diff --git a/maven-resolver.spec b/maven-resolver.spec index 63be010..5a67dbc 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,7 +1,7 @@ # # spec file for package maven-resolver # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_with tests Name: maven-resolver -Version: 1.4.1 +Version: 1.4.2 Release: 0 Summary: Apache Maven Artifact Resolver library License: Apache-2.0