[maven-doxia] New bugfix version
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Sep 7 15:35:10 UTC 2010
commit a56557aa9f5c57a64ad45f8cdd03a9029f144bb1
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue Sep 7 17:34:34 2010 +0200
New bugfix version
Other changes:
- Fix javadoc generation error
- Use %%{_mavenpomdir} macro
- Update BRs to latest maven plugin names
- Use new plexus-containers components
- Remove/update old patches
maven-doxia-Use-plexus-component-metadata.patch | 121 +++++++++++++++++++++++
maven-doxia-core-add-default-role-hint.patch | 25 +++++
maven-doxia-helpmojo.patch | 22 ----
maven-doxia-remove-clirr.patch | 39 +++++---
maven-doxia-xdoc.patch | 55 ----------
maven-doxia.spec | 82 +++++++++-------
6 files changed, 219 insertions(+), 125 deletions(-)
---
diff --git a/maven-doxia-Use-plexus-component-metadata.patch b/maven-doxia-Use-plexus-component-metadata.patch
new file mode 100644
index 0000000..caf3b52
--- /dev/null
+++ b/maven-doxia-Use-plexus-component-metadata.patch
@@ -0,0 +1,121 @@
+From 38468ab042faad8a454c3510a558e50357cd5458 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 7 Sep 2010 14:47:48 +0200
+Subject: [PATCH 1/3] 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(-)
+
+diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml
+index e2c3a20..4b1d7fd 100644
+--- a/doxia-modules/doxia-module-apt/pom.xml
++++ b/doxia-modules/doxia-module-apt/pom.xml
+@@ -49,21 +49,21 @@ under the License.
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/components/components.xml</descriptor>
+- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
++ <descriptor>target/classes/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+- <goal>merge-descriptors</goal>
++ <goal>merge-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+-</project>
+\ 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 cd54c74..920658b 100644
+--- a/doxia-modules/doxia-module-docbook-simple/pom.xml
++++ b/doxia-modules/doxia-module-docbook-simple/pom.xml
+@@ -45,17 +45,17 @@ under the License.
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/components/components.xml</descriptor>
+- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
++ <descriptor>target/classes/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+- <goal>merge-descriptors</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 b14bb65..d4048b3 100644
+--- a/doxia-modules/doxia-module-fml/pom.xml
++++ b/doxia-modules/doxia-module-fml/pom.xml
+@@ -77,17 +77,17 @@ under the License.
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/components/components.xml</descriptor>
+- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
++ <descriptor>target/classes/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+- <goal>merge-descriptors</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 fbf6a14..af4fbc9 100644
+--- a/doxia-modules/doxia-module-xdoc/pom.xml
++++ b/doxia-modules/doxia-module-xdoc/pom.xml
+@@ -58,17 +58,17 @@ under the License.
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/components/components.xml</descriptor>
+- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
++ <descriptor>target/classes/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+- <goal>merge-descriptors</goal>
++ <goal>merge-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+--
+1.7.2.2
+
diff --git a/maven-doxia-core-add-default-role-hint.patch b/maven-doxia-core-add-default-role-hint.patch
new file mode 100644
index 0000000..dadb726
--- /dev/null
+++ b/maven-doxia-core-add-default-role-hint.patch
@@ -0,0 +1,25 @@
+From 10861fa2990e898a7810aff5b713f3e0301035c8 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 7 Sep 2010 17:03:29 +0200
+Subject: [PATCH 2/3] doxia-core add default role-hint
+
+---
+ .../apache/maven/doxia/parser/AbstractParser.java | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
+index 11419c1..8c94ff4 100644
+--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
++++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
+@@ -38,7 +38,7 @@ import org.apache.maven.doxia.sink.Sink;
+ * @author Jason van Zyl
+ * @version $Id: AbstractParser.java 946932 2010-05-21 08:36:30Z ltheussl $
+ * @since 1.0
+- * @plexus.component
++ * @plexus.component role-hint="default"
+ */
+ public abstract class AbstractParser
+ implements Parser
+--
+1.7.2.2
+
diff --git a/maven-doxia-remove-clirr.patch b/maven-doxia-remove-clirr.patch
index a325b0c..9632f42 100644
--- a/maven-doxia-remove-clirr.patch
+++ b/maven-doxia-remove-clirr.patch
@@ -1,7 +1,18 @@
-diff -ur maven-doxia-1.1.2.orig/doxia-maven-plugin/pom.xml maven-doxia-1.1.2/doxia-maven-plugin/pom.xml
---- maven-doxia-1.1.2.orig/doxia-maven-plugin/pom.xml 2010-02-12 14:09:50.422028368 +0000
-+++ maven-doxia-1.1.2/doxia-maven-plugin/pom.xml 2010-02-12 14:12:54.807362542 +0000
-@@ -159,19 +159,6 @@
+From 3e274e90a9b179454bbad6d94cd22d08f73887dd Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 7 Sep 2010 17:22:48 +0200
+Subject: [PATCH 3/3] remove clirr
+
+---
+ doxia-maven-plugin/pom.xml | 13 -------------
+ pom.xml | 24 ------------------------
+ 2 files changed, 0 insertions(+), 37 deletions(-)
+
+diff --git a/doxia-maven-plugin/pom.xml b/doxia-maven-plugin/pom.xml
+index 9239463..26e6017 100644
+--- a/doxia-maven-plugin/pom.xml
++++ b/doxia-maven-plugin/pom.xml
+@@ -159,19 +159,6 @@ under the License.
</executions>
</plugin>
<plugin>
@@ -21,10 +32,11 @@ diff -ur maven-doxia-1.1.2.orig/doxia-maven-plugin/pom.xml maven-doxia-1.1.2/dox
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<executions>
-diff -ur maven-doxia-1.1.2.orig/pom.xml maven-doxia-1.1.2/pom.xml
---- maven-doxia-1.1.2.orig/pom.xml 2010-02-12 14:09:50.462027911 +0000
-+++ maven-doxia-1.1.2/pom.xml 2010-02-12 14:13:06.637028412 +0000
-@@ -290,14 +290,6 @@
+diff --git a/pom.xml b/pom.xml
+index 748e087..7c2ac8b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -285,14 +285,6 @@ under the License.
<version>2.1.2</version>
</plugin>
<plugin>
@@ -37,9 +49,9 @@ diff -ur maven-doxia-1.1.2.orig/pom.xml maven-doxia-1.1.2/pom.xml
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
-@@ -331,18 +323,6 @@
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.2</version>
+@@ -331,18 +323,6 @@ under the License.
</execution>
</executions>
</plugin>
@@ -58,7 +70,7 @@ diff -ur maven-doxia-1.1.2.orig/pom.xml maven-doxia-1.1.2/pom.xml
</plugins>
</build>
-@@ -437,10 +417,6 @@
+@@ -412,10 +392,6 @@ under the License.
<configLocation>http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk/src/main/resources/config/doxia_checkstyle.xml</configLocation>
</configuration>
</plugin>
@@ -69,3 +81,6 @@ diff -ur maven-doxia-1.1.2.orig/pom.xml maven-doxia-1.1.2/pom.xml
</plugins>
</reporting>
</profile>
+--
+1.7.2.2
+
diff --git a/maven-doxia.spec b/maven-doxia.spec
index f060e27..d7cf32d 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -29,31 +29,34 @@
#
Name: maven-doxia
-Version: 1.1.2
-Release: 3%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
Epoch: 0
Summary: Content generation framework
License: ASL 2.0
-Group: Development/Java
+Group: Development/Libraries
URL: http://maven.apache.org/doxia/
-# svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.1.2
-# tar czf maven-doxia-1.1.2-tar.gz maven-doxia-1.1.2/
+# svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.1.3 maven-doxia-1.1.3
+# tar czf maven-doxia-1.1.3.tar.gz maven-doxia-1.1.3/
Source0: %{name}-%{version}.tar.gz
# Point it at the correct plexus-container-default
-Source1: %{name}-depmap.xml
+Source1: %{name}-depmap.xml
# Build against iText 2.x
# http://jira.codehaus.org/browse/DOXIA-53
Patch0: %{name}-itext2.patch
-
Patch1: %{name}-remove-clirr.patch
-Patch2: %{name}-modello-1.0.patch
+
+# TODO: push upstream
+Patch2: %{name}-Use-plexus-component-metadata.patch
+
Patch3: %{name}-assert.patch
-# Patch4: %{name}-xdoc.patch
-Patch5: %{name}-helpmojo.patch
-Patch6: %{name}-skip-plugin.patch
+Patch4: %{name}-skip-plugin.patch
+
+# TODO: push upstream
+Patch5: %{name}-core-add-default-role-hint.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,13 +68,15 @@ BuildRequires: ant, ant-nodeps
BuildRequires: itext >= 2.1.7-4
BuildRequires: plexus-cli >= 1.2-8
BuildRequires: maven2 >= 0:2.0.4-9
-BuildRequires: maven2-plugin-assembly
+BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-resources-plugin
BuildRequires: maven-plugin-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: maven-shade-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-shared-reporting-impl
@@ -89,13 +94,16 @@ BuildRequires: jakarta-commons-validator
BuildRequires: jakarta-commons-configuration
BuildRequires: junit
BuildRequires: oro
-BuildRequires: plexus-container-default
+#BuildRequires: plexus-container-default
BuildRequires: plexus-i18n
BuildRequires: plexus-utils >= 1.5.7
BuildRequires: plexus-velocity
BuildRequires: plexus-build-api
BuildRequires: velocity
BuildRequires: fop
+BuildRequires: plexus-containers-component-metadata
+BuildRequires: plexus-containers-component-javadoc
+BuildRequires: plexus-containers-container-default
Requires: classworlds
Requires: jakarta-commons-collections
@@ -135,14 +143,14 @@ API documentation for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+#%patch4 -p1
+%patch5 -p1
-# %patch4 -p1
-# rm -rf doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc
-# rm -f doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java
+#rm -fr doxia-maven-plugin
-%patch6 -p1
+# use new plexus-javadoc taglet replacement
+sed -i 's:plexus-javadoc:plexus-component-javadoc:' pom.xml
-rm -fr doxia-maven-plugin
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -151,16 +159,16 @@ mkdir -p $MAVEN_REPO_LOCAL
mvn-jpp \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.skip=true \
-Dmaven2.jpp.depmap.file=%{SOURCE1} \
- install javadoc:javadoc
+ -Dmaven.test.skip=true \
+ install javadoc:aggregate
%install
rm -rf $RPM_BUILD_ROOT
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
for targetdir in `find -type d -name target`; do
@@ -179,35 +187,29 @@ for targetdir in `find -type d -name target`; do
# Skip parent pom
if [ ! -z $strippedmodulename ]; then
cp -p $targetdir/../pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-$strippedmodulename.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$strippedmodulename.pom
%add_to_maven_depmap org.apache.maven.doxia $modulename %{version} JPP/maven-doxia $strippedmodulename
fi
-
+
done
# Install parent pom
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-doxia.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
-install -pm 644 doxia-modules/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.maven-doxia-modules.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
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
-# Install parent javadocs
+# Install symlinks
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; \
do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc (all javadocs are contained in the main module docs dir used below)
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm -fr doxia-modules
-rm -fr doxia-test-docs
-for dir in doxia*; do
- install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir
- cp -pr $dir/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir/
-done
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%post
%update_maven_depmap
@@ -230,6 +232,14 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/*
%changelog
+* Tue Sep 7 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.1.3-1
+- New bugfix version
+- Fix javadoc generation error
+- Use %%{_mavenpomdir} macro
+- Update BRs to latest maven plugin names
+- Use new plexus-containers components
+- Remove/update old patches
+
* Tue May 25 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.2-3
- Update for transitional maven state.
- Install doxia-modules pom.
More information about the scm-commits
mailing list