This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch master in repository maven-javadoc-plugin.
commit b17fc33527bc7f7c5e860f8c3da6210d8d3c3864 Author: Miguel Landaeta <nomad...@debian.org> Date: Tue Aug 22 20:47:31 2017 +0100 Refresh patches --- debian/changelog | 13 +++++- debian/maven.properties | 1 + debian/patches/fix-unmappable-characters.patch | 22 +++++------ .../missing-maven-plugin-plugin-declaration.patch | 37 ----------------- debian/patches/openjdk-9-javadoc-path.patch | 30 +++++++------- .../plexus-component-metadata-plugin-version.patch | 16 ++++++++ debian/patches/plexus-utils2-compatibility.patch | 22 +++++------ debian/patches/reproducible-footer.patch | 46 +++++++++++----------- debian/patches/series | 2 +- 9 files changed, 89 insertions(+), 100 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6890ed5..a989d61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,18 @@ -maven-javadoc-plugin (2.10.4-2) UNRELEASED; urgency=medium +maven-javadoc-plugin (3.0.0~M1-1) UNRELEASED; urgency=medium + * Team upload. + + [ Chris West ] * Fix ""Unable to find javadoc command:" on openjdk-9": search another path if the JVM version is appropriate (Closes: #866929) - -- Chris West <solo-deb...@goeswhere.com> Wed, 05 Jul 2017 18:10:51 +0100 + [ Miguel Landaeta ] + * New upstream release. (Closes: #872839) + * Refresh patches. + * Add new patch d/p/plexus-component-metadata-plugin-version.patch. + * Drop patch d/p/missing-maven-plugin-plugin-declaration.patch. + + -- Miguel Landaeta <nomad...@debian.org> Tue, 22 Aug 2017 20:42:46 +0100 maven-javadoc-plugin (2.10.4-1) unstable; urgency=medium diff --git a/debian/maven.properties b/debian/maven.properties index 2fd2111..7dc20d2 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -2,3 +2,4 @@ maven.test.skip=true maven.compiler.source=1.6 maven.compiler.target=1.6 project.build.sourceEncoding=UTF-8 +plexusComponentMetadataVersion=1.5.5 diff --git a/debian/patches/fix-unmappable-characters.patch b/debian/patches/fix-unmappable-characters.patch index 865bead..a4ed597 100644 --- a/debian/patches/fix-unmappable-characters.patch +++ b/debian/patches/fix-unmappable-characters.patch @@ -1,14 +1,14 @@ Description: Fix compilation errors caused by unmappable characters for encoding ASCII Author: Emmanuel Bourg <ebo...@apache.org> Forwarded: not-needed ---- a/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java -+++ b/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java -@@ -639,7 +639,7 @@ - * </tr> - * <tr> - * <td>IBM 1.5 (French JVM)</td> -- * <td>javadoc version complète de "J2RE 1.5.0 IBM Windows 32 build pwi32pdev-20070426a"</td> -+ * <td>javadoc version complete de "J2RE 1.5.0 IBM Windows 32 build pwi32pdev-20070426a"</td> - * </tr> - * <tr> - * <td>FreeBSD 1.5</td> +--- 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 + * </tr> + * <tr> + * <td>IBM 1.5 (French JVM)</td> +- * <td>javadoc version complète de "J2RE 1.5.0 IBM Windows 32 build pwi32pdev-20070426a"</td> ++ * <td>javadoc version complete de "J2RE 1.5.0 IBM Windows 32 build pwi32pdev-20070426a"</td> + * </tr> + * <tr> + * <td>FreeBSD 1.5</td> diff --git a/debian/patches/missing-maven-plugin-plugin-declaration.patch b/debian/patches/missing-maven-plugin-plugin-declaration.patch deleted file mode 100644 index a2b6d71..0000000 --- a/debian/patches/missing-maven-plugin-plugin-declaration.patch +++ /dev/null @@ -1,37 +0,0 @@ -Description: Add back the maven-plugin-plugin configuration which has been moved to the parent pom. -Author: Emmanuel Bourg <ebo...@apache.org> -Forwarded: not-needed ---- a/pom.xml -+++ b/pom.xml -@@ -283,6 +283,13 @@ - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-plugin-plugin</artifactId> -+ <configuration> -+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> -+ </configuration> -+ </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>1.7.1</version> - </plugin> -@@ -329,6 +336,17 @@ - </configuration> - </plugin> - <plugin> -+ <artifactId>maven-plugin-plugin</artifactId> -+ <executions> -+ <execution> -+ <id>generate-descriptor</id> -+ <goals> -+ <goal>descriptor</goal> -+ </goals> -+ </execution> -+ </executions> -+ </plugin> -+ <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> diff --git a/debian/patches/openjdk-9-javadoc-path.patch b/debian/patches/openjdk-9-javadoc-path.patch index 67b376c..61f4a87 100644 --- a/debian/patches/openjdk-9-javadoc-path.patch +++ b/debian/patches/openjdk-9-javadoc-path.patch @@ -1,15 +1,15 @@ ---- a/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java -+++ b/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java -@@ -3668,6 +3668,12 @@ - { - javadocExe = new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand ); - } -+ // On Java 9, this has moved to: /usr/lib/jvm/java-9-openjdk-amd64/bin/javadoc -+ else if ( SystemUtils.JAVA_VERSION_FLOAT > 1.8f ) -+ { -+ javadocExe = -+ new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand ); -+ } - else - { - javadocExe = +--- 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 + { + javadocExe = new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand ); + } ++ // On Java 9, this has moved to: /usr/lib/jvm/java-9-openjdk-amd64/bin/javadoc ++ else if ( SystemUtils.IS_JAVA_1_9 ) ++ { ++ javadocExe = ++ new File( SystemUtils.getJavaHome() + File.separator + "bin", javadocCommand ); ++ } + else + { + javadocExe = diff --git a/debian/patches/plexus-component-metadata-plugin-version.patch b/debian/patches/plexus-component-metadata-plugin-version.patch new file mode 100644 index 0000000..da1c7bf --- /dev/null +++ b/debian/patches/plexus-component-metadata-plugin-version.patch @@ -0,0 +1,16 @@ +Description: Do not hardcode plexus-component-metadata plugin version +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. + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> +- <version>1.7.1</version> ++ <version>${plexusComponentMetadataVersion}</version> + <executions> + <execution> + <goals> diff --git a/debian/patches/plexus-utils2-compatibility.patch b/debian/patches/plexus-utils2-compatibility.patch index f0b4586..1fae06f 100644 --- a/debian/patches/plexus-utils2-compatibility.patch +++ b/debian/patches/plexus-utils2-compatibility.patch @@ -3,14 +3,14 @@ Description: FileUtils.fileWrite(File, String, String) was introduced in back to FileUtils.fileWrite(String, String, String) Author: Emmanuel Bourg <ebo...@apache.org> Forwarded: not-needed ---- a/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java -+++ b/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java -@@ -5267,7 +5267,7 @@ - StringUtils.replaceOnce( fileContents, "function loadFrames() {", fixData ); - if ( !patchedFileContents.equals( fileContents ) ) - { -- FileUtils.fileWrite( file, outputEncoding, patchedFileContents ); -+ FileUtils.fileWrite( file.getAbsolutePath(), outputEncoding, patchedFileContents ); - patched++; - } - } +--- 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 + StringUtils.replaceOnce( fileContents, "function loadFrames() {", fixData ); + if ( !patchedFileContents.equals( fileContents ) ) + { +- FileUtils.fileWrite( file, outputEncoding, patchedFileContents ); ++ FileUtils.fileWrite( file.getAbsolutePath(), outputEncoding, patchedFileContents ); + patched++; + } + } diff --git a/debian/patches/reproducible-footer.patch b/debian/patches/reproducible-footer.patch index 5484da0..30975eb 100644 --- a/debian/patches/reproducible-footer.patch +++ b/debian/patches/reproducible-footer.patch @@ -1,26 +1,26 @@ Description: Use the SOURCE_DATE_EPOCH variable to set the current year displayed in the javadoc footer Author: Emmanuel Bourg <ebo...@apache.org> Forwarded: no ---- a/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java -+++ b/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java -@@ -2739,6 +2739,20 @@ - private String getBottomText() - { - int currentYear = Calendar.getInstance().get( Calendar.YEAR ); -+ if ( System.getenv("SOURCE_DATE_EPOCH") != null ) -+ { -+ try -+ { -+ Calendar calendar = Calendar.getInstance( java.util.TimeZone.getTimeZone("UTC") ); -+ calendar.setTimeInMillis(Long.parseLong( System.getenv("SOURCE_DATE_EPOCH") ) * 1000); -+ currentYear = calendar.get( Calendar.YEAR ); -+ } -+ catch (Exception e) -+ { -+ e.printStackTrace(); -+ } -+ } -+ - String year = String.valueOf( currentYear ); - - String inceptionYear = project.getInceptionYear(); +--- 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 + private String getBottomText() + { + int currentYear = Calendar.getInstance().get( Calendar.YEAR ); ++ if ( System.getenv("SOURCE_DATE_EPOCH") != null ) ++ { ++ try ++ { ++ Calendar calendar = Calendar.getInstance( java.util.TimeZone.getTimeZone("UTC") ); ++ calendar.setTimeInMillis(Long.parseLong( System.getenv("SOURCE_DATE_EPOCH") ) * 1000); ++ currentYear = calendar.get( Calendar.YEAR ); ++ } ++ catch (Exception e) ++ { ++ e.printStackTrace(); ++ } ++ } ++ + String year = String.valueOf( currentYear ); + + String inceptionYear = project.getInceptionYear(); diff --git a/debian/patches/series b/debian/patches/series index 766bc66..224a858 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ plexus-utils2-compatibility.patch fix-unmappable-characters.patch -missing-maven-plugin-plugin-declaration.patch reproducible-footer.patch openjdk-9-javadoc-path.patch +plexus-component-metadata-plugin-version.patch -- 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-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits