diff --git a/0001-Port-to-current-plexus-utils.patch b/0001-Port-to-current-plexus-utils.patch new file mode 100644 index 0000000..36be673 --- /dev/null +++ b/0001-Port-to-current-plexus-utils.patch @@ -0,0 +1,43 @@ +From 2da6ad1c0a941423490a74119966ea403f3ca246 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Fri, 29 Jun 2018 12:35:54 +0200 +Subject: [PATCH] Port to current plexus-utils + +--- + .../maven/plugins/javadoc/JavadocUtil.java | 20 +++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java +index a740c6e..0fbf00c 100644 +--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java ++++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java +@@ -1178,14 +1178,18 @@ public class JavadocUtil + InvocationOutputHandler outputHandler = new PrintStreamHandler( ps, false ); + request.setOutputHandler( outputHandler ); + +- outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with " +- + ( properties == null ? "no properties" : "properties=" + properties ) ); +- outputHandler.consumeLine( "" ); +- outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) ); +- outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) ); +- outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) ); +- outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) ); +- outputHandler.consumeLine( "" ); ++ try { ++ outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with " ++ + ( properties == null ? "no properties" : "properties=" + properties ) ); ++ outputHandler.consumeLine( "" ); ++ outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) ); ++ outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) ); ++ outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) ); ++ outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) ); ++ outputHandler.consumeLine( "" ); ++ } catch (IOException e) { ++ throw new MavenInvocationException("Failed to output lines", e); ++ } + + try + { +-- +2.17.1 + diff --git a/maven-javadoc-plugin-3.0.1-source-release.zip b/maven-javadoc-plugin-3.0.1-source-release.zip new file mode 100644 index 0000000..f635427 Binary files /dev/null and b/maven-javadoc-plugin-3.0.1-source-release.zip differ diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec new file mode 100644 index 0000000..b90649a --- /dev/null +++ b/maven-javadoc-plugin.spec @@ -0,0 +1,57 @@ +Name: maven-javadoc-plugin +Version: 3.0.1 +Release: 3 +Summary: Maven Javadoc Plugin +License: ASL 2.0 +URL: http://maven.apache.org/plugins/maven-javadoc-plugin +BuildArch: noarch + +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip + +Patch0001: 0001-Port-to-current-plexus-utils.patch + +BuildRequires: maven-local mvn(org.apache.maven.doxia:doxia-site-renderer) mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.commons:commons-lang3) mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.httpcomponents:httpclient) mvn(org.apache.maven.reporting:maven-reporting-api) +BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) mvn(org.apache.maven:maven-settings) +BuildRequires: mvn(org.apache.maven:maven-archiver) mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-artifact) mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven:maven-model) mvn(commons-io:commons-io) mvn(com.thoughtworks.qdox:qdox) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) mvn(org.apache.maven.shared:maven-common-artifact-filters) +BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer) mvn(org.codehaus.modello:modello-maven-plugin) +BuildRequires: mvn(org.apache.maven.shared:maven-invoker) mvn(org.codehaus.plexus:plexus-archiver) +BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) mvn(org.codehaus.plexus:plexus-java) +BuildRequires: mvn(org.codehaus.plexus:plexus-interactivity-api) mvn(org.codehaus.plexus:plexus-utils) + +%description +Generate plugins used by javadocs for the specified project. + +%package help +Summary: API documentation for maven-javadoc-plugin. +Provides: %{name}-javadoc = %{version}-%{release} +Obsoletes: %{name}-javadoc < %{version}-%{release} + +%description help +The help for maven-javadoc-plugin to use. + +%prep +%autosetup -n %{name}-%{version} -p1 + +%pom_remove_plugin :maven-enforcer-plugin + +%build +%mvn_build -f -- -DmavenVersion=3.5.0 + +%install +%mvn_install + +%files -f .mfiles +%doc LICENSE NOTICE + +%files help -f .mfiles-javadoc + + +%changelog +* Thu Nov 14 2019 wangye - 3.0.1-3 +- Package init