From d5970479191a7e07c20d6daff746588cd5af19d2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: May 24 2019 13:01:17 +0000 Subject: Revert "Update to upstream version 0.11.0" This reverts commit b693768b05d896855d5e2a429da12768b2588036. --- diff --git a/.gitignore b/.gitignore index ebbfcf1..08eb295 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /maven-artifact-transfer-3.0-SNAPSHOT-source-release.zip /maven-artifact-transfer-3.0.0-SNAPSHOT-source-release.zip /maven-artifact-transfer-0.9.0-source-release.zip -/maven-artifact-transfer-0.11.0-source-release.zip 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 1de92d9..ad62b6c 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,17 @@ -From 8e48cf176ad72f9af0aad3eb572f97c38dddfed2 Mon Sep 17 00:00:00 2001 +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 --- - .../Maven31ArtifactRepositoryAdapter.java | 20 +++++++++++++++++++ + .../internal/Maven31ArtifactRepositoryAdapter.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) -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; +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; * under the License. */ @@ -19,7 +19,7 @@ index 854cf4a..846559a 100644 import java.util.List; import org.apache.maven.artifact.Artifact; -@@ -263,4 +264,23 @@ class Maven31ArtifactRepositoryAdapter implements ArtifactRepository +@@ -263,4 +264,23 @@ public class Maven31ArtifactRepositoryAdapter implements ArtifactRepository } return true; } @@ -44,5 +44,5 @@ index 854cf4a..846559a 100644 + } } -- -2.21.0 +2.7.4 diff --git a/maven-artifact-transfer.spec b/maven-artifact-transfer.spec index 1762dc0..af2f03c 100644 --- a/maven-artifact-transfer.spec +++ b/maven-artifact-transfer.spec @@ -1,6 +1,6 @@ Name: maven-artifact-transfer -Version: 0.11.0 -Release: 1%{?dist} +Version: 0.9.0 +Release: 4%{?dist} Epoch: 1 Summary: Apache Maven Artifact Transfer License: ASL 2.0 @@ -14,17 +14,16 @@ Patch0: 0001-Compatibility-with-Maven-3.0.3-and-later.patch BuildRequires: maven-local BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.eclipse.aether:aether-api) BuildRequires: mvn(org.eclipse.aether:aether-impl) BuildRequires: mvn(org.eclipse.aether:aether-util) -BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.slf4j:slf4j-api) @@ -63,9 +62,6 @@ find -name Maven30\*.java -delete %license LICENSE NOTICE %changelog -* Tue May 14 2019 Mikolaj Izdebski - 1:0.11.0-1 -- Update to upstream version 0.11.0 - * Thu Feb 08 2018 Fedora Release Engineering - 1:0.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 5d35c67..64ff62d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-artifact-transfer-0.11.0-source-release.zip) = daccd4844ebc389d8e269be41b59c0754a473da9b447c86556b6c80b0208f3b08bc822372d4c6055a09b4130665cb7803b807e427daf160bc29d20d026c85963 +SHA512 (maven-artifact-transfer-0.9.0-source-release.zip) = f16c05935113957f1da601129d6f06298da4754fda6a387f161585925a283cce49a4fdc3fbd1219e0c526c0d34647785f3751872c6b2f43aa2c08f8f9efa3514