Update to upstream version 3.0.0
This commit is contained in:
Mikolaj Izdebski
parent
3612713ea2
commit
1df6456bb5
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@ maven-assembly-plugin-2.2.2-source-release.zip
|
||||
/maven-assembly-plugin-2.5.4-source-release.zip
|
||||
/maven-assembly-plugin-2.5.5-source-release.zip
|
||||
/maven-assembly-plugin-2.6-source-release.zip
|
||||
/maven-assembly-plugin-3.0.0-source-release.zip
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 350af4a332d6997562e3f6615202a4bdcb6bca4d Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Tue, 10 Nov 2015 07:15:10 +0100
|
||||
Subject: [PATCH 1/2] Port to Maven Filtering 3.0.0
|
||||
|
||||
---
|
||||
.../java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java b/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
|
||||
index b87ebf2..1f9cf0c 100644
|
||||
--- a/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
|
||||
+++ b/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
|
||||
@@ -52,7 +52,7 @@ public class ReaderFormatter
|
||||
|
||||
MavenReaderFilterRequest filterRequest =
|
||||
new MavenReaderFilterRequest( source, true, configSource.getProject(), configSource.getFilters(),
|
||||
- isPropertiesFile, null, configSource.getMavenSession(), null );
|
||||
+ isPropertiesFile, configSource.getMavenSession(), null );
|
||||
filterRequest.setEscapeString( escapeString );
|
||||
|
||||
// if these are NOT set, just use the defaults, which are '${*}' and '@'.
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From be43efd76b419807c183f691c7b52849f9a48211 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Tue, 5 Jan 2016 09:53:09 +0100
|
||||
Subject: [PATCH 2/2] Port to Maven Shared IO 3.0.0
|
||||
|
||||
---
|
||||
.../java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java b/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
|
||||
index 1030ed8..f8681fa 100644
|
||||
--- a/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
|
||||
+++ b/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
|
||||
@@ -137,7 +137,7 @@ public class DefaultAssemblyReader
|
||||
if ( ( descriptorSourceDirectory != null ) && descriptorSourceDirectory.isDirectory() )
|
||||
{
|
||||
locator.setStrategies(
|
||||
- Collections.singletonList( new RelativeFileLocatorStrategy( descriptorSourceDirectory ) ) );
|
||||
+ Collections.<LocatorStrategy>singletonList( new RelativeFileLocatorStrategy( descriptorSourceDirectory ) ) );
|
||||
|
||||
final DirectoryScanner scanner = new DirectoryScanner();
|
||||
scanner.setBasedir( descriptorSourceDirectory );
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: maven-assembly-plugin
|
||||
Version: 2.6
|
||||
Release: 8%{?dist}
|
||||
Version: 3.0.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Maven Assembly Plugin
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/plugins/maven-assembly-plugin/
|
||||
@ -8,14 +8,9 @@ BuildArch: noarch
|
||||
|
||||
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
# Patch merged upstream: https://issues.apache.org/jira/browse/MASSEMBLY-790
|
||||
# https://github.com/apache/maven-plugins/commit/18e37d5.patch
|
||||
Patch0: 0001-Port-to-Maven-Filtering-3.0.0.patch
|
||||
# Not forwarded - problem not reproducible with latest upstream SVN trunk
|
||||
Patch1: 0002-Port-to-Maven-Shared-IO-3.0.0.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.google.code.findbugs:jsr305)
|
||||
BuildRequires: mvn(commons-codec:commons-codec)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(org.apache.maven:maven-archiver)
|
||||
BuildRequires: mvn(org.apache.maven:maven-artifact)
|
||||
@ -25,9 +20,9 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.shared:file-management)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-filtering)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-repository-builder)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-shared-io)
|
||||
BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
|
||||
@ -49,11 +44,6 @@ This package provides %{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%pom_xpath_set pom:mavenVersion 3.3.3
|
||||
%pom_remove_dep :maven-project
|
||||
|
||||
%build
|
||||
# Tests need easymockclassextension version 2.x, which is incompatible
|
||||
@ -64,13 +54,15 @@ This package provides %{summary}.
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%dir %{_javadir}/%{name}
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Thu Nov 17 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-1
|
||||
- Update to upstream version 3.0.0
|
||||
|
||||
* Thu Jun 30 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.6-8
|
||||
- Compile against Maven 3 APIs
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user