diff --git a/0001-fix-for-new-jtidy.patch b/0001-fix-for-new-jtidy.patch deleted file mode 100644 index a4b2821..0000000 --- a/0001-fix-for-new-jtidy.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- maven-plugin-tools-api/pom.xml.orig 2010-05-01 15:49:32.000000000 +0300 -+++ maven-plugin-tools-api/pom.xml 2011-02-12 17:30:20.937431517 +0200 -@@ -83,9 +83,9 @@ - - - -- jtidy -+ net.sf.jtidy - jtidy -- 4aug2000r7-dev -+ r938 - - - ---- maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java.orig 2010-05-01 15:49:32.000000000 +0300 -+++ maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java 2011-02-12 17:32:13.115079407 +0200 -@@ -265,7 +265,8 @@ public final class PluginUtils - tidy.setDocType( "loose" ); - tidy.setXHTML( true ); - tidy.setXmlOut( true ); -- tidy.setCharEncoding( Configuration.UTF8 ); -+ tidy.setInputEncoding("UTF-8"); -+ tidy.setOutputEncoding("UTF-8"); - tidy.setMakeClean( true ); - tidy.setNumEntities( true ); - tidy.setQuoteNbsp( false ); diff --git a/0002-maven3-compat.patch b/0002-maven3-compat.patch deleted file mode 100644 index 1e802ca..0000000 --- a/0002-maven3-compat.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -Naur maven-plugin-tools-2.7.orig/maven-plugin-plugin/pom.xml maven-plugin-tools-2.7/maven-plugin-plugin/pom.xml ---- maven-plugin-tools-2.7.orig/maven-plugin-plugin/pom.xml 2011-02-06 00:06:50.000000000 +0100 -+++ maven-plugin-tools-2.7/maven-plugin-plugin/pom.xml 2011-08-16 17:02:16.638032080 +0200 -@@ -91,7 +91,7 @@ - - - org.apache.maven -- maven-plugin-descriptor -+ maven-compat - ${mavenVersion} - - -diff -Naur maven-plugin-tools-2.7.orig/maven-plugin-tools-api/pom.xml maven-plugin-tools-2.7/maven-plugin-tools-api/pom.xml ---- maven-plugin-tools-2.7.orig/maven-plugin-tools-api/pom.xml 2011-08-16 17:01:27.000000000 +0200 -+++ maven-plugin-tools-2.7/maven-plugin-tools-api/pom.xml 2011-08-16 17:02:45.310015205 +0200 -@@ -68,7 +68,7 @@ - - - org.apache.maven -- maven-plugin-descriptor -+ maven-compat - - - -diff -Naur maven-plugin-tools-2.7.orig/maven-plugin-tools-beanshell/pom.xml maven-plugin-tools-2.7/maven-plugin-tools-beanshell/pom.xml ---- maven-plugin-tools-2.7.orig/maven-plugin-tools-beanshell/pom.xml 2011-02-06 00:06:40.000000000 +0100 -+++ maven-plugin-tools-2.7/maven-plugin-tools-beanshell/pom.xml 2011-08-16 17:02:55.997017154 +0200 -@@ -47,7 +47,7 @@ - - - org.apache.maven -- maven-plugin-descriptor -+ maven-compat - - - -diff -Naur maven-plugin-tools-2.7.orig/maven-plugin-tools-java/pom.xml maven-plugin-tools-2.7/maven-plugin-tools-java/pom.xml ---- maven-plugin-tools-2.7.orig/maven-plugin-tools-java/pom.xml 2011-02-06 00:06:18.000000000 +0100 -+++ maven-plugin-tools-2.7/maven-plugin-tools-java/pom.xml 2011-08-16 17:03:08.686999509 +0200 -@@ -53,7 +53,7 @@ - - - org.apache.maven -- maven-plugin-descriptor -+ maven-compat - - - org.apache.maven.plugin-tools -diff -Naur maven-plugin-tools-2.7.orig/maven-plugin-tools-model/pom.xml maven-plugin-tools-2.7/maven-plugin-tools-model/pom.xml ---- maven-plugin-tools-2.7.orig/maven-plugin-tools-model/pom.xml 2011-02-06 00:06:54.000000000 +0100 -+++ maven-plugin-tools-2.7/maven-plugin-tools-model/pom.xml 2011-08-16 17:03:32.990016149 +0200 -@@ -43,7 +43,7 @@ - - - org.apache.maven -- maven-plugin-descriptor -+ maven-compat - - - -diff -Naur maven-plugin-tools-2.7.orig/pom.xml maven-plugin-tools-2.7/pom.xml ---- maven-plugin-tools-2.7.orig/pom.xml 2011-02-06 00:06:54.000000000 +0100 -+++ maven-plugin-tools-2.7/pom.xml 2011-08-16 17:02:03.997011989 +0200 -@@ -178,8 +178,8 @@ - - - org.apache.maven -- maven-plugin-descriptor -- 2.0.6 -+ maven-compat -+ 3.0.2 - - - -diff -Naur maven-plugin-tools-2.7.orig/maven-plugin-tools-ant/pom.xml maven-plugin-tools-2.7/maven-plugin-tools-ant/pom.xml ---- maven-plugin-tools-2.7.orig/maven-plugin-tools-ant/pom.xml 2011-02-06 00:06:26.000000000 +0100 -+++ maven-plugin-tools-2.7/maven-plugin-tools-ant/pom.xml 2011-08-16 17:06:46.864022871 +0200 -@@ -47,7 +47,7 @@ - - - org.apache.maven -- maven-plugin-descriptor -+ maven-compat - - - org.apache.maven.plugin-tools -diff -Naur maven-plugin-tools-2.7.orig/maven-plugin-plugin/pom.xml maven-plugin-tools-2.7/maven-plugin-plugin/pom.xml ---- maven-plugin-tools-2.7.orig/maven-plugin-plugin/pom.xml 2011-08-16 17:11:13.000000000 +0200 -+++ maven-plugin-tools-2.7/maven-plugin-plugin/pom.xml 2011-08-16 17:13:16.834038174 +0200 -@@ -150,7 +150,7 @@ - - - org.apache.maven -- maven-plugin-descriptor -+ maven-compat - ${mavenVersion} - - 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 deleted file mode 100644 index 1f43819..0000000 --- a/0003-missing-com.sun-in-1.6.0-and-higher.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 @@ - org.apache.maven.plugin-tools - maven-plugin-tools-java - -+ -+ com.sun -+ tools -+ 1.4.2 -+ system -+ ${java.home}/../lib/tools.jar -+ - - - diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 514cf88..69830db 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -1,6 +1,6 @@ Name: maven-plugin-tools -Version: 2.7 -Release: 7%{?dist} +Version: 3.1 +Release: 1%{?dist} Epoch: 0 Summary: Maven Plugin Tools @@ -8,41 +8,166 @@ Group: Development/Libraries License: ASL 2.0 URL: http://maven.apache.org/plugin-tools/ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{version}/%{name}-%{version}-source-release.zip +BuildArch: noarch -# this patch should be upstreamed (together with updated pom.xml -# 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 +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: jpackage-utils +BuildRequires: maven +BuildRequires: maven-compiler-plugin +BuildRequires: maven-doxia-sitetools +BuildRequires: maven-doxia-tools +BuildRequires: maven-enforcer-plugin +BuildRequires: maven-install-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-plugin-descriptor +BuildRequires: maven-plugin-plugin +BuildRequires: maven-plugin-testing-harness +BuildRequires: maven-resources-plugin +BuildRequires: maven-shared-reporting-impl +BuildRequires: maven-site-plugin +BuildRequires: maven-source-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit +BuildRequires: maven-test-tools +BuildRequires: plexus-ant-factory +BuildRequires: plexus-bsh-factory +BuildRequires: fest-assert +BuildRequires: modello +BuildRequires: xmlunit -BuildArch: noarch - -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: maven -BuildRequires: maven-install-plugin -BuildRequires: maven-compiler-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-source-plugin -BuildRequires: maven-plugin-plugin -BuildRequires: maven-site-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-doxia-sitetools -BuildRequires: maven-doxia-tools -BuildRequires: maven-surefire-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: maven-shared-reporting-impl -BuildRequires: maven-test-tools -BuildRequires: maven-plugin-testing-harness -BuildRequires: modello -Requires: maven Requires: jpackage-utils Requires: java +Requires: maven + +Source666: http://search.maven.org/remotecontent?filepath=org/apache/maven/plugins/maven-plugin-plugin/3.1/maven-plugin-plugin-3.1.jar + %description The Maven Plugin Tools contains the necessary tools to be able to produce Maven Plugins in a variety of languages. +%package -n maven-plugin-annotations +Summary: Maven Plugin Java 5 Annotations +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description -n maven-plugin-annotations +This package contains Java 5 annotations to use in Mojos. + +%package -n maven-plugin-plugin +Summary: Maven Plugin Plugin +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-beanshell +Requires: %{name}-java +Requires: %{name}-model +Obsoletes: maven2-plugin-plugin < 0:%{version}-%{release} +Provides: maven2-plugin-plugin = 0:%{version}-%{release} + +%description -n maven-plugin-plugin +The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo's +found in the source tree, to include in the JAR. It is also used to generate +Xdoc files for the Mojos as well as for updating the plugin registry, the +artifact metadata and a generic help goal. + +%package annotations +Summary: Maven Plugin Tool for Annotations +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description annotations +This package provides Java 5 annotation tools for use with Apache Maven. + +%package ant +Summary: Maven Plugin Tool for Ant +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: maven-shared-plugin-tools-ant < 0:%{version}-%{release} +Provides: maven-shared-plugin-tools-ant = 0:%{version}-%{release} + +%description ant +Descriptor extractor for plugins written in Ant. + +%package api +Summary: Maven Plugin Tools APIs +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: maven-shared-plugin-tools-api < 0:%{version}-%{release} +Provides: maven-shared-plugin-tools-api = 0:%{version}-%{release} + +%description api +The Maven Plugin Tools API provides an API to extract information from +and generate documentation for Maven Plugins. + +%package beanshell +Summary: Maven Plugin Tool for Beanshell +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: maven-shared-plugin-tools-beanshell < 0:%{version}-%{release} +Provides: maven-shared-plugin-tools-beanshell = 0:%{version}-%{release} + +%description beanshell +Descriptor extractor for plugins written in Beanshell. + +%package generators +Summary: Maven Plugin Tools Generators +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description generators +The Maven Plugin Tools Generators provides content generation +(documentation, help) from plugin descriptor. + +%package java +Summary: Maven Plugin Tool for Java +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: maven-shared-plugin-tools-java < 0:%{version}-%{release} +Provides: maven-shared-plugin-tools-java = 0:%{version}-%{release} + +%description java +Descriptor extractor for plugins written in Java. + +# Note that this package contains code, not documentation. +# See comments about "javadocs" subpackage below. +%package javadoc +Summary: Maven Plugin Tools Javadoc +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description javadoc +The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when +generating Javadoc. + +Java API documentation for %{name} is contained in +%{name}-javadocs package. This package does not contain it. + +%package model +Summary: Maven Plugin Metadata Model +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: maven-shared-plugin-tools-model < 0:%{version}-%{release} +Provides: maven-shared-plugin-tools-model = 0:%{version}-%{release} + +%description model +The Maven Plugin Metadata Model provides an API to play with the Metadata +model. + +%package -n maven-script +Summary: Maven Script Mojo Support +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description -n maven-script +Maven Script Mojo Support lets developer write Maven plugins/goals +with scripting languages instead of compiled Java. + +%package -n maven-script-ant +Summary: Maven Ant Mojo Support +Requires: maven-script = %{epoch}:%{version}-%{release} + +%description -n maven-script-ant +This package provides %{summary}, which write Maven plugins with +Ant scripts. + +%package -n maven-script-beanshell +Summary: Maven Beanshell Mojo Support +Requires: maven-script = %{epoch}:%{version}-%{release} + +%description -n maven-script-beanshell +This package provides %{summary}, which write Maven plugins with +Beanshell scripts. + # This "javadocs" package violates packaging guidelines as of Sep 6 2012. The # subpackage name "javadocs" instead of "javadoc" is intentional. There was a # consensus that current naming scheme should be kept, even if it doesn't @@ -55,212 +180,140 @@ Requires: jpackage-utils %description javadocs API documentation for %{name}. -%package ant -Summary: Maven Plugin Tool for Ant -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-api -Obsoletes: maven-shared-plugin-tools-ant < 0:%{version}-%{release} -Provides: maven-shared-plugin-tools-ant = 0:%{version}-%{release} - -%description ant -Descriptor extractor for plugins written in Ant. - -%package api -Summary: Maven Plugin Tools APIs -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Obsoletes: maven-shared-plugin-tools-api < 0:%{version}-%{release} -Provides: maven-shared-plugin-tools-api = 0:%{version}-%{release} - -%description api -The Maven Plugin Tools API provides an API to extract information from -and generate documentation for Maven Plugins. - -%package beanshell -Summary: Maven Plugin Tool for Beanshell -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-api -Requires: bsh -Obsoletes: maven-shared-plugin-tools-beanshell < 0:%{version}-%{release} -Provides: maven-shared-plugin-tools-beanshell = 0:%{version}-%{release} - -%description beanshell -Descriptor extractor for plugins written in Beanshell. - -%package java -Summary: Maven Plugin Tool for Java -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-api -Obsoletes: maven-shared-plugin-tools-java < 0:%{version}-%{release} -Provides: maven-shared-plugin-tools-java = 0:%{version}-%{release} - -%description java -Descriptor extractor for plugins written in Java. - -# Note that this package contains code, not documentation. -# See comments about "javadocs" subpackage above. -%package javadoc -Summary: Maven Plugin Tools Javadoc -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-java - -%description javadoc -The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when -generating Javadoc. - -Java API documentation for %{name} is contained in -%{name}-javadocs package. This package does not contain it. - -%package model -Summary: Maven Plugin Metadata Model -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-java -Obsoletes: maven-shared-plugin-tools-model < 0:%{version}-%{release} -Provides: maven-shared-plugin-tools-model = 0:%{version}-%{release} - -%description model -The Maven Plugin Metadata Model provides an API to play with the Metadata -model. - -%package -n maven-plugin-plugin -Summary: Maven Plugin Plugin -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-java -Requires: %{name}-model -Requires: %{name}-beanshell -Requires: maven-doxia-sitetools -Requires: maven-shared-reporting-impl -Obsoletes: maven2-plugin-plugin < 0:%{version}-%{release} -Provides: maven2-plugin-plugin = 0:%{version}-%{release} - -%description -n maven-plugin-plugin -The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo's -found in the source tree, to include in the JAR. It is also used to generate -Xdoc files for the Mojos as well as for updating the plugin registry, the -artifact metadata and a generic help goal. %prep %setup -q -%patch0 -%patch1 -p1 -%patch2 -p1 +# For easier installation +ln -s maven-script/maven-script-{ant,beanshell} . + +# For bootstrapping only +sed -i "s|maven-plugin|jar|" maven-plugin-plugin/pom.xml + +%pom_xpath_inject "pom:project/pom:properties" " + UTF-8 + UTF-8" %build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mvn-rpmbuild package javadoc:aggregate +mvn-rpmbuild package javadoc:aggregate -Dmaven.test.failure.ignore=true %install -# jars install -d -m 755 %{buildroot}%{_javadir}/%{name} - -install -pm 644 maven-plugin-tools-ant/target/maven-plugin-tools-ant-%{version}.jar \ - %{buildroot}%{_javadir}/maven-plugin-tools/ant.jar -install -pm 644 maven-plugin-tools-api/target/maven-plugin-tools-api-%{version}.jar \ - %{buildroot}%{_javadir}/maven-plugin-tools/api.jar -install -pm 644 maven-plugin-tools-beanshell/target/maven-plugin-tools-beanshell-%{version}.jar \ - %{buildroot}%{_javadir}/maven-plugin-tools/beanshell.jar -install -pm 644 maven-plugin-tools-java/target/maven-plugin-tools-java-%{version}.jar \ - %{buildroot}%{_javadir}/maven-plugin-tools/java.jar -install -pm 644 maven-plugin-tools-javadoc/target/maven-plugin-tools-javadoc-%{version}.jar \ - %{buildroot}%{_javadir}/maven-plugin-tools/javadoc.jar -install -pm 644 maven-plugin-tools-model/target/maven-plugin-tools-model-%{version}.jar \ - %{buildroot}%{_javadir}/maven-plugin-tools/model.jar -install -pm 644 maven-plugin-plugin/target/maven-plugin-plugin-%{version}.jar \ - %{buildroot}%{_javadir}/maven-plugin-tools/plugin.jar - -# pom install -d -m 755 %{buildroot}%{_mavenpomdir} - -install -pm 644 pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom -%add_maven_depmap JPP.%{name}-%{name}.pom - -install -pm 644 %{name}-ant/pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-ant.pom -%add_maven_depmap -f ant JPP.%{name}-ant.pom %{name}/ant.jar - -install -pm 644 %{name}-api/pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-api.pom -%add_maven_depmap -f api JPP.%{name}-api.pom %{name}/api.jar - -install -pm 644 %{name}-beanshell/pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-beanshell.pom -%add_maven_depmap -f beanshell JPP.%{name}-beanshell.pom %{name}/beanshell.jar - -install -pm 644 %{name}-java/pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-java.pom -%add_maven_depmap -f java JPP.%{name}-java.pom %{name}/java.jar - -install -pm 644 %{name}-javadoc/pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-javadoc.pom -%add_maven_depmap -f javadoc JPP.%{name}-javadoc.pom %{name}/javadoc.jar - -install -pm 644 %{name}-model/pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-model.pom -%add_maven_depmap -f model JPP.%{name}-model.pom %{name}/model.jar - -install -pm 644 maven-plugin-plugin/pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP.%{name}-plugin.pom -%add_maven_depmap -f plugin JPP.%{name}-plugin.pom %{name}/plugin.jar -# add_maven_depmap macro supports name suffixes only, renaming ... -mv -f %{buildroot}%{_mavendepmapfragdir}/%{name}-plugin %{buildroot}%{_mavendepmapfragdir}/maven-plugin-plugin - -# javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +# pom artifacts +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom +%add_maven_depmap JPP.%{name}-%{name}.pom +install -pm 644 maven-script/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-script.pom +%add_maven_depmap -f maven-script JPP.%{name}-maven-script.pom +mv %{buildroot}%{_mavendepmapfragdir}/%{name}-maven-script %{buildroot}%{_mavendepmapfragdir}/maven-script + +# jar or plugin artifacts +for module in \ + maven-plugin-annotations \ + maven-plugin-plugin \ + maven-plugin-tools-annotations \ + maven-plugin-tools-ant \ + maven-plugin-tools-api \ + maven-plugin-tools-beanshell \ + maven-plugin-tools-generators \ + maven-plugin-tools-java \ + maven-plugin-tools-javadoc \ + maven-plugin-tools-model \ + maven-script-ant \ + maven-script-beanshell +do + install -p -m 644 ${module}/target/${module}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${module}.jar + install -p -m 644 ${module}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${module}.pom + %add_maven_depmap -f ${module} JPP.%{name}-${module}.pom %{name}/${module}.jar + mv %{buildroot}%{_mavendepmapfragdir}/%{name}-${module} %{buildroot}%{_mavendepmapfragdir}/${module} +done + +# javadoc +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} + +# bootstrap +cp %{SOURCE666} %{buildroot}%{_javadir}/%{name}/maven-plugin-plugin.jar %files %doc LICENSE NOTICE %{_mavenpomdir}/JPP.%{name}-%{name}.pom %{_mavendepmapfragdir}/%{name} +%files -n maven-plugin-annotations +%{_javadir}/%{name}/maven-plugin-annotations.jar +%{_mavenpomdir}/JPP.%{name}-maven-plugin-annotations.pom +%{_mavendepmapfragdir}/maven-plugin-annotations + +%files -n maven-plugin-plugin +%{_javadir}/%{name}/maven-plugin-plugin.jar +%{_mavenpomdir}/JPP.%{name}-maven-plugin-plugin.pom +%{_mavendepmapfragdir}/maven-plugin-plugin + +%files annotations +%{_javadir}/%{name}/%{name}-annotations.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-annotations.pom +%{_mavendepmapfragdir}/%{name}-annotations + +%files ant +%{_javadir}/%{name}/%{name}-ant.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-ant.pom +%{_mavendepmapfragdir}/%{name}-ant + +%files api +%{_javadir}/%{name}/%{name}-api.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-api.pom +%{_mavendepmapfragdir}/%{name}-api + +%files beanshell +%{_javadir}/%{name}/%{name}-beanshell.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-beanshell.pom +%{_mavendepmapfragdir}/%{name}-beanshell + +%files generators +%{_javadir}/%{name}/%{name}-generators.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-generators.pom +%{_mavendepmapfragdir}/%{name}-generators + +%files java +%{_javadir}/%{name}/%{name}-java.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-java.pom +%{_mavendepmapfragdir}/%{name}-java + +%files javadoc +%{_javadir}/%{name}/%{name}-javadoc.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-javadoc.pom +%{_mavendepmapfragdir}/%{name}-javadoc + +%files model +%{_javadir}/%{name}/%{name}-model.jar +%{_mavenpomdir}/JPP.%{name}-%{name}-model.pom +%{_mavendepmapfragdir}/%{name}-model + +%files -n maven-script +%{_mavenpomdir}/JPP.%{name}-maven-script.pom +%{_mavendepmapfragdir}/maven-script + +%files -n maven-script-ant +%{_javadir}/%{name}/maven-script-ant.jar +%{_mavenpomdir}/JPP.%{name}-maven-script-ant.pom +%{_mavendepmapfragdir}/maven-script-ant + +%files -n maven-script-beanshell +%{_javadir}/%{name}/maven-script-beanshell.jar +%{_mavenpomdir}/JPP.%{name}-maven-script-beanshell.pom +%{_mavendepmapfragdir}/maven-script-beanshell + %files javadocs %doc LICENSE NOTICE %{_javadocdir}/%{name} -%files ant -%{_javadir}/%{name}/ant.jar -%{_mavenpomdir}/JPP.%{name}-ant.pom -%{_mavendepmapfragdir}/%{name}-ant - -%files api -%{_javadir}/%{name}/api.jar -%{_mavenpomdir}/JPP.%{name}-api.pom -%{_mavendepmapfragdir}/%{name}-api - -%files beanshell -%{_javadir}/%{name}/beanshell.jar -%{_mavenpomdir}/JPP.%{name}-beanshell.pom -%{_mavendepmapfragdir}/%{name}-beanshell - -%files java -%{_javadir}/%{name}/java.jar -%{_mavenpomdir}/JPP.%{name}-java.pom -%{_mavendepmapfragdir}/%{name}-java - -%files javadoc -%{_javadir}/%{name}/javadoc.jar -%{_mavenpomdir}/JPP.%{name}-javadoc.pom -%{_mavendepmapfragdir}/%{name}-javadoc - -%files model -%{_javadir}/%{name}/model.jar -%{_mavenpomdir}/JPP.%{name}-model.pom -%{_mavendepmapfragdir}/%{name}-model - -%files -n maven-plugin-plugin -%{_javadir}/%{name}/plugin* -%{_mavenpomdir}/JPP.%{name}-plugin.pom -%{_mavendepmapfragdir}/maven-plugin-plugin %changelog +* Fri Sep 7 2012 Mikolaj Izdebski - 0:3.1-1 +- Update to upstream version 3.1 +- Bootstrap using prebuilt upstream binaries + * Thu Sep 6 2012 Mikolaj Izdebski - 0:2.7-7 - Remove rpm bug workaround