diff --git a/0001-Port-tests-to-Eclipse-Aether.patch b/0001-Port-tests-to-Eclipse-Aether.patch new file mode 100644 index 0000000..d263dc8 --- /dev/null +++ b/0001-Port-tests-to-Eclipse-Aether.patch @@ -0,0 +1,27 @@ +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 new file mode 100644 index 0000000..e03b90a --- /dev/null +++ b/0002-MSHARED-448-Skip-failing-assertion.patch @@ -0,0 +1,26 @@ +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.2.0-source-release.zip new file mode 100644 index 0000000..45ed0e2 Binary files /dev/null and b/maven-archiver-3.2.0-source-release.zip differ diff --git a/maven-archiver.spec b/maven-archiver.spec new file mode 100644 index 0000000..e916228 --- /dev/null +++ b/maven-archiver.spec @@ -0,0 +1,44 @@ +Name: maven-archiver +Epoch: 0 +Version: 3.2.0 +Release: 5 +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 + +Provides: %{name}-javadoc = %{version}-%{release} +Obsoletes: %{name}-javadoc < %{version}-%{release} + +%description +Provides utility methods for creating JARs and other archive files from a Maven project. + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m" +%mvn_build + +%install +%mvn_install + +%files +%defattr(-,root,root) +%doc NOTICE +%license LICENSE +%{_datadir}/java/* +%{_datadir}/javadoc/* +%{_datadir}/maven-poms/* +%{_datadir}/maven-metadata/* + +%changelog +* Tue Feb 18 2020 lihao - 0:3.2.0-5 +- Package init