[maven-plugin-tools] 05/08: Removed 03-plexus-utils2-compatibility.patch

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-plugin-tools.

commit 9a4a7b1baecf21541ce76924ee030885aa634b48
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 28 09:58:35 2016 +0100

    Removed 03-plexus-utils2-compatibility.patch
---
 debian/changelog                                    |  1 +
 debian/maven.rules                                  |  1 +
 debian/patches/03-plexus-utils2-compatibility.patch | 16 ----------------
 debian/patches/series                               |  1 -
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d679321..9797e66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ maven-plugin-tools (3.3-4) UNRELEASED; urgency=medium
   * Converted debian/copyright to the Copyright Format 1.0
   * Removed 02-plexus-archiver1-compatibility.patch and require
     libplexus-archiver-java (>= 2.0)
+  * Removed 03-plexus-utils2-compatibility.patch
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 27 Jan 2016 10:08:59 +0100
 
diff --git a/debian/maven.rules b/debian/maven.rules
index bf2df87..8a7df3f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -6,3 +6,4 @@ org.apache.maven maven-artifact * s/3\..*/3.x/
 s/bsh/org.beanshell/ bsh * s/.*/debian/
 org.codehaus.plexus plexus-compiler-manager * s/.*/2.x/ * *
 org.codehaus.plexus plexus-component-metadata maven-plugin s/.*/1.5.5/ * *
+org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
diff --git a/debian/patches/03-plexus-utils2-compatibility.patch b/debian/patches/03-plexus-utils2-compatibility.patch
deleted file mode 100644
index 7833874..0000000
--- a/debian/patches/03-plexus-utils2-compatibility.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: FileUtils.fileWrite(File, String, String) was introduced in
- plexus-utils 2.0.6 but this version isn't available in Debian yet. So we fall
- back to FileUtils.fileWrite(String, String, String)
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- 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
-@@ -149,7 +149,7 @@
- 
-             String helpClassSources = getHelpClassSources( getPluginHelpPath( request.getProject() ), pluginDescriptor );
- 
--            FileUtils.fileWrite( helpClass, request.getEncoding(), helpClassSources );
-+            FileUtils.fileWrite( helpClass.getAbsolutePath(), request.getEncoding(), helpClassSources );
-         }
-         catch ( IOException e )
-         {
diff --git a/debian/patches/series b/debian/patches/series
index 95db7a4..bbcd6e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 01-maven2-api-compatibility.patch
-03-plexus-utils2-compatibility.patch
 04-reproducible-plugin-descriptor.patch
 05-fix-plugin-annotation.patch
 06-plexus-component-metadata-version.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-plugin-tools.git