[maven-plugin-tools] Bump release
by Mikolaj Izdebski
commit cf2e9f966074cc920df852d7dcece15686bb4cd1
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Sep 10 16:35:35 2012 +0200
Bump release
maven-plugin-tools.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index 69830db..88b2a47 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,6 +1,6 @@
Name: maven-plugin-tools
Version: 3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Maven Plugin Tools
@@ -310,6 +310,9 @@ cp %{SOURCE666} %{buildroot}%{_javadir}/%{name}/maven-plugin-plugin.jar
%changelog
+* Mon Sep 10 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:3.1-2
+- Bump release
+
* Fri Sep 7 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:3.1-1
- Update to upstream version 3.1
- Bootstrap using prebuilt upstream binaries
11 years, 8 months
[maven-plugin-tools] Temporarly add prebuilt jar to sources
by Mikolaj Izdebski
commit 36a36f4c9cef523d7bebba6f337f4a36b1c62447
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Sep 10 16:15:59 2012 +0200
Temporarly add prebuilt jar to sources
sources | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/sources b/sources
index 0c89f75..9e39753 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
bb89380c61047753cbbacdba9375f168 maven-plugin-tools-3.1-source-release.zip
+cb9c6db787d5adb69f113feec9891059 maven-plugin-plugin-3.1.jar
11 years, 8 months
[maven-plugin-tools] Really add 3.1 zipball to sources
by Mikolaj Izdebski
commit fe35b2825d43f45232a3983225869b63b90c3c1a
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Sep 10 16:03:27 2012 +0200
Really add 3.1 zipball to sources
.gitignore | 1 +
sources | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 02173e2..3807249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-plugin-tools-2.1-src.tar.gz
maven-plugin-tools-2.6.tar.xz
maven-plugin-tools-2.7-source-release.zip
+/maven-plugin-tools-3.1-source-release.zip
diff --git a/sources b/sources
index c12c8a9..0c89f75 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-a92f27048203aeb39989a658a1ee66c8 maven-plugin-tools-2.6.tar.xz
-c1921e14bee0a85cc3500f0b611ff6af maven-plugin-tools-2.7-source-release.zip
+bb89380c61047753cbbacdba9375f168 maven-plugin-tools-3.1-source-release.zip
11 years, 8 months
[maven-plugin-tools] Update to upstream version 3.1
by Mikolaj Izdebski
commit 9416e5dc3aa192cc08042965f8bbd49c685beba7
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Sep 10 15:41:00 2012 +0200
Update to upstream version 3.1
- Bootstrap using prebuilt upstream binaries
0001-fix-for-new-jtidy.patch | 26 --
0002-maven3-compat.patch | 98 ------
0003-missing-com.sun-in-1.6.0-and-higher.patch | 17 -
maven-plugin-tools.spec | 383 ++++++++++++++----------
4 files changed, 218 insertions(+), 306 deletions(-)
---
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,105 +8,124 @@ 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}/%{ver...
+BuildArch: noarch
+
+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
-# 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
-
-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/m...
+
%description
The Maven Plugin Tools contains the necessary tools to be able to produce Maven
Plugins in a variety of languages.
-# 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
-# conform to the guidelines. mizdebsk, September 2012
-%package javadocs
-Group: Documentation
-Summary: Javadoc for %{name}
-Requires: jpackage-utils
+%package -n maven-plugin-annotations
+Summary: Maven Plugin Java 5 Annotations
+Requires: %{name} = %{epoch}:%{version}-%{release}
-%description javadocs
-API documentation for %{name}.
+%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
-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}
+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
-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}
+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
-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}
+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
-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}
+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 above.
+# See comments about "javadocs" subpackage below.
%package javadoc
-Summary: Maven Plugin Tools Javadoc
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: %{name}-java
+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
@@ -116,151 +135,185 @@ 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}
+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-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}
+%package -n maven-script
+Summary: Maven Script Mojo Support
+Requires: %{name} = %{epoch}:%{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.
+%description -n maven-script
+Maven Script Mojo Support lets developer write Maven plugins/goals
+with scripting languages instead of compiled Java.
-%prep
-%setup -q
-%patch0
-%patch1 -p1
-%patch2 -p1
+%package -n maven-script-ant
+Summary: Maven Ant Mojo Support
+Requires: maven-script = %{epoch}:%{version}-%{release}
-%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-rpmbuild package javadoc:aggregate
+%description -n maven-script-ant
+This package provides %{summary}, which write Maven plugins with
+Ant scripts.
-%install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
+%package -n maven-script-beanshell
+Summary: Maven Beanshell Mojo Support
+Requires: maven-script = %{epoch}:%{version}-%{release}
-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}
+%description -n maven-script-beanshell
+This package provides %{summary}, which write Maven plugins with
+Beanshell scripts.
-install -pm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom
+# 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
+# conform to the guidelines. mizdebsk, September 2012
+%package javadocs
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
-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
+%description javadocs
+API documentation for %{name}.
-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
+%prep
+%setup -q
+# For easier installation
+ln -s maven-script/maven-script-{ant,beanshell} .
-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
+# For bootstrapping only
+sed -i "s|<packaging>maven-plugin</packaging>|<packaging>jar</packaging>|" maven-plugin-plugin/pom.xml
-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
+%pom_xpath_inject "pom:project/pom:properties" "
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>"
-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
+%build
+mvn-rpmbuild package javadoc:aggregate -Dmaven.test.failure.ignore=true
-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
+%install
+install -d -m 755 %{buildroot}%{_javadir}/%{name}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -d -m 755 %{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
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-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 javadocs
-%doc LICENSE NOTICE
-%{_javadocdir}/%{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}/ant.jar
-%{_mavenpomdir}/JPP.%{name}-ant.pom
+%{_javadir}/%{name}/%{name}-ant.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}-ant.pom
%{_mavendepmapfragdir}/%{name}-ant
%files api
-%{_javadir}/%{name}/api.jar
-%{_mavenpomdir}/JPP.%{name}-api.pom
+%{_javadir}/%{name}/%{name}-api.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}-api.pom
%{_mavendepmapfragdir}/%{name}-api
%files beanshell
-%{_javadir}/%{name}/beanshell.jar
-%{_mavenpomdir}/JPP.%{name}-beanshell.pom
+%{_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}/java.jar
-%{_mavenpomdir}/JPP.%{name}-java.pom
+%{_javadir}/%{name}/%{name}-java.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}-java.pom
%{_mavendepmapfragdir}/%{name}-java
%files javadoc
-%{_javadir}/%{name}/javadoc.jar
-%{_mavenpomdir}/JPP.%{name}-javadoc.pom
+%{_javadir}/%{name}/%{name}-javadoc.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}-javadoc.pom
%{_mavendepmapfragdir}/%{name}-javadoc
%files model
-%{_javadir}/%{name}/model.jar
-%{_mavenpomdir}/JPP.%{name}-model.pom
+%{_javadir}/%{name}/%{name}-model.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}-model.pom
%{_mavendepmapfragdir}/%{name}-model
-%files -n maven-plugin-plugin
-%{_javadir}/%{name}/plugin*
-%{_mavenpomdir}/JPP.%{name}-plugin.pom
-%{_mavendepmapfragdir}/maven-plugin-plugin
+%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}
+
%changelog
+* Fri Sep 7 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:3.1-1
+- Update to upstream version 3.1
+- Bootstrap using prebuilt upstream binaries
+
* Thu Sep 6 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.7-7
- Remove rpm bug workaround
11 years, 8 months
