[maven-doxia-tools] 30/35: Refreshed the patches

[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-doxia-tools.

commit 70c49e6c86be0505d98f54feacdfa56166237d17
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 28 14:50:50 2017 +0200

    Refreshed the patches
---
 debian/changelog                                   |  4 +-
 .../0001-fix-for-plexus-interpolation.patch        | 46 ----------------------
 debian/patches/0002-remove-setLastModified.patch   |  7 +---
 debian/patches/series                              |  1 -
 4 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d297575..bf812d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-maven-doxia-tools (1.2.1-3) UNRELEASED; urgency=medium
+maven-doxia-tools (1.4-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.0.0
diff --git a/debian/patches/0001-fix-for-plexus-interpolation.patch b/debian/patches/0001-fix-for-plexus-interpolation.patch
deleted file mode 100644
index cea9c6b..0000000
--- a/debian/patches/0001-fix-for-plexus-interpolation.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Damien Raude-Morvan <drazzib at debian.org>
-Date: Sun, 11 Sep 2011 00:33:43 +0200
-Subject: fix for plexus-interpolation
-
----
- .../apache/maven/doxia/tools/DefaultSiteTool.java  |   19 ++++++++++++++-----
- 1 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-index fb65087..f3fe8c7 100644
---- a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-+++ b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-@@ -45,10 +45,11 @@ import org.codehaus.plexus.logging.AbstractLogEnabled;
- import org.codehaus.plexus.util.IOUtil;
- import org.codehaus.plexus.util.ReaderFactory;
- import org.codehaus.plexus.util.StringUtils;
--import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
--import org.codehaus.plexus.util.interpolation.MapBasedValueSource;
--import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
--import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
-+import org.codehaus.plexus.interpolation.InterpolationException;
-+import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
-+import org.codehaus.plexus.interpolation.MapBasedValueSource;
-+import org.codehaus.plexus.interpolation.ObjectBasedValueSource;
-+import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
- import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
- 
- import java.io.File;
-@@ -672,7 +673,15 @@ public class DefaultSiteTool
- 
-         interpolator.addValueSource( new MapBasedValueSource( aProject.getProperties() ) );
- 
--        siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
-+	try
-+	{
-+            siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
-+	}
-+	catch ( InterpolationException e )
-+	{
-+	     throw new SiteToolException( "IOException: cannot interpolate siteDescriptorContent: " + e.getMessage(),
-+                                         e );
-+	}
- 
-         props.put( "inputEncoding", inputEncoding );
- 
--- 
diff --git a/debian/patches/0002-remove-setLastModified.patch b/debian/patches/0002-remove-setLastModified.patch
index 912ff07..c03a319 100644
--- a/debian/patches/0002-remove-setLastModified.patch
+++ b/debian/patches/0002-remove-setLastModified.patch
@@ -6,16 +6,13 @@ Subject: remove setLastModified
  .../apache/maven/doxia/tools/DefaultSiteTool.java  |    1 -
  1 files changed, 0 insertions(+), 1 deletions(-)
 
-diff --git a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-index f3fe8c7..f027a7e 100644
 --- a/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
 +++ b/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
-@@ -1259,7 +1259,6 @@ public class DefaultSiteTool
+@@ -1190,7 +1190,6 @@
                                                                            inputEncoding, outputEncoding );
  
              decoration = readDecorationModel( siteDescriptorContent );
 -            decoration.setLastModified( siteDescriptorLastModified );
          }
  
-         MavenProject parentProject = getParentProject( project, reactorProjects, localRepository );
--- 
+         if ( parentProject != null )
diff --git a/debian/patches/series b/debian/patches/series
index ac7bc80..924f96d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-fix-for-plexus-interpolation.patch
 0002-remove-setLastModified.patch

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