commit 208677c83d0ff9d502ec59df2f354b8fadf7ca84
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri May 6 14:49:20 2011 +0200
Update to latest version (1.2)
- Use maven 3 to build
- Remove version limits on BR/R (not valid anymore anyway)
- Versioneless jars and javadocs
.gitignore | 1 +
...irr.patch => 0001-Remove-clirr-dependency.patch | 110 ++++++++++----------
0002-Remove-htmlunit-dependency.patch | 29 +++++
maven-doxia-sitetools-disablehtmlunit.patch | 16 ---
maven-doxia-sitetools.spec | 82 +++++++--------
sources | 2 +-
6 files changed, 125 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7295277..bd761ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-doxia-sitetools-1.0-alpha10-src.tar.gz
/maven-doxia-sitetools-1.1.3.tar.gz
+/doxia-sitetools-1.2-source-release.zip
diff --git a/maven-doxia-sitetools-clirr.patch b/0001-Remove-clirr-dependency.patch
similarity index 51%
rename from maven-doxia-sitetools-clirr.patch
rename to 0001-Remove-clirr-dependency.patch
index cc13006..9b8200d 100644
--- a/maven-doxia-sitetools-clirr.patch
+++ b/0001-Remove-clirr-dependency.patch
@@ -1,63 +1,65 @@
-From 1f8e11b7e1000831cc05e78965e41b0f38a94902 Mon Sep 17 00:00:00 2001
+From 75ed919d4653de4479bbebdf85fd7176e44d689f Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Tue, 7 Sep 2010 19:37:50 +0200
-Subject: [PATCH] clirr
+Date: Fri, 6 May 2011 14:20:37 +0200
+Subject: [PATCH 1/2] Remove clirr dependency
---
- pom.xml | 26 --------------------------
- 1 files changed, 0 insertions(+), 26 deletions(-)
+ pom.xml | 29 +----------------------------
+ 1 files changed, 1 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
-index a50d44c..2a803f6 100644
+index f7cc92d..9b68bf5 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>
-- <version>2.2.2</version>
-- <configuration>
-- <comparisonVersion>1.1</comparisonVersion>
-- </configuration>
-- </plugin>
-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
-@@ -271,20 +263,6 @@ under the License.
- </plugin>
- </plugins>
- </pluginManagement>
-- <plugins>
-- <plugin>
-- <groupId>org.codehaus.mojo</groupId>
-- <artifactId>clirr-maven-plugin</artifactId>
-- <executions>
-- <execution>
-- <phase>verify</phase>
-- <goals>
-- <goal>check</goal>
-- </goals>
-- </execution>
-- </executions>
-- </plugin>
-- </plugins>
- </build>
-
- <reporting>
-@@ -326,10 +304,6 @@ under the License.
-
<
configLocation>http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk...
- </configuration>
- </plugin>
-- <plugin>
-- <groupId>org.codehaus.mojo</groupId>
-- <artifactId>clirr-maven-plugin</artifactId>
-- </plugin>
- </plugins>
- </reporting>
- </profile>
+@@ -247,14 +247,6 @@ under the License.
+
<
tagBase>https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/t...
+ </configuration>
+ </plugin>
+- <!-- TODO need to upgrade to last version or Maven parent version -->
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>clirr-maven-plugin</artifactId>
+- <configuration>
+- <comparisonVersion>1.1</comparisonVersion>
+- </configuration>
+- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+@@ -283,25 +275,6 @@ under the License.
+ </plugin>
+ </plugins>
+ </pluginManagement>
+- <plugins>
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>clirr-maven-plugin</artifactId>
+- <executions>
+- <execution>
+- <phase>verify</phase>
+- <goals>
+- <goal>check</goal>
+- </goals>
+- <configuration>
+- <excludes>
+- <exclude>org/apache/maven/doxia/site/decoration/*</exclude>
+- </excludes>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+- </plugins>
+ </build>
+
+ <profiles>
+@@ -423,6 +396,6 @@ under the License.
+ </plugin>
+ </plugins>
+ </build>
+- </profile>
++ </profile>
+ </profiles>
+ </project>
--
-1.7.2.2
+1.7.4.4
diff --git a/0002-Remove-htmlunit-dependency.patch
b/0002-Remove-htmlunit-dependency.patch
new file mode 100644
index 0000000..7eabc7a
--- /dev/null
+++ b/0002-Remove-htmlunit-dependency.patch
@@ -0,0 +1,29 @@
+From 0fb66fa7c8a2c38c1e05d0d7a52b171e2503a1af Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Fri, 6 May 2011 14:28:18 +0200
+Subject: [PATCH 2/2] Remove htmlunit dependency
+
+---
+ doxia-site-renderer/pom.xml | 6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
+index cae7a4b..ef97922 100644
+--- a/doxia-site-renderer/pom.xml
++++ b/doxia-site-renderer/pom.xml
+@@ -148,12 +148,6 @@ under the License.
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>htmlunit</groupId>
+- <artifactId>htmlunit</artifactId>
+- <version>1.13</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <profiles>
+--
+1.7.4.4
+
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index 5ad96c6..588b873 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -32,27 +32,24 @@
%global subproj sitetools
Name: %{parent}-%{subproj}
-Version: 1.1.3
-Release: 3%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Summary: Doxia content generation framework
License: ASL 2.0
Group: Development/Tools
URL:
http://maven.apache.org/doxia/
-# svn export
http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-si... \
-# 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
+Source0:
http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia-sitetools/%{ve...
# Point it at the correct plexus-container-default
Source1: maven-doxia-depmap.xml
-Patch0: %{name}-clirr.patch
-Patch1: %{name}-disablehtmlunit.patch
+Patch0: 0001-Remove-clirr-dependency.patch
+Patch1: 0002-Remove-htmlunit-dependency.patch
-BuildRequires: itext >= 2.1.7
-BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: maven2
+BuildRequires: itext
+BuildRequires: jpackage-utils
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -63,9 +60,8 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia
-BuildRequires: plexus-maven-plugin >= 0:1.2-2
-BuildRequires: modello-maven-plugin >= 0:1.0-0.a8.3
-BuildRequires: plexus-xmlrpc >= 0:1.0-0.b4.3
+BuildRequires: modello-maven-plugin
+BuildRequires: plexus-xmlrpc
BuildRequires: classworlds
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-configuration
@@ -77,7 +73,7 @@ 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-utils
BuildRequires: plexus-velocity
BuildRequires: velocity
@@ -92,14 +88,14 @@ Requires: jakarta-oro
Requires: plexus-container-default
Requires: plexus-containers-container-default
Requires: plexus-i18n
-Requires: plexus-utils >= 1.5.7
+Requires: plexus-utils
Requires: plexus-velocity
Requires: velocity
Requires: java >= 1:1.6.0
-Requires: jpackage-utils >= 0:1.7.2
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
+Requires: jpackage-utils
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
BuildArch: noarch
@@ -119,39 +115,23 @@ Requires: jpackage-utils
API documentation for %{name}.
%prep
-%setup -q
+%setup -q -n doxia-%{subproj}-%{version}
%patch0 -p1
# Disable tests that need htmlunit, until we get it in Fedora
%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
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
+# tests can't run because of missing deps
+mvn-rpmbuild \
-e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.failure.ignore=true \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
install javadoc:aggregate
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%install
-rm -rf $RPM_BUILD_ROOT
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -176,19 +156,33 @@ install -m 644 -p
doxia-doc-renderer/target/doxia-doc-renderer-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{parent}/doc-renderer.jar
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $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}/%{parent}/*
+%{_javadir}/%{parent}/*.jar
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%doc %{_javadocdir}/%{name}
%changelog
+* Fri May 6 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.2-1
+- Update to latest version (1.2)
+- Use maven 3 to build
+- Remove version limits on BR/R (not valid anymore anyway)
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.1.3-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 1a4da90..8433f07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee4f00db3476c8f5d4fb590cb3256e8b maven-doxia-sitetools-1.1.3.tar.gz
+785e6cd7fd9e1748f361d16e43ebf480 doxia-sitetools-1.2-source-release.zip