[maven-plugin-tools] Update to upstream version 3.4
Michael Šimáček
msimacek at fedoraproject.org
Mon Mar 16 13:50:00 UTC 2015
commit 22915b1d820eef294897322dd08a5cebb7461c35
Author: Michael Simacek <msimacek at redhat.com>
Date: Mon Mar 16 14:48:53 2015 +0100
Update to upstream version 3.4
.gitignore | 1 +
0001-Avoid-duplicate-MOJO-parameters.patch | 28 ++---
0002-Port-to-QDox-2.0.patch | 176 -----------------------------
maven-plugin-tools.spec | 20 ++--
sources | 2 +-
5 files changed, 25 insertions(+), 202 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7189db8..447d3e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ maven-plugin-tools-2.6.tar.xz
maven-plugin-tools-2.7-source-release.zip
/maven-plugin-tools-3.1-source-release.zip
/maven-plugin-tools-3.3-source-release.zip
+/maven-plugin-tools-3.4-source-release.zip
diff --git a/0001-Avoid-duplicate-MOJO-parameters.patch b/0001-Avoid-duplicate-MOJO-parameters.patch
index 88c4168..183695b 100644
--- a/0001-Avoid-duplicate-MOJO-parameters.patch
+++ b/0001-Avoid-duplicate-MOJO-parameters.patch
@@ -1,17 +1,17 @@
-From d72e785c46305fe00eb126d315d2dfe4b98f458a Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk at redhat.com>
-Date: Mon, 13 Oct 2014 11:50:26 +0200
-Subject: [PATCH 1/2] Avoid duplicate MOJO parameters
+From d4974142b5123f3dbe23ea9ca9399e7f0bc2f99e Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek at redhat.com>
+Date: Mon, 16 Mar 2015 14:29:21 +0100
+Subject: [PATCH] Avoid duplicate MOJO parameters
---
.../JavaAnnotationsMojoDescriptorExtractor.java | 24 ++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
-diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
-index d595438..ed3a17f 100644
---- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
-+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
-@@ -61,6 +61,7 @@ import java.util.Collection;
+diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
+index a9c8ccf..7a7e70a 100644
+--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
++++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
+@@ -29,6 +29,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -19,7 +19,7 @@ index d595438..ed3a17f 100644
import java.util.List;
import java.util.Map;
import java.util.Set;
-@@ -554,7 +555,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
+@@ -573,7 +574,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
parameter.setSince( parameterAnnotationContent.getSince() );
parameter.setRequired( parameterAnnotationContent.required() );
@@ -28,7 +28,7 @@ index d595438..ed3a17f 100644
}
// Component annotations
-@@ -594,7 +595,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
+@@ -614,7 +615,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
//parameter.setRequired( ... );
parameter.setEditable( false );
@@ -37,7 +37,7 @@ index d595438..ed3a17f 100644
}
mojoDescriptor.setPluginDescriptor( pluginDescriptor );
-@@ -604,6 +605,25 @@ public class JavaAnnotationsMojoDescriptorExtractor
+@@ -624,6 +625,25 @@ public class JavaAnnotationsMojoDescriptorExtractor
return mojoDescriptors;
}
@@ -61,8 +61,8 @@ index d595438..ed3a17f 100644
+ }
+
protected ExecuteAnnotationContent findExecuteInParentHierarchy( MojoAnnotatedClass mojoAnnotatedClass,
- Map<String, MojoAnnotatedClass> mojoAnnotatedClasses )
+ Map<String, MojoAnnotatedClass> mojoAnnotatedClasses )
{
--
-1.9.3
+2.1.0
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index e57d5bd..7b15bc4 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,6 +1,6 @@
Name: maven-plugin-tools
-Version: 3.3
-Release: 4%{?dist}
+Version: 3.4
+Release: 1%{?dist}
Epoch: 0
Summary: Maven Plugin Tools
License: ASL 2.0
@@ -10,7 +10,6 @@ BuildArch: noarch
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip
Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
-Patch1: 0002-Port-to-QDox-2.0.patch
BuildRequires: maven-local
BuildRequires: mvn(com.sun:tools)
@@ -170,10 +169,6 @@ API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-
-# For easier installation
-ln -s maven-script/maven-script-{ant,beanshell} .
# For com.sun:tools use scope "compile" instead of "system"
%pom_remove_dep com.sun:tools maven-plugin-tools-javadoc
@@ -195,13 +190,13 @@ ln -s maven-script/maven-script-{ant,beanshell} .
%pom_change_dep :maven-project :maven-core maven-plugin-tools-annotations
%pom_change_dep :maven-plugin-descriptor :maven-compat maven-plugin-tools-annotations
-%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-ant
-%pom_change_dep :maven-project :maven-core maven-plugin-tools-ant
+%pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-ant
+%pom_change_dep :maven-project :maven-core maven-script/maven-plugin-tools-ant
%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-api
%pom_change_dep :maven-project :maven-core maven-plugin-tools-api
-%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-beanshell
+%pom_remove_dep :maven-plugin-descriptor maven-script/maven-plugin-tools-beanshell
%pom_remove_dep :maven-project maven-plugin-tools-generators
%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-generators
@@ -209,7 +204,7 @@ ln -s maven-script/maven-script-{ant,beanshell} .
%pom_change_dep :maven-project :maven-core maven-plugin-tools-java
%pom_remove_dep :maven-plugin-descriptor maven-plugin-tools-java
-%pom_change_dep :maven-plugin-descriptor :maven-plugin-api maven-plugin-tools-model
+%pom_change_dep :maven-plugin-descriptor :maven-plugin-api maven-script/maven-plugin-tools-model
%pom_remove_dep :maven-project maven-script/maven-script-ant
%pom_remove_dep :maven-plugin-descriptor maven-script/maven-script-ant
@@ -260,6 +255,9 @@ ln -s maven-script/maven-script-{ant,beanshell} .
%changelog
+* Mon Mar 16 2015 Michael Simacek <msimacek at redhat.com> - 0:3.4-1
+- Update to upstream version 3.4
+
* Tue Oct 28 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:3.3-4
- Port to QDox 2.0
diff --git a/sources b/sources
index 1af8a59..134c8f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-221733f6197b04a0f6cf11ef40443fcd maven-plugin-tools-3.3-source-release.zip
+275fd44c09bb5bef45548cafafdde270 maven-plugin-tools-3.4-source-release.zip
More information about the scm-commits
mailing list