mizdebsk pushed to xmvn (master). "Disable doclint in javadoc:aggregate MOJO executions"

[notifications at fedoraproject.org]

>From 7df76faacdba709b104c2335afbe0c1be013a36f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu, 16 Apr 2015 10:24:47 +0200
Subject: Disable doclint in javadoc:aggregate MOJO executions


diff --git a/0001-Port-to-Gradle-2.3.patch b/0001-Port-to-Gradle-2.3.patch
index 7038b57..d637034 100644
--- a/0001-Port-to-Gradle-2.3.patch
+++ b/0001-Port-to-Gradle-2.3.patch
@@ -1,7 +1,7 @@
-From bccb95235f4d177552820f752f20e44b4a00b91b Mon Sep 17 00:00:00 2001
+From cc15d824e5138d1985f8a02ba7104fba339a7aef Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Wed, 25 Mar 2015 10:23:13 +0100
-Subject: [PATCH] Port to Gradle 2.3
+Subject: [PATCH 1/2] Port to Gradle 2.3
 
 ---
  .../java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java   | 3 ++-
@@ -30,7 +30,7 @@ index af4d068..94a6119 100644
  
              result.resolved( metaData );
 diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml
-index 294d0ce..d971817 100644
+index 041215a..c15dd86 100644
 --- a/xmvn-parent/pom.xml
 +++ b/xmvn-parent/pom.xml
 @@ -79,7 +79,7 @@
diff --git a/0002-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch b/0002-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch
new file mode 100644
index 0000000..b7029ba
--- /dev/null
+++ b/0002-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch
@@ -0,0 +1,45 @@
+From 0f2c0581f4a22a1ec60b1926e07d6baddb22d4bc Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Thu, 16 Apr 2015 10:18:25 +0200
+Subject: [PATCH 2/2] Disable doclint in javadoc:aggregate MOJO executions
+
+---
+ .../xmvn/connector/aether/XMvnMojoExecutionListener.java  | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+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 8e3f3f8..7265d36 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
+@@ -33,6 +33,8 @@ import org.apache.maven.plugin.Mojo;
+ import org.apache.maven.plugin.MojoExecution;
+ import org.apache.maven.plugin.MojoExecutionException;
+ import org.apache.maven.project.MavenProject;
++import org.eclipse.sisu.bean.BeanProperties;
++import org.eclipse.sisu.bean.BeanProperty;
+ 
+ /**
+  * Listens to various MOJO executions and captures useful information.
+@@ -191,7 +193,18 @@ public class XMvnMojoExecutionListener
+     @Override
+     public void beforeMojoExecution( MojoExecutionEvent event )
+     {
+-        // Nothing to do
++        Mojo mojo = event.getMojo();
++        MojoExecution execution = event.getExecution();
++
++        // Disable doclint
++        if ( JAVADOC_AGGREGATE.equals( execution ) )
++        {
++            for ( BeanProperty<Object> property : new BeanProperties( mojo.getClass() ) )
++            {
++                if ( property.getName().equals( "additionalparam" ) )
++                    property.set( mojo, "-Xdoclint:none" );
++            }
++        }
+     }
+ 
+     @Override
+-- 
+2.1.0
+
diff --git a/xmvn.spec b/xmvn.spec
index de4f887..294e9ba 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -4,7 +4,7 @@
 
 Name:           xmvn
 Version:        2.3.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Local Extensions for Apache Maven
 License:        ASL 2.0
 URL:            http://mizdebsk.fedorapeople.org/xmvn
@@ -13,6 +13,7 @@ BuildArch:      noarch
 Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.xz
 
 Patch0:         0001-Port-to-Gradle-2.3.patch
+Patch1:         0002-Disable-doclint-in-javadoc-aggregate-MOJO-executions.patch
 
 BuildRequires:  maven >= 3.3
 BuildRequires:  maven-local
@@ -153,6 +154,7 @@ This package provides %{summary}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %mvn_package :xmvn __noinstall
 
@@ -298,6 +300,9 @@ cp -P %{_datadir}/maven/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/
 %doc LICENSE NOTICE
 
 %changelog
+* Thu Apr 16 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3.2-7
+- Disable doclint in javadoc:aggregate MOJO executions
+
 * Thu Apr  9 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3.2-6
 - Install mvn-local symlink
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xmvn.git/commit/?h=master&id=7df76faacdba709b104c2335afbe0c1be013a36f