This commit is contained in:
parent
27fc68ff12
commit
11ee017250
@ -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
|
|
||||||
|
|
||||||
---
|
|
||||||
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
|
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 2f5965d..0b1d111 100644
|
||||||
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
|
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
|
||||||
+++ b/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;
|
@@ -41,8 +41,8 @@ import org.codehaus.plexus.archiver.jar.JarArchiver;
|
||||||
import org.codehaus.plexus.archiver.jar.JarArchiver;
|
|
||||||
import org.codehaus.plexus.archiver.jar.ManifestException;
|
import org.codehaus.plexus.archiver.jar.ManifestException;
|
||||||
|
import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
-import org.sonatype.aether.RepositorySystemSession;
|
-import org.sonatype.aether.RepositorySystemSession;
|
||||||
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
|
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
|
||||||
+import org.eclipse.aether.DefaultRepositorySystemSession;
|
|
||||||
+import org.eclipse.aether.RepositorySystemSession;
|
+import org.eclipse.aether.RepositorySystemSession;
|
||||||
|
+import org.eclipse.aether.DefaultRepositorySystemSession;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
--
|
|
||||||
2.13.5
|
|
||||||
|
|
||||||
|
@ -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
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:7bfa7abaad1ac413fa42a6ade1a4b34253e217c0a0e51d05ffce497168e86434
|
|
||||||
size 129822
|
|
3
maven-archiver-3.5.0-source-release.zip
Normal file
3
maven-archiver-3.5.0-source-release.zip
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:7cd12342dfe51332257ed916bb83f5cb2d0a68cd97693fe6cd2b1521f1ec0488
|
||||||
|
size 138877
|
@ -10,11 +10,11 @@
|
|||||||
|
|
||||||
<property name="project.groupId" value="org.apache.maven"/>
|
<property name="project.groupId" value="org.apache.maven"/>
|
||||||
<property name="project.artifactId" value="maven-archiver"/>
|
<property name="project.artifactId" value="maven-archiver"/>
|
||||||
<property name="project.version" value="3.2.0"/>
|
<property name="project.version" value="3.5.0"/>
|
||||||
<property name="project.name" value="Apache Maven Archiver"/>
|
<property name="project.name" value="Apache Maven Archiver"/>
|
||||||
<property name="project.organization.name" value="The Apache Software Foundation"/>
|
<property name="project.organization.name" value="The Apache Software Foundation"/>
|
||||||
|
|
||||||
<property name="spec.version" value="3.2"/>
|
<property name="spec.version" value="3.5"/>
|
||||||
|
|
||||||
<property name="compiler.source" value="1.6"/>
|
<property name="compiler.source" value="1.6"/>
|
||||||
<property name="compiler.target" value="${compiler.source}"/>
|
<property name="compiler.target" value="${compiler.source}"/>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package maven-archiver
|
# spec file for package maven-archiver
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
%bcond_with tests
|
%bcond_with tests
|
||||||
Name: maven-archiver
|
Name: maven-archiver
|
||||||
Version: 3.2.0
|
Version: 3.5.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Maven Archiver
|
Summary: Maven Archiver
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -27,21 +27,19 @@ URL: http://maven.apache.org/shared/maven-archiver/
|
|||||||
Source0: http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
Source0: http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||||
Source1: %{name}-build.xml
|
Source1: %{name}-build.xml
|
||||||
Patch0: 0001-Port-tests-to-Eclipse-Aether.patch
|
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: ant
|
BuildRequires: ant
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: maven-lib
|
BuildRequires: maven-lib
|
||||||
BuildRequires: maven-shared-utils
|
BuildRequires: maven-shared-utils
|
||||||
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
|
BuildRequires: plexus-archiver >= 4.2.0
|
||||||
BuildRequires: plexus-archiver
|
BuildRequires: plexus-interpolation >= 1.25
|
||||||
BuildRequires: plexus-interpolation
|
BuildRequires: plexus-utils >= 3.3.0
|
||||||
BuildRequires: sisu-plexus
|
BuildRequires: sisu-plexus
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
BuildRequires: xmvn-install
|
BuildRequires: xmvn-install
|
||||||
BuildRequires: xmvn-resolve
|
BuildRequires: xmvn-resolve
|
||||||
|
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
BuildRequires: ant-junit
|
BuildRequires: ant-junit
|
||||||
@ -68,7 +66,6 @@ Javadoc for %{name}.
|
|||||||
%setup -q
|
%setup -q
|
||||||
cp %{SOURCE1} build.xml
|
cp %{SOURCE1} build.xml
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir -p lib
|
mkdir -p lib
|
||||||
|
Loading…
Reference in New Issue
Block a user