Update to 3.5.2

(cherry picked from commit 754ad082f962d4298f63afb879690b3a53854266)
This commit is contained in:
wk333 2022-03-09 17:31:52 +08:00 committed by openeuler-sync-bot
parent 991625f400
commit a972ec254d
4 changed files with 5 additions and 58 deletions

View File

@ -1,27 +0,0 @@
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
---
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

View File

@ -1,26 +0,0 @@
From 41e715cab5cfbd0373de2568ed9c6d022c3b403c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
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

View File

@ -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 <wangkai385@huawei.com> - 0:3.5.2-1
- Update to 3.5.2
* Tue Feb 18 2020 lihao <lihao129@huawei.com> - 0:3.2.0-5
- Package init