diff --git a/0001-Compatibility-with-Maven-3.0.3-and-later.patch b/0001-Compatibility-with-Maven-3.0.3-and-later.patch index 1e63977..beb2f75 100644 --- a/0001-Compatibility-with-Maven-3.0.3-and-later.patch +++ b/0001-Compatibility-with-Maven-3.0.3-and-later.patch @@ -1,17 +1,8 @@ -From e5f2d4a0133d598bc12b9d76292f6cf0c62448bf Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 12 Oct 2015 13:28:56 +0200 -Subject: [PATCH] Compatibility with Maven 3.0.3 and later - ---- - .../internal/Maven31ArtifactRepositoryAdapter.java | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java -index 5de5dbb..11b7453 100644 ---- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java -+++ b/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java -@@ -19,6 +19,7 @@ package org.apache.maven.shared.dependencies.collect.internal; +diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java +index 854cf4a..846559a 100644 +--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java ++++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java +@@ -19,6 +19,7 @@ package org.apache.maven.shared.transfer.dependencies.collect.internal; * under the License. */ @@ -19,7 +10,7 @@ index 5de5dbb..11b7453 100644 import java.util.List; import org.apache.maven.artifact.Artifact; -@@ -263,4 +264,23 @@ public class Maven31ArtifactRepositoryAdapter implements ArtifactRepository +@@ -263,4 +264,23 @@ class Maven31ArtifactRepositoryAdapter implements ArtifactRepository } return true; } @@ -43,6 +34,3 @@ index 5de5dbb..11b7453 100644 + } + } } --- -2.7.4 - diff --git a/maven-artifact-transfer-0.11.0-source-release.zip b/maven-artifact-transfer-0.11.0-source-release.zip new file mode 100644 index 0000000..34df984 --- /dev/null +++ b/maven-artifact-transfer-0.11.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8217cd5e2300c677d5d23fe6cc8de57c180738fd72834a231af0047ca1f2c347 +size 193812 diff --git a/maven-artifact-transfer-0.9.0-source-release.zip b/maven-artifact-transfer-0.9.0-source-release.zip deleted file mode 100644 index 9023a91..0000000 --- a/maven-artifact-transfer-0.9.0-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55e88206a9c6016565cf7462dae436435a5a3e80dbb253d0c8b1a83c957104a3 -size 120285 diff --git a/maven-artifact-transfer-build.xml b/maven-artifact-transfer-build.xml index 51cda5e..66c2194 100644 --- a/maven-artifact-transfer-build.xml +++ b/maven-artifact-transfer-build.xml @@ -8,14 +8,14 @@ - + - + diff --git a/maven-artifact-transfer.changes b/maven-artifact-transfer.changes index 7643ee6..982a038 100644 --- a/maven-artifact-transfer.changes +++ b/maven-artifact-transfer.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 21 18:59:34 UTC 2019 - Fridrich Strba + +- Upgrade to upstream version 0.11.0 +- Modified patch: + * 0001-Compatibility-with-Maven-3.0.3-and-later.patch + + rediff to changed context + ------------------------------------------------------------------- Tue Mar 26 10:32:40 UTC 2019 - Fridrich Strba diff --git a/maven-artifact-transfer.spec b/maven-artifact-transfer.spec index b6986f2..0e18ac8 100644 --- a/maven-artifact-transfer.spec +++ b/maven-artifact-transfer.spec @@ -1,7 +1,7 @@ # # spec file for package maven-artifact-transfer # -# 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 @@ -18,7 +18,7 @@ %bcond_with tests Name: maven-artifact-transfer -Version: 0.9.0 +Version: 0.11.0 Release: 0 Summary: Apache Maven Artifact Transfer License: Apache-2.0 @@ -28,7 +28,8 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{ Source1: %{name}-build.xml Patch0: 0001-Compatibility-with-Maven-3.0.3-and-later.patch BuildRequires: ant -BuildRequires: apache-commons-cli apache-commons-codec +BuildRequires: apache-commons-cli +BuildRequires: apache-commons-codec BuildRequires: atinject BuildRequires: fdupes BuildRequires: google-guice