From c8499fee86644c2b969ce521bdd432aab0ac9f2a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Aug 14 2019 13:52:09 +0000 Subject: Update to upstream version 3.4.0 --- diff --git a/.gitignore b/.gitignore index 227dba0..eb454d1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ maven-archiver-2.5-source-release.zip /maven-archiver-3.0.2-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 diff --git a/0001-Port-tests-to-Eclipse-Aether.patch b/0001-Port-tests-to-Eclipse-Aether.patch index d263dc8..a31f7d0 100644 --- a/0001-Port-tests-to-Eclipse-Aether.patch +++ b/0001-Port-tests-to-Eclipse-Aether.patch @@ -4,24 +4,24 @@ 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 ++-- + .../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 +index cd5d05c..bef8529 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; +@@ -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.13.5 +2.20.1 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.spec b/maven-archiver.spec index b302885..82f77be 100644 --- a/maven-archiver.spec +++ b/maven-archiver.spec @@ -1,6 +1,6 @@ Name: maven-archiver -Version: 3.2.0 -Release: 5%{?dist} +Version: 3.4.0 +Release: 1%{?dist} Epoch: 0 Summary: Maven Archiver License: ASL 2.0 @@ -10,9 +10,6 @@ BuildArch: noarch Source0: http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip Patch0: 0001-Port-tests-to-Eclipse-Aether.patch -# Test fails with OpenJDK on Linux -# Reported upstream: https://issues.apache.org/jira/browse/MSHARED-448 -Patch1: 0002-MSHARED-448-Skip-failing-assertion.patch BuildRequires: maven-local BuildRequires: mvn(commons-io:commons-io) @@ -23,7 +20,7 @@ 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) +BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) >= 4.1.0 BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) @@ -40,7 +37,6 @@ Javadoc for %{name}. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %mvn_build @@ -49,12 +45,16 @@ Javadoc for %{name}. %mvn_install %files -f .mfiles -%doc LICENSE NOTICE +%doc LICENSE NOTICE CONTRIBUTING.md README.md %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE %changelog +* Thu Aug 08 2019 Marian Koncek - 0:3.4.0-1 +- Update to upstream version 3.4.0 +- Fixes: RHBZ #1680430 + * Thu Jul 25 2019 Fedora Release Engineering - 0:3.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 65adf41..3099814 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-archiver-3.2.0-source-release.zip) = 63b5dd8fd465a633f2ed953212cf1874d45d830d8033f83e7c752f38d5416193509d8def7227440daef57ca74388f11a7769bb896515890063f9c59f5c91d22b +SHA512 (maven-archiver-3.4.0-source-release.zip) = fd55377c730e5a8399dacfc6b05a52600807a55f12a27060323758502797e06d9d81901854ab1333df3a60650a685e40125c2ffeb1835807ab0da53708900906