rpms/maven-plugin-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Port to plexus-utils 3.0.24

Browse Source
This commit is contained in:
Mikolaj Izdebski 2016-05-12 09:39:30 +02:00
parent feb6c5cd26
commit 56bf83607e
4 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0001-Avoid-duplicate-MOJO-parameters.patch
View File

@ -1,7 +1,7 @@
From d4974142b5123f3dbe23ea9ca9399e7f0bc2f99e Mon Sep 17 00:00:00 2001
From 6a2a63169b7b681decc03bfa36a3cbcd22b997b6 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 16 Mar 2015 14:29:21 +0100
Subject: [PATCH 1/2] Avoid duplicate MOJO parameters
Subject: [PATCH 1/3] Avoid duplicate MOJO parameters
---
.../JavaAnnotationsMojoDescriptorExtractor.java | 24 ++++++++++++++++++++--
@ -64,5 +64,5 @@ index a9c8ccf..7a7e70a 100644
Map<String, MojoAnnotatedClass> mojoAnnotatedClasses )
{
--
2.1.0
2.5.5

6
0002-Deal-with-nulls-from-getComment.patch
View File

@ -1,7 +1,7 @@
From 9b30ecf988467f5310ef591f0a9f73ac989bb766 Mon Sep 17 00:00:00 2001
From fddeb4bc426706363023ede3f635ea716990b980 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 16 Mar 2015 16:42:20 +0100
Subject: [PATCH 2/2] Deal with nulls from getComment
Subject: [PATCH 2/3] Deal with nulls from getComment
---
.../annotations/JavaAnnotationsMojoDescriptorExtractor.java | 6 +++---
@ -62,5 +62,5 @@ index 7dbd0ef..1bc0158 100644
DocletTag deprecationTag = field.getTagByName( JavadocMojoAnnotation.DEPRECATED );
--
2.1.0
2.5.5

33
0003-Port-to-plexus-utils-3.0.24.patch Normal file
View File

@ -0,0 +1,33 @@
From b48d02316156d3d12e65f209210050bc1026b10c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 12 May 2016 09:36:10 +0200
Subject: [PATCH 3/3] Port to plexus-utils 3.0.24
---
.../maven/tools/plugin/generator/PluginHelpGenerator.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
index f6d4785..839303c 100644
--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
@@ -302,7 +302,15 @@ public class PluginHelpGenerator
return;
}
- Properties properties = PropertyUtils.loadProperties( tmpPropertiesFile );
+ Properties properties;
+ try
+ {
+ properties = PropertyUtils.loadProperties( tmpPropertiesFile );
+ }
+ catch ( IOException exc )
+ {
+ properties = new Properties();
+ }
String helpPackageName = properties.getProperty( "helpPackageName" );
--
2.5.5

7
maven-plugin-tools.spec
View File

@ -1,6 +1,6 @@
Name: maven-plugin-tools
Version: 3.4
Release: 4%{?dist}
Release: 5%{?dist}
Epoch: 0
Summary: Maven Plugin Tools
License: ASL 2.0
@ -11,6 +11,7 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{na
Patch0: 0001-Avoid-duplicate-MOJO-parameters.patch
Patch1: 0002-Deal-with-nulls-from-getComment.patch
Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
BuildRequires: maven-local
BuildRequires: mvn(com.sun:tools)
@ -171,6 +172,7 @@ API documentation for %{name}.
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
# For com.sun:tools use scope "compile" instead of "system"
%pom_remove_dep com.sun:tools maven-plugin-tools-javadoc
@ -257,6 +259,9 @@ API documentation for %{name}.
%changelog
* Thu May 12 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:3.4-5
- Port to plexus-utils 3.0.24
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild