[maven-doxia-sitetools] Update to 1.1.3
Stanislav Ochotnicky
sochotni at fedoraproject.org
Wed Sep 8 08:14:12 UTC 2010
commit 2be2f6f16bea616e21347a9e42376ff507db123c
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue Sep 7 19:51:42 2010 +0200
Update to 1.1.3
Also:
- Enable javadoc generation again
- Update maven plugins BRs
.gitignore | 1 +
maven-doxia-sitetools-clirr.patch | 35 +++++++++-----
maven-doxia-sitetools.spec | 90 ++++++++++++++++++-------------------
sources | 2 +-
4 files changed, 68 insertions(+), 60 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 621e85b..7295277 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-doxia-sitetools-1.0-alpha10-src.tar.gz
+/maven-doxia-sitetools-1.1.3.tar.gz
diff --git a/maven-doxia-sitetools-clirr.patch b/maven-doxia-sitetools-clirr.patch
index 64a0a46..cc13006 100644
--- a/maven-doxia-sitetools-clirr.patch
+++ b/maven-doxia-sitetools-clirr.patch
@@ -1,12 +1,19 @@
-Common subdirectories: maven-doxia-sitetools-1.1.2/doxia-decoration-model and maven-doxia-sitetools-1.1.2.clirr/doxia-decoration-model
-Common subdirectories: maven-doxia-sitetools-1.1.2/doxia-doc-renderer and maven-doxia-sitetools-1.1.2.clirr/doxia-doc-renderer
-Common subdirectories: maven-doxia-sitetools-1.1.2/doxia-site-renderer and maven-doxia-sitetools-1.1.2.clirr/doxia-site-renderer
-diff -u maven-doxia-sitetools-1.1.2/pom.xml maven-doxia-sitetools-1.1.2.clirr/pom.xml
---- maven-doxia-sitetools-1.1.2/pom.xml 2009-11-30 12:53:09.402277000 +0000
-+++ maven-doxia-sitetools-1.1.2.clirr/pom.xml 2010-02-12 15:11:51.822043981 +0000
-@@ -242,14 +242,6 @@
- <version>1.1</version>
- </plugin>
+From 1f8e11b7e1000831cc05e78965e41b0f38a94902 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 7 Sep 2010 19:37:50 +0200
+Subject: [PATCH] clirr
+
+---
+ pom.xml | 26 --------------------------
+ 1 files changed, 0 insertions(+), 26 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index a50d44c..2a803f6 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -242,14 +242,6 @@ under the License.
+ <version>2.4.2</version>
+ </plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
@@ -18,8 +25,8 @@ diff -u maven-doxia-sitetools-1.1.2/pom.xml maven-doxia-sitetools-1.1.2.clirr/po
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
-@@ -271,20 +263,6 @@
+ <version>2.7</version>
+@@ -271,20 +263,6 @@ under the License.
</plugin>
</plugins>
</pluginManagement>
@@ -40,7 +47,7 @@ diff -u maven-doxia-sitetools-1.1.2/pom.xml maven-doxia-sitetools-1.1.2.clirr/po
</build>
<reporting>
-@@ -351,10 +329,6 @@
+@@ -326,10 +304,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>
@@ -51,4 +58,6 @@ diff -u maven-doxia-sitetools-1.1.2/pom.xml maven-doxia-sitetools-1.1.2.clirr/po
</plugins>
</reporting>
</profile>
-Common subdirectories: maven-doxia-sitetools-1.1.2/src and maven-doxia-sitetools-1.1.2.clirr/src
+--
+1.7.2.2
+
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index f5f3603..f045127 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -28,20 +28,20 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define parent maven-doxia
-%define subproj sitetools
+%global parent maven-doxia
+%global subproj sitetools
Name: %{parent}-%{subproj}
-Version: 1.1.2
-Release: 3%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
Summary: Doxia content generation framework
License: ASL 2.0
Group: Development/Tools
URL: http://maven.apache.org/doxia/
-# http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.1.2/ \
-# maven-doxia-sitetools-1.1.2
-# tar czf maven-doxia-sitetools-1.1.2.tar.gz maven-doxia-sitetools-1.1.2/
+# svn export http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.1.3/ \
+# maven-doxia-sitetools-1.1.3
+# tar czf maven-doxia-sitetools-1.1.3.tar.gz maven-doxia-sitetools-1.1.3
Source0: %{name}-%{version}.tar.gz
# Point it at the correct plexus-container-default
@@ -54,14 +54,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: itext >= 2.1.7
BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: maven2 >= 0: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-site
-BuildRequires: maven2-plugin-surefire
+BuildRequires: maven2
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia = %{version}
@@ -71,12 +71,13 @@ BuildRequires: plexus-xmlrpc >= 0:1.0-0.b4.3
BuildRequires: classworlds
BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-configuration
-BuildRequires: jakarta-commons-logging
+BuildRequires: apache-commons-logging
BuildRequires: jakarta-commons-validator
BuildRequires: junit
BuildRequires: oro
BuildRequires: plexus-container-default
BuildRequires: plexus-containers-container-default
+BuildRequires: plexus-containers-component-javadoc
BuildRequires: plexus-i18n
BuildRequires: plexus-utils >= 1.5.7
BuildRequires: plexus-velocity
@@ -113,12 +114,13 @@ content. Doxia can be used to generate static sites in addition to
being incorporated into dynamic content generation systems like blogs,
wikis and content management systems.
-# %package javadoc
-# Summary: Javadoc for %{name}
-# Group: Documentation
-#
-# %description javadoc
-# API documentation for %{name}.
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+API documentation for %{name}.
%prep
%setup -q
@@ -129,6 +131,9 @@ wikis and content management systems.
%patch1 -p1
rm -rf doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/
+# use new taglet name
+sed -i 's:plexus-javadoc:plexus-component-javadoc:' pom.xml
+
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -140,15 +145,8 @@ mvn-jpp \
-Dmaven.test.failure.ignore=true \
-Dmaven.test.skip=true \
-Dmaven2.jpp.depmap.file=%{SOURCE1} \
- install
+ install javadoc:aggregate
-# for dir in doxia*; do
-# pushd $dir
-# mvn-jpp \
-# -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-# javadoc:javadoc
-# popd
-# done
%post
%update_maven_depmap
@@ -160,12 +158,12 @@ mvn-jpp \
rm -rf $RPM_BUILD_ROOT
# jars/poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -m 644 -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-sitetools.pom
-install -m 644 -p doxia-decoration-model/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-decoration-model.pom
-install -m 644 -p doxia-site-renderer/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-site-renderer.pom
-install -m 644 -p doxia-doc-renderer/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-doc-renderer.pom
+install -m 644 -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-sitetools.pom
+install -m 644 -p doxia-decoration-model/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-decoration-model.pom
+install -m 644 -p doxia-site-renderer/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-site-renderer.pom
+install -m 644 -p doxia-doc-renderer/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-doc-renderer.pom
%add_to_maven_depmap org.apache.maven.doxia doxia-sitetools %{version} JPP/%{parent} sitetools
%add_to_maven_depmap org.apache.maven.doxia doxia-decoration-model %{version} JPP/%{parent} decoration-model
@@ -184,14 +182,9 @@ install -m 644 -p doxia-doc-renderer/target/doxia-doc-renderer-%{version}.jar \
(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && 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}/decoration-model
-# install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/site-renderer
-# install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/doc-renderer
-
-# cp -pr doxia-decoration-model/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/decoration-model/
-# cp -pr doxia-site-renderer/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/site-renderer/
-# cp -pr doxia-doc-renderer/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/doc-renderer/
+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}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -202,11 +195,16 @@ rm -rf $RPM_BUILD_ROOT
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/%{name}
-# %files javadoc
-# %defattr(-,root,root,-)
-# %doc %{_javadocdir}/*
+%files javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/*
%changelog
+* Tue Sep 7 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1.3-1
+- Update to 1.1.3
+- Enable javadoc generation again
+- Update maven plugins BRs
+
* Thu Jun 17 2010 Deepak Bhole <dbhole at redhat.com> - 0:1.1.2-3
- Rebuild with maven 2.2.1
- Remove modello 1.0 patch
diff --git a/sources b/sources
index 6b96f0e..1a4da90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f85349338cb4fbd56448213692027ba3 maven-doxia-sitetools-1.1.2.tar.gz
+ee4f00db3476c8f5d4fb590cb3256e8b maven-doxia-sitetools-1.1.3.tar.gz
More information about the scm-commits
mailing list