From 56fc14b7140b63783bb7077a01e12361afc65e34 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Nov 01 2019 21:17:12 +0000
Subject: update to version 3.5.0


---

diff --git a/.gitignore b/.gitignore
index eb454d1..d92e02a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,11 @@
-maven-archiver-2.2-src.tgz
-maven-archiver-2.4-src.tar.bz2
-maven-archiver-2.4.1-src.tar.xz
-maven-archiver-2.4.2-source-release.zip
-maven-archiver-2.5-source-release.zip
+/results_*
+/*.src.rpm
+
+/maven-archiver-2.2-src.tgz
+/maven-archiver-2.4-src.tar.bz2
+/maven-archiver-2.4.1-src.tar.xz
+/maven-archiver-2.4.2-source-release.zip
+/maven-archiver-2.5-source-release.zip
 /maven-archiver-2.6-source-release.zip
 /maven-archiver-3.0.0-source-release.zip
 /maven-archiver-3.0.1-source-release.zip
@@ -10,3 +13,4 @@ maven-archiver-2.5-source-release.zip
 /maven-archiver-3.1.1-source-release.zip
 /maven-archiver-3.2.0-source-release.zip
 /maven-archiver-3.4.0-source-release.zip
+/maven-archiver-3.5.0-source-release.zip
diff --git a/0001-Port-tests-to-Eclipse-Aether.patch b/0001-Port-tests-to-Eclipse-Aether.patch
index a31f7d0..2a73890 100644
--- a/0001-Port-tests-to-Eclipse-Aether.patch
+++ b/0001-Port-tests-to-Eclipse-Aether.patch
@@ -1,27 +1,15 @@
-From 160539b184376a4fc8ec29765f5278307a41d16e Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Mon, 19 Oct 2015 14:09:26 +0200
-Subject: [PATCH 1/2] Port tests to Eclipse Aether
-
----
- .../java/org/apache/maven/archiver/MavenArchiverTest.java     | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
 diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
-index cd5d05c..bef8529 100644
+index 2f5965d..0b1d111 100644
 --- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
 +++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
 @@ -41,8 +41,8 @@ import org.codehaus.plexus.archiver.jar.JarArchiver;
- import org.codehaus.plexus.archiver.jar.ManifestException;
- import org.junit.Ignore;
- import org.junit.Test;
--import org.sonatype.aether.RepositorySystemSession;
--import org.sonatype.aether.util.DefaultRepositorySystemSession;
-+import org.eclipse.aether.RepositorySystemSession;
-+import org.eclipse.aether.DefaultRepositorySystemSession;
- 
- import java.io.File;
- import java.io.IOException;
--- 
-2.20.1
-
+ import org.codehaus.plexus.archiver.jar.ManifestException;
+ import org.junit.Ignore;
+ import org.junit.Test;
+-import org.sonatype.aether.RepositorySystemSession;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.eclipse.aether.RepositorySystemSession;
++import org.eclipse.aether.DefaultRepositorySystemSession;
+ 
+ import java.io.File;
+ import java.io.IOException;
diff --git a/maven-archiver.spec b/maven-archiver.spec
index 82f77be..5b020a1 100644
--- a/maven-archiver.spec
+++ b/maven-archiver.spec
@@ -1,5 +1,5 @@
 Name:           maven-archiver
-Version:        3.4.0
+Version:        3.5.0
 Release:        1%{?dist}
 Epoch:          0
 Summary:        Maven Archiver
@@ -20,9 +20,9 @@ BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
 BuildRequires:  mvn(org.assertj:assertj-core)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver) >= 4.1.0
-BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver) >= 4.2.0
+BuildRequires:  mvn(org.codehaus.plexus:plexus-interpolation) >= 1.25
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils) >= 3.3.0
 
 %description
 The Maven Archiver is used by other Maven plugins
@@ -51,6 +51,9 @@ Javadoc for %{name}.
 %doc LICENSE NOTICE
 
 %changelog
+* Fri Nov 01 2019 Fabio Valentini <decathorpe@gmail.com> - 0:3.5.0-1
+- Update to version 3.5.0.
+
 * Thu Aug 08 2019 Marian Koncek <mkoncek@redhat.com> - 0:3.4.0-1
 - Update to upstream version 3.4.0
 - Fixes: RHBZ #1680430
diff --git a/sources b/sources
index 3099814..82116ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (maven-archiver-3.4.0-source-release.zip) = fd55377c730e5a8399dacfc6b05a52600807a55f12a27060323758502797e06d9d81901854ab1333df3a60650a685e40125c2ffeb1835807ab0da53708900906
+SHA512 (maven-archiver-3.5.0-source-release.zip) = c6b6c05bf759c9302de457a0ac8cec4037db928f8e6e3a9f48fc6d641b685f29ad6dc0142eeb3363136416f38785943d7bc1fa10f74a6784930d34f0fd4bd77b