diff --git a/0001-Port-tests-to-Eclipse-Aether.patch b/0001-Port-tests-to-Eclipse-Aether.patch deleted file mode 100644 index d263dc8..0000000 --- a/0001-Port-tests-to-Eclipse-Aether.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 160539b184376a4fc8ec29765f5278307a41d16e Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 19 Oct 2015 14:09:26 +0200 -Subject: [PATCH 1/2] Port tests to Eclipse Aether - ---- - src/test/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 e877492..24ba9b1 100644 ---- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java -+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java -@@ -40,8 +40,8 @@ import org.codehaus.plexus.PlexusContainer; - import org.codehaus.plexus.archiver.jar.JarArchiver; - import org.codehaus.plexus.archiver.jar.ManifestException; - import org.junit.Test; --import org.sonatype.aether.RepositorySystemSession; --import org.sonatype.aether.util.DefaultRepositorySystemSession; -+import org.eclipse.aether.DefaultRepositorySystemSession; -+import org.eclipse.aether.RepositorySystemSession; - - import java.io.File; - import java.io.IOException; --- -2.13.5 - diff --git a/0002-MSHARED-448-Skip-failing-assertion.patch b/0002-MSHARED-448-Skip-failing-assertion.patch deleted file mode 100644 index e03b90a..0000000 --- a/0002-MSHARED-448-Skip-failing-assertion.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 41e715cab5cfbd0373de2568ed9c6d022c3b403c Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 19 Oct 2015 14:34:53 +0200 -Subject: [PATCH 2/2] MSHARED-448: Skip failing assertion - ---- - src/test/java/org/apache/maven/archiver/MavenArchiverTest.java | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java -index 24ba9b1..cefd00a 100644 ---- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java -+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java -@@ -245,7 +245,8 @@ public class MavenArchiverTest - } - - archiver.createArchive( session, project, config ); -- assertEquals( jarFile.lastModified(), time ); -+ // Test fails (see MSHARED-448) -+ // assertEquals( jarFile.lastModified(), time ); - - config.setForced( true ); - archiver.createArchive( session, project, config ); --- -2.13.5 - diff --git a/maven-archiver-3.2.0-source-release.zip b/maven-archiver-3.5.2-source-release.zip similarity index 58% rename from maven-archiver-3.2.0-source-release.zip rename to maven-archiver-3.5.2-source-release.zip index 45ed0e2..8c223d4 100644 Binary files a/maven-archiver-3.2.0-source-release.zip and b/maven-archiver-3.5.2-source-release.zip differ diff --git a/maven-archiver.spec b/maven-archiver.spec index e916228..fad77df 100644 --- a/maven-archiver.spec +++ b/maven-archiver.spec @@ -1,15 +1,12 @@ Name: maven-archiver Epoch: 0 -Version: 3.2.0 -Release: 5 +Version: 3.5.2 +Release: 1 Summary: Maven Archiver License: ASL 2.0 URL: https://maven.apache.org/shared/maven-archiver/ Source0: http://archive.apache.org/dist/maven/shared/%{name}-%{version}-source-release.zip -Patch0001: 0001-Port-tests-to-Eclipse-Aether.patch -Patch0002: 0002-MSHARED-448-Skip-failing-assertion.patch - BuildArch: noarch BuildRequires: maven-local apache-commons-io junit maven-shared maven-shared-utils BuildRequires: maven-lib assertj-core plexus-archiver plexus-interpolation plexus-utils @@ -40,5 +37,8 @@ export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m" %{_datadir}/maven-metadata/* %changelog +* Wed Mar 09 2022 wangkai - 0:3.5.2-1 +- Update to 3.5.2 + * Tue Feb 18 2020 lihao - 0:3.2.0-5 - Package init