From 45422a12c7181a182c9793f66b628ae3d34fa93f Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 7 Dec 2017 16:24:55 +0200 Subject: [PATCH] Support setting "-Xdoclint:none" in m-javadoc-p >= 3.0.0 --- ...g-Xdoclint-none-in-m-javadoc-p-3.0.0.patch | 30 +++++++++++++++++++ xmvn.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-Support-setting-Xdoclint-none-in-m-javadoc-p-3.0.0.patch diff --git a/0001-Support-setting-Xdoclint-none-in-m-javadoc-p-3.0.0.patch b/0001-Support-setting-Xdoclint-none-in-m-javadoc-p-3.0.0.patch new file mode 100644 index 0000000..c483cf4 --- /dev/null +++ b/0001-Support-setting-Xdoclint-none-in-m-javadoc-p-3.0.0.patch @@ -0,0 +1,30 @@ +From 9aa9c66be355d95e2c532bbdfdc98bdbba9b6606 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Thu, 7 Dec 2017 15:50:52 +0200 +Subject: [PATCH] Support setting "-Xdoclint:none" in m-javadoc-p >= 3.0.0 + +maven-javadoc-plugin 3.0.0 replaced `additionalparam` string property +with `additionalOptions` list property. +See: https://issues.apache.org/jira/browse/MJAVADOC-368 +--- + .../fedoraproject/xmvn/connector/aether/XMvnMojoExecutionListener.java | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnMojoExecutionListener.java b/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnMojoExecutionListener.java +index 5f9b5dd4..bb066638 100644 +--- a/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnMojoExecutionListener.java ++++ b/xmvn-connector-aether/src/main/java/org/fedoraproject/xmvn/connector/aether/XMvnMojoExecutionListener.java +@@ -267,7 +267,10 @@ public class XMvnMojoExecutionListener + // Disable doclint + if ( JAVADOC_AGGREGATE.equals( execution ) ) + { ++ // maven-javadoc-plugin < 3.0.0 + trySetBeanProperty( mojo, "additionalparam", "-Xdoclint:none" ); ++ // maven-javadoc-plugin >= 3.0.0 ++ trySetBeanProperty( mojo, "additionalOptions", new String[] { "-Xdoclint:none" } ); + } + else if ( XMVN_BUILDDEP.equals( execution ) ) + { +-- +2.14.3 + diff --git a/xmvn.spec b/xmvn.spec index 1750b89..60f90ba 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -10,7 +10,7 @@ Name: xmvn Version: 3.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: https://fedora-java.github.io/xmvn/ @@ -21,6 +21,7 @@ Source0: https://github.com/fedora-java/xmvn/releases/download/%{version} Patch0: 0001-Fix-installer-plugin-loading.patch Patch1: 0001-Port-to-Gradle-4.2.patch Patch2: 0001-Port-to-Gradle-4.3.1.patch +Patch3: 0001-Support-setting-Xdoclint-none-in-m-javadoc-p-3.0.0.patch BuildRequires: maven >= 3.5.0 BuildRequires: maven-local @@ -193,6 +194,7 @@ This package provides %{summary}. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Bisect IT has no chances of working in local, offline mode, without # network access - it needs to access remote repositories. @@ -343,6 +345,9 @@ cp -P ${maven_home}/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/ %doc LICENSE NOTICE %changelog +* Thu Dec 07 2017 Michael Simacek - 3.0.0-9 +- Support setting "-Xdoclint:none" in m-javadoc-p >= 3.0.0 + * Fri Nov 10 2017 Michael Simacek - 3.0.0-8 - Port to Gradle 4.3.1