rpms/maven-plugin-tools/devel old-modello.patch, NONE, 1.1 old-modello-2.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 maven-plugin-tools.spec, 1.2, 1.3
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue May 18 20:02:34 UTC 2010
Author: akurtakov
Update of /cvs/pkgs/rpms/maven-plugin-tools/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20684/devel
Modified Files:
.cvsignore sources maven-plugin-tools.spec
Added Files:
old-modello.patch old-modello-2.patch
Log Message:
Update to upstream 2.6.
old-modello.patch:
pom.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- NEW FILE old-modello.patch ---
--- maven-plugin-tools-model/pom.xml.sav 2010-05-18 15:47:29.753030190 +0300
+++ maven-plugin-tools-model/pom.xml 2010-05-18 15:47:53.986029227 +0300
@@ -63,9 +63,7 @@
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
- <models>
- <model>src/main/mdo/plugin-metadata.mdo</model>
- </models>
+ <model>src/main/mdo/plugin-metadata.mdo</model>
<version>1.0.0</version>
</configuration>
<executions>
old-modello-2.patch:
pom.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- NEW FILE old-modello-2.patch ---
--- maven-plugin-plugin/pom.xml.sav 2010-05-01 16:47:12.000000000 +0300
+++ maven-plugin-plugin/pom.xml 2010-05-18 15:54:16.205029291 +0300
@@ -216,9 +216,7 @@
</executions>
<configuration>
<version>1.0.0</version>
- <models>
- <model>src/main/mdo/pluginRequirements.mdo</model>
- </models>
+ <model>src/main/mdo/pluginRequirements.mdo</model>
</configuration>
</plugin>
</plugins>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 1 Sep 2009 06:54:19 -0000 1.2
+++ .cvsignore 18 May 2010 20:02:33 -0000 1.3
@@ -1 +1,2 @@
maven-plugin-tools-2.1-src.tar.gz
+maven-plugin-tools-2.6.tar.xz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 1 Sep 2009 06:54:19 -0000 1.2
+++ sources 18 May 2010 20:02:34 -0000 1.3
@@ -1 +1 @@
-b1059d97450f5f0cd0ff78d84f8da3f6 maven-plugin-tools-2.1-src.tar.gz
+a92f27048203aeb39989a658a1ee66c8 maven-plugin-tools-2.6.tar.xz
Index: maven-plugin-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-plugin-tools/devel/maven-plugin-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- maven-plugin-tools.spec 23 Nov 2009 12:24:03 -0000 1.2
+++ maven-plugin-tools.spec 18 May 2010 20:02:34 -0000 1.3
@@ -1,121 +1,166 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
Name: maven-plugin-tools
-Version: 2.1
-Release: 6%{?dist}
-Epoch: 0
+Version: 2.6
+Release: 1%{?dist}
Summary: Maven Plugin Tools
-License: ASL 2.0
+
Group: Development/Libraries
+License: ASL 2.0
URL: http://maven.apache.org/plugin-tools/
-Source0: %{name}-%{version}-src.tar.gz
-# svn export https://svn.apache.org/repos/asf/maven/shared/tags/maven-plugin-tools-2.1
-# tar czf maven-plugin-tools-2.1-src.tar.gz maven-plugin-tools-2.1
-
+Epoch: 0
+#svn export http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6 maven-plugin-tools-2.6
+#tar caf maven-plugin-tools-2.6.tar.xz maven-plugin-tools-2.6/
+Source0: %{name}-%{version}.tar.xz
+Patch0: old-modello.patch
+Patch1: old-modello-2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+BuildArch: noarch
-BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: maven2 >= 2.0.4-9
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-surefire = 2.3
-BuildRequires: maven-surefire-provider-junit = 2.3
-BuildRequires: maven2-common-poms >= 1.0-2
-BuildRequires: maven-doxia
-BuildRequires: maven-doxia-sitetools
-BuildRequires: classworlds
-BuildRequires: plexus-container-default
-BuildRequires: plexus-utils >= 1.4.5
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: maven2-plugin-install
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven-jar-plugin
+BuildRequires: maven2-plugin-source
+BuildRequires: plexus-maven-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-shared-test-tools
+BuildRequires: maven-plugin-testing-harness
+Requires: maven2
+Requires: jpackage-utils
+Requires: java
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
-BuildRequires: tomcat5
-BuildRequires: tomcat5-servlet-2.4-api
+%description
+The Maven Plugin Tools contains the necessary tools to be able to produce Maven Plugins in a variety of languages.
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
+%package javadocs
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
-%description
-The Maven Plugin Tools contains the necessary tools to play with Maven Plugins.
+%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-beanshell < 0:%{version}-%{release}
+Provides: maven-shared-plugin-tools-beanshell = 0:%{version}-%{release}
+
+%description java
+Descriptor extractor for plugins written in Java.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Documentation
+Summary: Maven Plugin Tools Javadoc
+Group: Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-java
%description javadoc
-Java API documentation for %{name}.
+The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when generating Javadoc.
+
+%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
+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 -n %{name}-%{version}
+%setup -q
+%patch0
+%patch1
%build
-
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install
-
-# Manual iteration should not be needed, but there is a bug in the javadoc
-# plugin which makes this necessary. See:
-# http://jira.codehaus.org/browse/MJAVADOC-157
-for dir in %{name}-*; do
- pushd $dir >& /dev/null
- mvn-jpp \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- javadoc:javadoc
- popd >& /dev/null
-done
+ -e \
+ -Dmaven2.jpp.mode=true \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven.test.skip=true \
+ package javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -d -m 755 %{buildroot}%{_javadir}/%{name}
install -pm 644 maven-plugin-tools-ant/target/maven-plugin-tools-ant-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-plugin-tools/ant-%{version}.jar
+ %{buildroot}%{_javadir}/maven-plugin-tools/ant-%{version}.jar
install -pm 644 maven-plugin-tools-api/target/maven-plugin-tools-api-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-plugin-tools/api-%{version}.jar
+ %{buildroot}%{_javadir}/maven-plugin-tools/api-%{version}.jar
install -pm 644 maven-plugin-tools-beanshell/target/maven-plugin-tools-beanshell-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-plugin-tools/beanshell-%{version}.jar
+ %{buildroot}%{_javadir}/maven-plugin-tools/beanshell-%{version}.jar
install -pm 644 maven-plugin-tools-java/target/maven-plugin-tools-java-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-plugin-tools/java-%{version}.jar
+ %{buildroot}%{_javadir}/maven-plugin-tools/java-%{version}.jar
+install -pm 644 maven-plugin-tools-javadoc/target/maven-plugin-tools-javadoc-%{version}.jar \
+ %{buildroot}%{_javadir}/maven-plugin-tools/javadoc-%{version}.jar
install -pm 644 maven-plugin-tools-model/target/maven-plugin-tools-model-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-plugin-tools/model-%{version}.jar
+ %{buildroot}%{_javadir}/maven-plugin-tools/model-%{version}.jar
+install -pm 644 maven-plugin-plugin/target/maven-plugin-plugin-%{version}.jar \
+ %{buildroot}%{_javadir}/maven-plugin-tools/plugin-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; \
do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
@@ -125,60 +170,102 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
install -pm 644 pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}.pom
-%add_to_maven_depmap org.apache.maven %{name} %{version} JPP/%{name} %{name}
+%add_to_maven_depmap org.apache.maven.plugin-tools %{name} %{version} JPP/%{name} %{name}
install -pm 644 maven-plugin-tools-ant/pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-ant.pom
-%add_to_maven_depmap org.apache.maven %{name}-ant %{version} JPP/%{name} ant
+%add_to_maven_depmap org.apache.maven.plugin-tools %{name}-ant %{version} JPP/%{name} ant
install -pm 644 maven-plugin-tools-api/pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-api.pom
-%add_to_maven_depmap org.apache.maven %{name}-api %{version} JPP/%{name} api
+%add_to_maven_depmap org.apache.maven.plugin-tools %{name}-api %{version} JPP/%{name} api
install -pm 644 maven-plugin-tools-beanshell/pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-beanshell.pom
-%add_to_maven_depmap org.apache.maven %{name}-beanshell %{version} JPP/%{name} beanshell
+%add_to_maven_depmap org.apache.maven.plugin-tools %{name}-beanshell %{version} JPP/%{name} beanshell
install -pm 644 maven-plugin-tools-java/pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-java.pom
-%add_to_maven_depmap org.apache.maven %{name}-java %{version} JPP/%{name} java
+%add_to_maven_depmap org.apache.maven.plugin-tools %{name}-java %{version} JPP/%{name} java
+
+install -pm 644 maven-plugin-tools-javadoc/pom.xml \
+ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-javadoc.pom
+%add_to_maven_depmap org.apache.maven.plugin-tools %{name}-javadoc %{version} JPP/%{name} javadoc
install -pm 644 maven-plugin-tools-model/pom.xml \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-model.pom
-%add_to_maven_depmap org.apache.maven %{name}-model %{version} JPP/%{name} model
+%add_to_maven_depmap org.apache.maven.plugin-tools %{name}-model %{version} JPP/%{name} model
+
+install -pm 644 maven-plugin-plugin/pom.xml \
+ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-plugin.pom
+%add_to_maven_depmap org.apache.maven.plugins maven-plugin-plugin %{version} JPP/%{name} plugin
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-for dir in %{name}-*; do
- install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$dir
+for dir in maven-plugin-*; do
+ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir
cp -pr $dir/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$dir/
+ %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir/
done
ln -s %{name}-%{version} \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
%update_maven_depmap
%postun
%update_maven_depmap
+%clean
+rm -rf %{buildroot}
+
%files
%defattr(-,root,root,-)
-%{_javadir}/%{name}
-%{_datadir}/maven2
-%{_mavendepmapfragdir}
+%{_javadir}/*
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+
+%files javadocs
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
+
+%files ant
+%defattr(-,root,root,-)
+%{_javadir}/%{name}/ant*
+
+%files api
+%defattr(-,root,root,-)
+%{_javadir}/%{name}/api*
+
+%files beanshell
+%defattr(-,root,root,-)
+%{_javadir}/%{name}/beanshell*
+
+%files java
+%defattr(-,root,root,-)
+%{_javadir}/%{name}/java.*
+%{_javadir}/%{name}/java-*
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%{_javadir}/%{name}/javadoc*
+
+%files model
+%defattr(-,root,root,-)
+%{_javadir}/%{name}/model*
+
+%files -n maven-plugin-plugin
+%defattr(-,root,root,-)
+%{_javadir}/%{name}/plugin*
%changelog
+* Tue May 18 2010 Alexander Kurtakov <akurtako at redhat.com> 2.6-0
+- Update to 2.6.
+- Separate modules as subpackages.
+
* Mon Nov 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-6
- BR maven-plugin-tools.
More information about the scm-commits
mailing list