[java-sig-commits] [maven-doxia] Remove plexus-xmlrpc from BR

commit 0114a37a1c27343a049f0fde314e9a847583f521 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; Date: Mon Jan 9 14:06:35 2012 +0100 Remove plexus-xmlrpc from BR - Update patches to work without plexus-maven-plugin 0001-Use-plexus-component-metadata.patch | 66 +++++++++++++++----- ...a-core-remove-plexus-component-annotation.patch | 8 +- 0003-remove-clirr.patch | 10 ++-- 0004-Fix-itext-dependency.patch | 8 +- maven-doxia.spec | 39 +++++------ 5 files changed, 80 insertions(+), 51 deletions(-) --- diff --git a/0001-Use-plexus-component-metadata.patch b/0001-Use-plexus-component-metadata.patch index 8ba820f..1bae81c 100644 --- a/0001-Use-plexus-component-metadata.patch +++ b/0001-Use-plexus-component-metadata.patch @@ -1,20 +1,21 @@ -From e6c22bf1db4e155ee94cfc4c4b0f7e9b8150caaa Mon Sep 17 00:00:00 2001 +From 7571ce90ed2e3866f877da17ec17f963fb0ea410 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; -Date: Mon, 2 May 2011 14:35:50 +0200 -Subject: [PATCH 1/5] Use plexus-component-metadata +Date: Mon, 9 Jan 2012 10:11:51 +0100 +Subject: [PATCH 1/4] Use plexus-component-metadata --- - doxia-modules/doxia-module-apt/pom.xml | 8 ++++---- - doxia-modules/doxia-module-docbook-simple/pom.xml | 6 +++--- - doxia-modules/doxia-module-fml/pom.xml | 6 +++--- - doxia-modules/doxia-module-xdoc/pom.xml | 6 +++--- - 4 files changed, 13 insertions(+), 13 deletions(-) + doxia-modules/doxia-module-apt/pom.xml | 9 +++++---- + doxia-modules/doxia-module-docbook-simple/pom.xml | 7 ++++--- + doxia-modules/doxia-module-fml/pom.xml | 7 ++++--- + doxia-modules/doxia-module-xdoc/pom.xml | 7 ++++--- + pom.xml | 6 +++--- + 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml -index b7ccd9d..5128b3a 100644 +index b7ccd9d..12106b0 100644 --- a/doxia-modules/doxia-module-apt/pom.xml +++ b/doxia-modules/doxia-module-apt/pom.xml -@@ -53,21 +53,21 @@ under the License. +@@ -53,21 +53,22 @@ under the License. <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> @@ -31,6 +32,7 @@ index b7ccd9d..5128b3a 100644 <execution> <goals> - <goal>merge-descriptors</goal> ++ <goal>generate-metadata</goal> + <goal>merge-metadata</goal> </goals> </execution> @@ -42,10 +44,10 @@ index b7ccd9d..5128b3a 100644 \ No newline at end of file +</project> diff --git a/doxia-modules/doxia-module-docbook-simple/pom.xml b/doxia-modules/doxia-module-docbook-simple/pom.xml -index ebd2c24..1600077 100644 +index ebd2c24..34256cb 100644 --- a/doxia-modules/doxia-module-docbook-simple/pom.xml +++ b/doxia-modules/doxia-module-docbook-simple/pom.xml -@@ -49,17 +49,17 @@ under the License. +@@ -49,17 +49,18 @@ under the License. <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> @@ -62,15 +64,16 @@ index ebd2c24..1600077 100644 <execution> <goals> - <goal>merge-descriptors</goal> ++ <goal>generate-metadata</goal> + <goal>merge-metadata</goal> </goals> </execution> </executions> diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml -index 3a85888..ea30ea4 100644 +index 3a85888..84aa766 100644 --- a/doxia-modules/doxia-module-fml/pom.xml +++ b/doxia-modules/doxia-module-fml/pom.xml -@@ -81,17 +81,17 @@ under the License. +@@ -81,17 +81,18 @@ under the License. </plugin> <plugin> <groupId>org.codehaus.plexus</groupId> @@ -87,15 +90,16 @@ index 3a85888..ea30ea4 100644 <execution> <goals> - <goal>merge-descriptors</goal> ++ <goal>generate-metadata</goal> + <goal>merge-metadata</goal> </goals> </execution> </executions> diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml -index 1e8acfb..af44fbf 100644 +index 1e8acfb..4e59f87 100644 --- a/doxia-modules/doxia-module-xdoc/pom.xml +++ b/doxia-modules/doxia-module-xdoc/pom.xml -@@ -72,17 +72,17 @@ under the License. +@@ -72,17 +72,18 @@ under the License. </plugin> <plugin> <groupId>org.codehaus.plexus</groupId> @@ -112,10 +116,38 @@ index 1e8acfb..af44fbf 100644 <execution> <goals> - <goal>merge-descriptors</goal> ++ <goal>generate-metadata</goal> + <goal>merge-metadata</goal> </goals> </execution> </executions> +diff --git a/pom.xml b/pom.xml +index 4eff88e..fe06199 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -285,7 +285,7 @@ under the License. + </plugin> + <plugin> + <groupId>org.codehaus.plexus</groupId> +- <artifactId>plexus-maven-plugin</artifactId> ++ <artifactId>plexus-component-metadata</artifactId> + <!-- Version 1.3.8 makes the descriptor merges fail, probably due to PLX-409 --> + <version>1.3.5</version> + </plugin> +@@ -333,11 +333,11 @@ under the License. + <plugins> + <plugin> + <groupId>org.codehaus.plexus</groupId> +- <artifactId>plexus-maven-plugin</artifactId> ++ <artifactId>plexus-component-metadata</artifactId> + <executions> + <execution> + <goals> +- <goal>descriptor</goal> ++ <goal>generate-metadata</goal> + </goals> + </execution> + </executions> -- -1.7.4.4 +1.7.7.4 diff --git a/0002-doxia-core-remove-plexus-component-annotation.patch b/0002-doxia-core-remove-plexus-component-annotation.patch index 58ea2cb..1ed2623 100644 --- a/0002-doxia-core-remove-plexus-component-annotation.patch +++ b/0002-doxia-core-remove-plexus-component-annotation.patch @@ -1,7 +1,7 @@ -From fc05bd165735ec1b06639796531c7b26359889b1 Mon Sep 17 00:00:00 2001 +From 75e9cd2ddfb55ad2be4fa78c427bf0a98264e9aa Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; -Date: Mon, 2 May 2011 14:37:28 +0200 -Subject: [PATCH 2/5] doxia-core remove plexus component annotation +Date: Mon, 9 Jan 2012 10:12:31 +0100 +Subject: [PATCH 2/4] doxia-core remove plexus component annotation --- .../apache/maven/doxia/parser/AbstractParser.java | 1 - @@ -20,5 +20,5 @@ index 209d40e..cf47ab1 100644 public abstract class AbstractParser implements Parser -- -1.7.4.4 +1.7.7.4 diff --git a/0003-remove-clirr.patch b/0003-remove-clirr.patch index 94a27f2..a5f650e 100644 --- a/0003-remove-clirr.patch +++ b/0003-remove-clirr.patch @@ -1,7 +1,7 @@ -From 1857467fd4a18e1a9d4197d35baad4d334d3e708 Mon Sep 17 00:00:00 2001 +From c785fcc01e477576bf97aca73fe33a1e424b6985 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; -Date: Mon, 2 May 2011 14:41:53 +0200 -Subject: [PATCH 3/5] remove clirr +Date: Mon, 9 Jan 2012 10:12:54 +0100 +Subject: [PATCH 3/4] remove clirr --- doxia-maven-plugin/pom.xml | 13 ------------- @@ -33,7 +33,7 @@ index 92c6b6e..798b4f6 100644 <artifactId>maven-plugin-plugin</artifactId> <executions> diff --git a/pom.xml b/pom.xml -index 4eff88e..98cd1ba 100644 +index fe06199..8a71383 100644 --- a/pom.xml +++ b/pom.xml @@ -297,13 +297,6 @@ under the License. @@ -83,5 +83,5 @@ index 4eff88e..98cd1ba 100644 </profiles> </project> -- -1.7.4.4 +1.7.7.4 diff --git a/0004-Fix-itext-dependency.patch b/0004-Fix-itext-dependency.patch index d87ffa1..cd42890 100644 --- a/0004-Fix-itext-dependency.patch +++ b/0004-Fix-itext-dependency.patch @@ -1,7 +1,7 @@ -From e4530fbf04544c66f322bcf9992aa828564fd3bf Mon Sep 17 00:00:00 2001 +From 1c8937d712617f2ea13c2bfe1e38b6a616e17c8f Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; -Date: Mon, 2 May 2011 15:04:15 +0200 -Subject: [PATCH 4/5] Fix itext dependency +Date: Mon, 9 Jan 2012 10:13:16 +0100 +Subject: [PATCH 4/4] Fix itext dependency --- .../apache/maven/doxia/module/itext/ITextFont.java | 6 +++--- @@ -71,5 +71,5 @@ index 76770e4..d6b8d8a 100644 return currentField.getName(); } -- -1.7.4.4 +1.7.7.4 diff --git a/maven-doxia.spec b/maven-doxia.spec index f3d543c..c032369 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -30,7 +30,7 @@ Name: maven-doxia Version: 1.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Content generation framework License: ASL 2.0 @@ -79,7 +79,6 @@ BuildRequires: maven-shared-reporting-impl BuildRequires: maven-doxia-sitetools BuildRequires: maven-doxia-tools BuildRequires: modello-maven-plugin -BuildRequires: plexus-xmlrpc BuildRequires: servlet25 BuildRequires: classworlds BuildRequires: apache-commons-collections @@ -129,8 +128,6 @@ Requires: geronimo-parent-poms Requires: java >= 1:1.6.0 Requires: jpackage-utils -Requires(post): jpackage-utils >= 0:1.7.2 -Requires(postun): jpackage-utils >= 0:1.7.2 %description Doxia is a content generation framework which aims to provide its @@ -175,28 +172,30 @@ for targetdir in `find -type d -name target`; do modulename=`echo $targetdir | awk -F / '{print $(NF-1)}'` strippedmodulename=`echo $modulename | sed -e s:^doxia-::g` - # Does the module have a jar? - if [ -f $targetdir/$modulename-%{version}.jar ]; then - cp -p $targetdir/$modulename-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename.jar - fi - - # Skip parent pom if [ ! -z $strippedmodulename ]; then cp -p $targetdir/../pom.xml \ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$strippedmodulename.pom - %add_to_maven_depmap org.apache.maven.doxia $modulename %{version} JPP/maven-doxia $strippedmodulename + fi + + # Does the module have a jar? + if [ -f $targetdir/$modulename-%{version}.jar ]; then + cp -p $targetdir/$modulename-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename.jar + %add_maven_depmap JPP.%{name}-$strippedmodulename.pom %{name}/$strippedmodulename.jar + else + %add_maven_depmap JPP.%{name}-$strippedmodulename.pom fi done # Install parent pom install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-doxia-doxia.pom -%add_to_maven_depmap org.apache.maven.doxia doxia %{version} JPP/maven-doxia doxia +%add_maven_depmap JPP.maven-doxia-doxia.pom install -pm 644 doxia-modules/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-doxia-modules.pom -%add_to_maven_depmap org.apache.maven.doxia doxia-modules %{version} JPP/maven-doxia modules +%add_maven_depmap JPP.maven-doxia-modules.pom + install -d -m 0755 %{buildroot}/%{_datadir}/maven2/lib ln -s %{_javadir}/maven-doxia/logging-api.jar $RPM_BUILD_ROOT/%{_datadir}/maven2/lib/maven-doxia_logging-api.jar @@ -204,12 +203,6 @@ ln -s %{_javadir}/maven-doxia/logging-api.jar $RPM_BUILD_ROOT/%{_datadir}/maven2 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %pre javadoc # workaround for rpm bug, can be removed in F-17 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ @@ -218,13 +211,17 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %files %{_javadir}/%{name} %{_mavenpomdir}/* -%{_mavendepmapfragdir}/* +%{_mavendepmapfragdir}/%{name} %{_datadir}/maven2/lib/* %files javadoc %doc %{_javadocdir}/%{name} %changelog +* Mon Jan 9 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 0:1.2-3 +- Remove plexus-xmlrpc from BR +- Update patches to work without plexus-maven-plugin + * Fri May 6 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 0:1.2-2 - Add forgotten missing requires