[java-sig-commits] [maven-plugin-tools] Missing com.sun.javadoc / com.sun.tools.doclet forced in the POM

Jaromír Cápík jcapik at fedoraproject.org
Wed Nov 16 15:59:41 UTC 2011


commit 9b0e1fb51c3ff5933c1937de5574b57f6932139a
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Wed Nov 16 16:59:28 2011 +0100

    Missing com.sun.javadoc / com.sun.tools.doclet forced in the POM

 0003-missing-com.sun-in-1.6.0-and-higher.patch |   17 +++++++++++++++++
 maven-plugin-tools.spec                        |    9 +++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/0003-missing-com.sun-in-1.6.0-and-higher.patch b/0003-missing-com.sun-in-1.6.0-and-higher.patch
new file mode 100644
index 0000000..1f43819
--- /dev/null
+++ b/0003-missing-com.sun-in-1.6.0-and-higher.patch
@@ -0,0 +1,17 @@
+diff -Naur maven-plugin-tools-2.7.orig/maven-plugin-tools-javadoc/pom.xml maven-plugin-tools-2.7/maven-plugin-tools-javadoc/pom.xml
+--- maven-plugin-tools-2.7.orig/maven-plugin-tools-javadoc/pom.xml	2011-02-06 00:06:30.000000000 +0100
++++ maven-plugin-tools-2.7/maven-plugin-tools-javadoc/pom.xml	2011-11-16 16:35:15.780939087 +0100
+@@ -45,6 +45,13 @@
+       <groupId>org.apache.maven.plugin-tools</groupId>
+       <artifactId>maven-plugin-tools-java</artifactId>
+     </dependency>
++    <dependency>
++      <groupId>com.sun</groupId>
++      <artifactId>tools</artifactId>
++      <version>1.4.2</version>
++      <scope>system</scope>
++      <systemPath>${java.home}/../lib/tools.jar</systemPath>
++    </dependency>
+   </dependencies>
+ 
+   <profiles>
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index 8d3384e..2886ece 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,6 +1,6 @@
 Name:           maven-plugin-tools
 Version:        2.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Maven Plugin Tools
 
@@ -13,10 +13,11 @@ Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{na
 # dependency version on jtidy 8.0)
 Patch0:         0001-fix-for-new-jtidy.patch
 Patch1:         0002-maven3-compat.patch
+Patch2:         0003-missing-com.sun-in-1.6.0-and-higher.patch
 
 BuildArch: noarch
 
-BuildRequires: java-devel = 1:1.6.0
+BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: maven
 BuildRequires: maven-install-plugin
 BuildRequires: maven-compiler-plugin
@@ -135,6 +136,7 @@ plugin registry, the artifact metadata and a generic help goal.
 %setup -q
 %patch0
 %patch1 -p1
+%patch2 -p1
 
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -249,6 +251,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_mavendepmapfragdir}/maven-plugin-plugin
 
 %changelog
+* Wed Nov 16 2011 Jaromir Capik <jcapik at redhat.com> -  0:2.7-3
+- Missing com.sun.javadoc / com.sun.tools.doclet forced in the POM
+
 * Tue Aug 16 2011 Jaromir Capik <jcapik at redhat.com> -  0:2.7-2
 - Removal of plexus-maven-plugin (not needed)
 - Migration to maven3


More information about the java-sig-commits mailing list