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

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

commit 6a7e01b8d1d4d9c8a920c4f8800051230d80a710
Author: Emmanuel Bourg <ebo...@apache.org>
Date:   Mon Dec 11 15:30:30 2017 +0100

    Refreshed the patches
---
 debian/changelog                                              | 1 +
 debian/patches/fix-unmappable-characters.patch                | 2 +-
 debian/patches/openjdk-9-javadoc-path.patch                   | 2 +-
 debian/patches/plexus-component-metadata-plugin-version.patch | 6 +++---
 debian/patches/plexus-utils2-compatibility.patch              | 2 +-
 debian/patches/reproducible-footer.patch                      | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9452f7e..c440d65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ maven-javadoc-plugin (3.0.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
+    - Refreshed the patches
     - New dependency on libplexus-languages-java
 
  -- Emmanuel Bourg <ebo...@apache.org>  Mon, 11 Dec 2017 15:28:55 +0100
diff --git a/debian/patches/fix-unmappable-characters.patch 
b/debian/patches/fix-unmappable-characters.patch
index a4ed597..946be3a 100644
--- a/debian/patches/fix-unmappable-characters.patch
+++ b/debian/patches/fix-unmappable-characters.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
 Forwarded: not-needed
 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
 +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
-@@ -571,7 +571,7 @@ public class JavadocUtil
+@@ -573,7 +573,7 @@
       * </tr>
       * <tr>
       *   <td>IBM 1.5 (French JVM)</td>
diff --git a/debian/patches/openjdk-9-javadoc-path.patch 
b/debian/patches/openjdk-9-javadoc-path.patch
index 61f4a87..6ccdecd 100644
--- a/debian/patches/openjdk-9-javadoc-path.patch
+++ b/debian/patches/openjdk-9-javadoc-path.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
 +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
-@@ -3605,6 +3605,12 @@ public abstract class AbstractJavadocMojo
+@@ -3699,6 +3699,12 @@
          {
              javadocExe = new File( SystemUtils.getJavaHome() + File.separator 
+ "bin", javadocCommand );
          }
diff --git a/debian/patches/plexus-component-metadata-plugin-version.patch 
b/debian/patches/plexus-component-metadata-plugin-version.patch
index da1c7bf..f6e590a 100644
--- a/debian/patches/plexus-component-metadata-plugin-version.patch
+++ b/debian/patches/plexus-component-metadata-plugin-version.patch
@@ -3,9 +3,9 @@ Author: Miguel Landaeta <nomadi...@debian.org>
 Forwarded: no
 Last-Update: 2017-08-21
 
---- maven-javadoc-plugin-3.0.0~M1.orig/pom.xml
-+++ maven-javadoc-plugin-3.0.0~M1/pom.xml
-@@ -346,7 +346,7 @@ under the License.
+--- a/pom.xml
++++ b/pom.xml
+@@ -382,7 +382,7 @@
        <plugin>
          <groupId>org.codehaus.plexus</groupId>
          <artifactId>plexus-component-metadata</artifactId>
diff --git a/debian/patches/plexus-utils2-compatibility.patch 
b/debian/patches/plexus-utils2-compatibility.patch
index 1fae06f..a7ad163 100644
--- a/debian/patches/plexus-utils2-compatibility.patch
+++ b/debian/patches/plexus-utils2-compatibility.patch
@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
 Forwarded: not-needed
 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
 +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
-@@ -5154,7 +5154,7 @@ public abstract class AbstractJavadocMoj
+@@ -5374,7 +5374,7 @@
                      StringUtils.replaceOnce( fileContents, "function 
loadFrames() {", fixData );
                  if ( !patchedFileContents.equals( fileContents ) )
                  {
diff --git a/debian/patches/reproducible-footer.patch 
b/debian/patches/reproducible-footer.patch
index 30975eb..0a9f12b 100644
--- a/debian/patches/reproducible-footer.patch
+++ b/debian/patches/reproducible-footer.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
 Forwarded: no
 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
 +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
-@@ -2724,6 +2724,20 @@ public abstract class AbstractJavadocMojo
+@@ -2818,6 +2818,20 @@
      private String getBottomText()
      {
          int currentYear = Calendar.getInstance().get( Calendar.YEAR );

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

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to