[maven-plugin-tools] forced java version (1.6.0) because of missing com.sun.javadoc
by Jaromír Cápík
commit a948accbfd3409226465f14d6114fdba3055887d
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Tue Nov 15 18:50:23 2011 +0100
forced java version (1.6.0) because of missing com.sun.javadoc
maven-plugin-tools.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index 56f1169..73f7aae 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -15,7 +15,7 @@ Patch1: 0002-maven3-compat.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
12 years, 6 months
[maven-plugin-tools] minor spec fixes
by Jaromír Cápík
commit 37c6874cdf941acc667570409343abcc0d4543a7
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Tue Nov 15 18:12:00 2011 +0100
minor spec fixes
maven-plugin-tools.spec | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index bbfbfb3..56f1169 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -6,7 +6,6 @@ Summary: Maven Plugin Tools
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugin-tools/
-Epoch: 0
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{ver...
# this patch should be upstreamed (together with updated pom.xml
@@ -37,8 +36,6 @@ BuildRequires: modello
Requires: maven
Requires: jpackage-utils
Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
%description
The Maven Plugin Tools contains the necessary tools to be able to produce Maven Plugins in a variety of languages.
@@ -251,7 +248,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_mavendepmapfragdir}/maven-plugin-plugin
%changelog
-* Tue Aug 16 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:2.7-2
+* Tue Aug 16 2011 Jaromir Capik <jcapik(a)redhat.com> - 2.7-2
- Removal of plexus-maven-plugin (not needed)
- Migration to maven3
- Removal of unwanted file duplicates
12 years, 6 months
[plexus-i18n] migration to plexus-containers-component-metadata
by Jaromír Cápík
commit b91cec57362afbd88767ddbedb0b5050fead30b4
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Tue Nov 15 17:28:03 2011 +0100
migration to plexus-containers-component-metadata
plexus-i18n-migration-to-component-metadata.patch | 18 +++
plexus-i18n.spec | 127 ++++++---------------
2 files changed, 51 insertions(+), 94 deletions(-)
---
diff --git a/plexus-i18n-migration-to-component-metadata.patch b/plexus-i18n-migration-to-component-metadata.patch
new file mode 100644
index 0000000..06f2702
--- /dev/null
+++ b/plexus-i18n-migration-to-component-metadata.patch
@@ -0,0 +1,18 @@
+diff -Naur plexus-i18n-1.0-beta-10.orig/pom.xml plexus-i18n-1.0-beta-10/pom.xml
+--- plexus-i18n-1.0-beta-10.orig/pom.xml 2008-08-15 21:11:54.000000000 +0200
++++ plexus-i18n-1.0-beta-10/pom.xml 2011-07-28 15:43:00.813980336 +0200
+@@ -26,12 +26,11 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
+- <version>1.3.5</version>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/plexus-i18n.spec b/plexus-i18n.spec
index 7705b85..c05fada 100644
--- a/plexus-i18n.spec
+++ b/plexus-i18n.spec
@@ -28,14 +28,12 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define with_maven 1
%define parent plexus
%define subname i18n
Name: plexus-i18n
Version: 1.0
-Release: 0.b10.2%{?dist}.1
-Epoch: 0
+Release: 0.b10.2%{?dist}.2
Summary: Plexus I18N Component
License: ASL 2.0
Group: Development/Java
@@ -43,35 +41,29 @@ URL: http://plexus.codehaus.org/plexus-components/plexus-i18n
Source0: plexus-i18n-1.0-beta-10-src.tar.bz2
# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-i18n-1.0-bet...
# tar cjf plexus-i18n-1.0-beta-10-src.tar.bz2 plexus-i18n-1.0-beta-10/
-Source1: plexus-i18n-1.0-build.xml
-Source5: plexus-i18n-1.0-plexus-components.xml
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: %{name}-migration-to-component-metadata.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
BuildRequires: java-devel >= 1.6.0
-%if %{with_maven}
-BuildRequires: maven2 >= 2.0.4-10jpp
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
-BuildRequires: plexus-maven-plugin
-%endif
+BuildRequires: plexus-containers-component-metadata
BuildRequires: classworlds >= 0:1.1
-BuildRequires: plexus-container-default
-BuildRequires: plexus-utils
+BuildRequires: plexus-container-default
+BuildRequires: plexus-utils
Requires: classworlds >= 0:1.1
-Requires: plexus-container-default
-Requires: plexus-utils
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
+Requires: plexus-container-default
+Requires: plexus-utils
%description
The Plexus project seeks to create end-to-end developer tools for
@@ -92,96 +84,43 @@ Javadoc for %{name}.
%prep
%setup -q -n plexus-i18n-1.0-beta-10
-for j in $(find . -name "*.jar"); do
- mv $j $j.no
-done
-cp %{SOURCE1} build.xml
-mkdir -p src/main/resources/META-INF/plexus
+%patch0 -p1
%build
-%if %{with_maven}
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
-
-%else
-
-mkdir -p target/lib
-build-jar-repository -s -p target/lib \
-classworlds \
-plexus/container-default \
-plexus/utils \
-
-ant jar javadoc
-
-# inject pom and component descriptor into the jar (can be done via ant, but
-# since build.xml is autogenerated, it is best to do it here)
-mkdir -p META-INF/plexus META-INF/maven/org.codehaus.plexus/plexus-i18n/
-cp %{SOURCE5} META-INF/plexus/components.xml
-cp pom.xml META-INF/maven/org.codehaus.plexus/plexus-i18n/
-jar uvf target/%{name}-%{version}-beta-10.jar META-INF
-rm -rf META-INF
-
-%endif
+mvn-rpmbuild -e install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 target/%{name}-%{version}-beta-10.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/i18n-%{version}.jar
-%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
-
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}-beta-10.jar \
+ %{buildroot}/%{_javadir}/%{parent}/%{subname}.jar
# poms
-%if %{with_maven}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
-%endif
+install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom
+%add_maven_depmap JPP.%{name}.pom %{parent}/%{subname}.jar
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%if %{with_maven}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%else
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%endif
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%pre javadoc
+# workaround for rpm bug, can be removed in F-19
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%defattr(-,root,root,-)
-%{_javadir}/%{parent}/*
-%if %{with_maven}
-%{_datadir}/maven2/poms/*
-%endif
-%{_mavendepmapfragdir}
+%{_javadir}/%{parent}/%{subname}.jar
+%{_mavenpomdir}/JPP.%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%changelog
+* Thu Jul 28 2011 Jaromir Capik <jcapik(a)redhat.com> - 1.0-0.b10.2.2
+- Migration to maven3
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+- Minor spec file changes according to the latest guidelines
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.0-0.b10.2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 6 months
[plexus-active-collections] Migration to plexus-containers-component-metadata
by Stanislav Ochotnicky
commit 25d910d94150d665f79f800cfafa44542dbb99d0
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Wed Jul 27 14:13:04 2011 +0200
Migration to plexus-containers-component-metadata
...llections-migration-to-component-metadata.patch | 19 +++++++++++++++++++
plexus-active-collections.spec | 17 +++++++++--------
2 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/plexus-active-collections-migration-to-component-metadata.patch b/plexus-active-collections-migration-to-component-metadata.patch
new file mode 100644
index 0000000..a0554d2
--- /dev/null
+++ b/plexus-active-collections-migration-to-component-metadata.patch
@@ -0,0 +1,19 @@
+diff -Naur plexus-active-collections-1.0-beta-2.orig/pom.xml plexus-active-collections-1.0-beta-2/pom.xml
+--- plexus-active-collections-1.0-beta-2.orig/pom.xml 2008-02-19 04:54:43.000000000 +0100
++++ plexus-active-collections-1.0-beta-2/pom.xml 2011-07-27 13:51:58.963638701 +0200
+@@ -44,13 +44,12 @@
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
+- <version>1.3</version>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ <!--
diff --git a/plexus-active-collections.spec b/plexus-active-collections.spec
index ba6bd23..9871bb5 100644
--- a/plexus-active-collections.spec
+++ b/plexus-active-collections.spec
@@ -2,7 +2,7 @@
Name: plexus-active-collections
Version: 1.0
-Release: 0.4.beta2%{?dist}
+Release: 0.5.beta2%{?dist}
Summary: Plexus Container-Backed Active Collections
Group: Development/Libraries
@@ -12,6 +12,8 @@ URL: http://plexus.codehaus.org/
#tar zcf plexus-active-collections-1.0-beta-2.tar.gz plexus-active-collections-1.0-beta-2/
Source0: plexus-active-collections-1.0-beta-2.tar.gz
+Patch0: %{name}-migration-to-component-metadata.patch
+
BuildArch: noarch
BuildRequires: java >= 1:1.6.0
@@ -32,7 +34,7 @@ BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
BuildRequires: plexus-component-api
BuildRequires: plexus-container-default
BuildRequires: junit
@@ -61,6 +63,7 @@ API documentation for %{name}.
%prep
%setup -q -n %{name}-%{project_version}
+%patch0 -p1
%build
mvn-rpmbuild \
@@ -83,12 +86,6 @@ install -pm 644 pom.xml \
install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%{_javadir}/plexus/*
%{_mavenpomdir}/*
@@ -98,6 +95,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
%{_javadocdir}/plexus/%{name}
%changelog
+* Wed Jul 27 2011 Jaromir Capik <jcapik(a)redhat.com> - 1.0-0.5.beta2
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+- Minor spec file changes according to the latest guidelines
+
* Sun Jun 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-0.4.beta2
- Build with maven 3.x.
12 years, 6 months
[maven-scm] migration to plexus-containers-component-metadata
by Jaromír Cápík
commit b693f804e30072ea5d2e0edb9f0b69e503749c44
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Tue Nov 15 16:21:21 2011 +0100
migration to plexus-containers-component-metadata
...maven-scm_migration-to-component-metadata.patch | 324 ++++++++++++++++++++
maven-scm.spec | 22 +-
2 files changed, 333 insertions(+), 13 deletions(-)
---
diff --git a/007_maven-scm_migration-to-component-metadata.patch b/007_maven-scm_migration-to-component-metadata.patch
new file mode 100644
index 0000000..a39150f
--- /dev/null
+++ b/007_maven-scm_migration-to-component-metadata.patch
@@ -0,0 +1,324 @@
+diff -Naur maven-scm-1.5.orig/maven-scm-client/pom.xml maven-scm-1.5/maven-scm-client/pom.xml
+--- maven-scm-1.5.orig/maven-scm-client/pom.xml 2011-03-28 22:40:54.000000000 +0200
++++ maven-scm-1.5/maven-scm-client/pom.xml 2011-11-15 15:43:14.201177167 +0100
+@@ -103,7 +103,7 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>merge</id>
+@@ -114,7 +114,7 @@
+ </configuration>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>merge-descriptors</goal>
++ <goal>merge-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-managers/maven-scm-manager-plexus/pom.xml maven-scm-1.5/maven-scm-managers/maven-scm-manager-plexus/pom.xml
+--- maven-scm-1.5.orig/maven-scm-managers/maven-scm-manager-plexus/pom.xml 2011-03-28 22:40:36.000000000 +0200
++++ maven-scm-1.5/maven-scm-managers/maven-scm-manager-plexus/pom.xml 2011-11-15 15:47:10.186164414 +0100
+@@ -48,13 +48,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-accurev/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-accurev/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-accurev/pom.xml 2011-11-15 15:13:08.000000000 +0100
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-accurev/pom.xml 2011-11-15 15:44:34.857169286 +0100
+@@ -54,13 +54,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-bazaar/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-bazaar/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-bazaar/pom.xml 2011-03-28 22:40:52.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-bazaar/pom.xml 2011-11-15 15:46:26.137170177 +0100
+@@ -44,13 +44,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-clearcase/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-clearcase/pom.xml 2011-03-28 22:40:46.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-clearcase/pom.xml 2011-11-15 15:46:12.985169695 +0100
+@@ -44,13 +44,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-hg/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-hg/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-hg/pom.xml 2011-03-28 22:40:52.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-hg/pom.xml 2011-11-15 15:46:55.321166386 +0100
+@@ -59,13 +59,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-local/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-local/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-local/pom.xml 2011-03-28 22:40:50.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-local/pom.xml 2011-11-15 15:44:55.670171684 +0100
+@@ -37,13 +37,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-perforce/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-perforce/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-perforce/pom.xml 2011-03-28 22:40:38.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-perforce/pom.xml 2011-11-15 15:45:58.216174509 +0100
+@@ -44,13 +44,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml 2011-03-28 22:40:44.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml 2011-11-15 15:48:06.029164052 +0100
+@@ -51,13 +51,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml 2011-03-28 22:40:46.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml 2011-11-15 15:47:53.069170354 +0100
+@@ -62,13 +62,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml 2011-03-28 22:40:40.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml 2011-11-15 15:47:38.668164651 +0100
+@@ -55,13 +55,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml 2011-03-28 22:40:50.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml 2011-11-15 15:47:23.660165096 +0100
+@@ -55,13 +55,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-starteam/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-starteam/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-starteam/pom.xml 2011-03-28 22:40:46.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-starteam/pom.xml 2011-11-15 15:45:27.658178294 +0100
+@@ -37,13 +37,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-synergy/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-synergy/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-synergy/pom.xml 2011-03-28 22:40:54.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-synergy/pom.xml 2011-11-15 15:45:43.945169938 +0100
+@@ -37,13 +37,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-tfs/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-tfs/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-tfs/pom.xml 2011-03-28 22:40:52.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-tfs/pom.xml 2011-11-15 15:45:12.151173627 +0100
+@@ -72,13 +72,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-vss/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-vss/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-vss/pom.xml 2011-11-15 15:13:08.000000000 +0100
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-vss/pom.xml 2011-11-15 15:46:42.123173058 +0100
+@@ -37,13 +37,13 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff -Naur maven-scm-1.5.orig/src/site/apt/guide/new_provider.apt maven-scm-1.5/src/site/apt/guide/new_provider.apt
+--- maven-scm-1.5.orig/src/site/apt/guide/new_provider.apt 2011-03-28 22:40:54.000000000 +0200
++++ maven-scm-1.5/src/site/apt/guide/new_provider.apt 2011-11-15 15:48:41.388159931 +0100
+@@ -84,12 +84,11 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
+- <version>1.3.8</version>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/maven-scm.spec b/maven-scm.spec
index 2b8fa4b..8563930 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -30,8 +30,7 @@
Name: maven-scm
Version: 1.5
-Release: 1%{?dist}
-Epoch: 0
+Release: 2%{?dist}
Summary: Common API for doing SCM operations
License: ASL 2.0
Group: Development/Libraries
@@ -47,7 +46,7 @@ Patch1: 004_maven-scm_fix-svn-provider-java.patch
# fix modello configuration in vss provider pom and the cast as above
Patch2: 005_maven-scm_fix-vss-provider-pom.patch
Patch3: 006_maven-scm_fix-vss-provider-java.patch
-
+Patch4: 007_maven-scm_migration-to-component-metadata.patch
BuildArch: noarch
@@ -74,7 +73,7 @@ BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-interpolation
BuildRequires: bzr
BuildRequires: subversion
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
BuildRequires: plexus-classworlds
Requires: junit >= 3.8.2
@@ -115,11 +114,14 @@ Javadoc for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# We dont have mockito, needed for accurev tests, disable for now
find maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev -type f -name "*Test*" -exec rm -f '{}' \;
%build
+
+# -Dmaven.test.skip=true \
mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
-Dmaven.local.depmap.file=%{SOURCE1} \
@@ -157,14 +159,7 @@ cp -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-scm-scm.pom
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/api*
%{_javadir}/%{name}/client*
@@ -175,16 +170,17 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_mavendepmapfragdir}/*
%files test
-%defattr(-,root,root,-)
%{_javadir}/%{name}/provider-cvstest*
%{_javadir}/%{name}/provider-svntest*
%{_javadir}/%{name}/test*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/*
%changelog
+* Tue Nov 15 2011 Jaromir Capik <jcapik(a)redhat.com> 1.5-2
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+
* Tue Apr 5 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.5-1
- Update to upstream 1.5 release.
- Build with maven 3.
12 years, 6 months
[maven-plugin-tools] missing modello dependency added
by Jaromír Cápík
commit ebe53a563a4dae045f95d24f3cd0153f831be2a4
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Tue Nov 15 15:00:32 2011 +0100
missing modello dependency added
maven-plugin-tools.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index 343e55e..bbfbfb3 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -33,6 +33,7 @@ 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
12 years, 6 months
[maven-plugin-tools] plexus-maven-plugin removal, migration to maven3
by Jaromír Cápík
commit 6252a69ad75fd8ba64881099c33455f2982a6114
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Tue Nov 15 14:42:44 2011 +0100
plexus-maven-plugin removal, migration to maven3
0002-maven3-compat.patch | 98 +++++++++++++++++++++++++++++++++++++++++
maven-plugin-tools.spec | 108 ++++++++++++++++++++++++----------------------
2 files changed, 155 insertions(+), 51 deletions(-)
---
diff --git a/0002-maven3-compat.patch b/0002-maven3-compat.patch
new file mode 100644
index 0000000..1e802ca
--- /dev/null
+++ b/0002-maven3-compat.patch
@@ -0,0 +1,98 @@
+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 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+
+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 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <artifactId>maven-compat</artifactId>
+ </dependency>
+
+ <!-- plexus -->
+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 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <artifactId>maven-compat</artifactId>
+ </dependency>
+
+ <!-- misc -->
+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 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <artifactId>maven-compat</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+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 @@
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <artifactId>maven-compat</artifactId>
+ </dependency>
+
+ <!-- plexus -->
+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 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
+- <version>2.0.6</version>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.2</version>
+ </dependency>
+
+ <!-- plexus -->
+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 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <artifactId>maven-compat</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+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 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-plugin-descriptor</artifactId>
++ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index 0a7ce36..343e55e 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,6 +1,6 @@
Name: maven-plugin-tools
Version: 2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven Plugin Tools
Group: Development/Libraries
@@ -12,6 +12,7 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugin-tools/%{na
# 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
BuildArch: noarch
@@ -24,7 +25,6 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-site-plugin
-BuildRequires: plexus-maven-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-doxia-tools
@@ -135,11 +135,11 @@ plugin registry, the artifact metadata and a generic help goal.
%prep
%setup -q
%patch0
+%patch1 -p1
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-rpmbuild \
- package javadoc:aggregate
+mvn-rpmbuild package javadoc:aggregate
%install
# jars
@@ -161,39 +161,41 @@ install -pm 644 maven-plugin-plugin/target/maven-plugin-plugin-%{version}.jar \
%{buildroot}%{_javadir}/maven-plugin-tools/plugin.jar
# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}.pom
-%add_to_maven_depmap org.apache.maven.plugin-tools %{name} %{version} JPP/%{name} %{name}
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+%add_maven_depmap JPP.%{name}-%{name}.pom
-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.plugin-tools %{name}-ant %{version} JPP/%{name} ant
+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 maven-plugin-tools-api/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-api.pom
-%add_to_maven_depmap org.apache.maven.plugin-tools %{name}-api %{version} JPP/%{name} api
+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 maven-plugin-tools-beanshell/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-beanshell.pom
-%add_to_maven_depmap org.apache.maven.plugin-tools %{name}-beanshell %{version} JPP/%{name} beanshell
+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 maven-plugin-tools-java/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-java.pom
-%add_to_maven_depmap org.apache.maven.plugin-tools %{name}-java %{version} JPP/%{name} java
+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 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 %{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 maven-plugin-tools-model/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-model.pom
-%add_to_maven_depmap org.apache.maven.plugin-tools %{name}-model %{version} JPP/%{name} model
+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 \
- $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
+ %{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}
@@ -205,51 +207,55 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadocs
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%files ant
-%defattr(-,root,root,-)
-%{_javadir}/%{name}/ant*
+%{_javadir}/%{name}/ant.jar
+%{_mavenpomdir}/JPP.%{name}-ant.pom
+%{_mavendepmapfragdir}/%{name}-ant
%files api
-%defattr(-,root,root,-)
-%{_javadir}/%{name}/api*
+%{_javadir}/%{name}/api.jar
+%{_mavenpomdir}/JPP.%{name}-api.pom
+%{_mavendepmapfragdir}/%{name}-api
%files beanshell
-%defattr(-,root,root,-)
-%{_javadir}/%{name}/beanshell*
+%{_javadir}/%{name}/beanshell.jar
+%{_mavenpomdir}/JPP.%{name}-beanshell.pom
+%{_mavendepmapfragdir}/%{name}-beanshell
%files java
-%defattr(-,root,root,-)
-%{_javadir}/%{name}/java.*
+%{_javadir}/%{name}/java.jar
+%{_mavenpomdir}/JPP.%{name}-java.pom
+%{_mavendepmapfragdir}/%{name}-java
%files javadoc
-%defattr(-,root,root,-)
-%{_javadir}/%{name}/javadoc*
+%{_javadir}/%{name}/javadoc.jar
+%{_mavenpomdir}/JPP.%{name}-javadoc.pom
+%{_mavendepmapfragdir}/%{name}-javadoc
%files model
-%defattr(-,root,root,-)
-%{_javadir}/%{name}/model*
+%{_javadir}/%{name}/model.jar
+%{_mavenpomdir}/JPP.%{name}-model.pom
+%{_mavendepmapfragdir}/%{name}-model
%files -n maven-plugin-plugin
-%defattr(-,root,root,-)
%{_javadir}/%{name}/plugin*
+%{_mavenpomdir}/JPP.%{name}-plugin.pom
+%{_mavendepmapfragdir}/maven-plugin-plugin
%changelog
+* Tue Aug 16 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:2.7-2
+- Removal of plexus-maven-plugin (not needed)
+- Migration to maven3
+- Removal of unwanted file duplicates
+- Minor spec file changes according to the latest guidelines
+
* Sat Feb 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.7-1
- Update to new upstream release.
- Adapt to current guidelines.
12 years, 6 months