pool/maven-resolver
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resolver?expand=0&rev=18

Browse Source
This commit is contained in:
Fridrich Strba 2021-10-22 14:14:34 +00:00 committed by Git OBS Bridge
parent 9e7ecdc639
commit 1483d730ed
5 changed files with 6 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
maven-resolver-1.3.1-java8compat.patch
View File

@ -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 )

3
maven-resolver-1.6.2-source-release.zip
View File

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

3
maven-resolver-1.6.3-source-release.zip Normal file
View File

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

4
maven-resolver-build.tar.xz
View File

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

4
maven-resolver.spec
View File

@ -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