[apache-commons-daemon] Use mvn-rpmbuild instead of mvn-local (changes in maven)
by Stanislav Ochotnicky
commit 517b1f8314016d65af82451cff80364a792e2825
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon May 9 11:21:56 2011 +0200
Use mvn-rpmbuild instead of mvn-local (changes in maven)
apache-commons-daemon.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index 00d29f2..ad0071c 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Defines API to support an alternative invocation mechanism
License: ASL 2.0
Group: Applications/System
@@ -86,7 +86,7 @@ make %{?_smp_mflags}
popd
# build jars
-mvn-local install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
@@ -148,6 +148,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Mon May 9 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.5-5
+- Use mvn-rpmbuild instead of mvn-local (changes in maven)
+
* Wed May 4 2011 Dan Horák <dan[at]danny.cz> - 1.0.5-4
- updated the s390x patch
12 years, 12 months
[tycho] Non-bootstrap build.
by Alexander Kurtakov
commit 017d47cb0c680a69bc78de1378876c0e9176304c
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri May 6 17:48:32 2011 +0300
Non-bootstrap build.
tycho.spec | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 9887213..3f7bc85 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 1
+%global bootstrap 0
%global e_osgi org.eclipse.osgi
%global e_osgi_v 3.6.0.v20100517
@@ -7,7 +7,7 @@
Name: tycho
Version: 0.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -200,10 +200,11 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Fri May 6 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0.10.0-3
+- Non-bootstrap build.
+
* Tue May 3 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.10.0-2
- Add README and make build more silent
* Tue Mar 29 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.10.0-1
- First bootstrapped version
-
-
13 years
[maven-doxia] Add forgotten missing requires
by Stanislav Ochotnicky
commit 1145e6ad462ef7939ea02ccc8f33208ccddec395
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri May 6 15:45:58 2011 +0200
Add forgotten missing requires
maven-doxia.spec | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/maven-doxia.spec b/maven-doxia.spec
index ac837e3..f3d543c 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -30,7 +30,7 @@
Name: maven-doxia
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Content generation framework
License: ASL 2.0
@@ -121,6 +121,11 @@ Requires: velocity
Requires: fop
Requires: httpcomponents-client
Requires: httpcomponents-project
+Requires: geronimo-jms
+Requires: javamail
+# should be in geronimo-jms but that would pull maven even for ant use
+# of library so we don't add it there
+Requires: geronimo-parent-poms
Requires: java >= 1:1.6.0
Requires: jpackage-utils
@@ -220,6 +225,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/%{name}
%changelog
+* Fri May 6 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.2-2
+- Add forgotten missing requires
+
* Fri May 6 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.2-1
- Update to latest upstream (1.2)
- Use maven 3 to build
13 years
[maven-doxia-sitetools] Update to latest version (1.2)
by Stanislav Ochotnicky
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/src/main/resource...</configLocation>
- </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/tags</tagBase>
+ </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
13 years
[maven-doxia] Update to latest upstream (1.2)
by Stanislav Ochotnicky
commit d1ed56777d100dddbac3d5d6158325ab0c20205d
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri May 6 14:49:44 2011 +0200
Update to latest upstream (1.2)
- Use maven 3 to build
- Remove version limits on BR/R (not valid anymore anyway)
- Remove "assert" patch (no explanation for it's existence)
.gitignore | 1 +
0001-Use-plexus-component-metadata.patch | 192 ++++++++++----------
...a-core-remove-plexus-component-annotation.patch | 27 ++--
0003-remove-clirr.patch | 147 ++++++++--------
0004-Comment-out-assert.patch | 53 ------
...ndency.patch => 0004-Fix-itext-dependency.patch | 104 ++++++------
0006-Fix-modello-dependency.patch | 63 -------
maven-doxia.spec | 63 +++----
sources | 2 +-
9 files changed, 268 insertions(+), 384 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9000060..e8f9a07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-doxia-1.1.2.tar.gz
/maven-doxia-1.1.3.tar.gz
/maven-doxia-1.1.4.tar.gz
+/doxia-1.2-source-release.zip
diff --git a/0001-Use-plexus-component-metadata.patch b/0001-Use-plexus-component-metadata.patch
index a1da8fe..8ba820f 100644
--- a/0001-Use-plexus-component-metadata.patch
+++ b/0001-Use-plexus-component-metadata.patch
@@ -1,7 +1,7 @@
-From 282ccc75cda78178ce1a46c95b5bc42f02ecd32f Mon Sep 17 00:00:00 2001
+From e6c22bf1db4e155ee94cfc4c4b0f7e9b8150caaa Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Fri, 17 Dec 2010 14:08:04 +0100
-Subject: [PATCH 1/6] Use plexus-component-metadata
+Date: Mon, 2 May 2011 14:35:50 +0200
+Subject: [PATCH 1/5] Use plexus-component-metadata
---
doxia-modules/doxia-module-apt/pom.xml | 8 ++++----
@@ -11,111 +11,111 @@ Subject: [PATCH 1/6] Use plexus-component-metadata
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 010c559..fe60818 100644
+index b7ccd9d..5128b3a 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>
+@@ -53,21 +53,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>
++</project>
diff --git a/doxia-modules/doxia-module-docbook-simple/pom.xml b/doxia-modules/doxia-module-docbook-simple/pom.xml
-index 64f671a..3395e86 100644
+index ebd2c24..1600077 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>
+@@ -49,17 +49,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 2afafe8..7a5420a 100644
+index 3a85888..ea30ea4 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>
+@@ -81,17 +81,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 f393ef8..83a6ec6 100644
+index 1e8acfb..af44fbf 100644
--- a/doxia-modules/doxia-module-xdoc/pom.xml
+++ b/doxia-modules/doxia-module-xdoc/pom.xml
-@@ -68,17 +68,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>
+@@ -72,17 +72,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>
--
-1.7.3.3
+1.7.4.4
diff --git a/0002-doxia-core-remove-plexus-component-annotation.patch b/0002-doxia-core-remove-plexus-component-annotation.patch
index 0c05248..58ea2cb 100644
--- a/0002-doxia-core-remove-plexus-component-annotation.patch
+++ b/0002-doxia-core-remove-plexus-component-annotation.patch
@@ -1,25 +1,24 @@
-From 0cfa19a33cb162271576e31feb115f39e4909eb1 Mon Sep 17 00:00:00 2001
+From fc05bd165735ec1b06639796531c7b26359889b1 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Tue, 7 Sep 2010 17:03:29 +0200
-Subject: [PATCH 2/6] doxia-core remove plexus component annotation
+Date: Mon, 2 May 2011 14:37:28 +0200
+Subject: [PATCH 2/5] doxia-core remove plexus component annotation
-Abstract class can't be plexus component
---
.../apache/maven/doxia/parser/AbstractParser.java | 1 -
1 files changed, 0 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..4543a0c 100644
+index 209d40e..cf47ab1 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,6 @@ 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
- */
- public abstract class AbstractParser
- implements Parser
+@@ -42,7 +42,6 @@ import org.apache.maven.doxia.sink.Sink;
+ * @author Jason van Zyl
+ * @version $Id: AbstractParser.java 1094965 2011-04-19 09:30:13Z ltheussl $
+ * @since 1.0
+- * @plexus.component
+ */
+ public abstract class AbstractParser
+ implements Parser
--
-1.7.3.3
+1.7.4.4
diff --git a/0003-remove-clirr.patch b/0003-remove-clirr.patch
index d69d2bc..94a27f2 100644
--- a/0003-remove-clirr.patch
+++ b/0003-remove-clirr.patch
@@ -1,86 +1,87 @@
-From ab09a2ad8999781e4b9173972d9a85261376e258 Mon Sep 17 00:00:00 2001
+From 1857467fd4a18e1a9d4197d35baad4d334d3e708 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Tue, 7 Sep 2010 17:22:48 +0200
-Subject: [PATCH 3/6] remove clirr
+Date: Mon, 2 May 2011 14:41:53 +0200
+Subject: [PATCH 3/5] remove clirr
---
doxia-maven-plugin/pom.xml | 13 -------------
- pom.xml | 24 ------------------------
- 2 files changed, 0 insertions(+), 37 deletions(-)
+ pom.xml | 26 +-------------------------
+ 2 files changed, 1 insertions(+), 38 deletions(-)
diff --git a/doxia-maven-plugin/pom.xml b/doxia-maven-plugin/pom.xml
-index 9eca795..96ca69f 100644
+index 92c6b6e..798b4f6 100644
--- a/doxia-maven-plugin/pom.xml
+++ b/doxia-maven-plugin/pom.xml
-@@ -159,19 +159,6 @@ under the License.
- </executions>
- </plugin>
- <plugin>
-- <groupId>org.codehaus.mojo</groupId>
-- <artifactId>clirr-maven-plugin</artifactId>
-- <configuration>
-- <comparisonVersion>1.1</comparisonVersion>
-- <excludes>
-- <!-- exclude shaded packages -->
-- <exclude>org/apache/maven/doxia/logging/**</exclude>
-- <exclude>org/apache/maven/doxia/sink/**</exclude>
-- <exclude>org/codehaus/doxia/sink/**</exclude>
-- </excludes>
-- </configuration>
-- </plugin>
-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
+@@ -155,19 +155,6 @@ under the License.
+ </executions>
+ </plugin>
+ <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>clirr-maven-plugin</artifactId>
+- <configuration>
+- <comparisonVersion>1.1</comparisonVersion>
+- <excludes>
+- <!-- exclude shaded packages -->
+- <exclude>org/apache/maven/doxia/logging/**</exclude>
+- <exclude>org/apache/maven/doxia/sink/**</exclude>
+- <exclude>org/codehaus/doxia/sink/**</exclude>
+- </excludes>
+- </configuration>
+- </plugin>
+- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <executions>
diff --git a/pom.xml b/pom.xml
-index 5f9dee3..4d0e574 100644
+index 4eff88e..98cd1ba 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -285,14 +285,6 @@ under the License.
- <version>2.1.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-resources-plugin</artifactId>
- <version>2.4.2</version>
-@@ -337,18 +329,6 @@ under the License.
- </execution>
- </executions>
- </plugin>
-- <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>
-
-@@ -418,10 +398,6 @@ under the License.
- <configLocation>http://svn.apache.org/repos/asf/maven/doxia/doxia/trunk/src/main/resource...</configLocation>
- </configuration>
- </plugin>
-- <plugin>
-- <groupId>org.codehaus.mojo</groupId>
-- <artifactId>clirr-maven-plugin</artifactId>
-- </plugin>
- </plugins>
- </reporting>
- </profile>
+@@ -297,13 +297,6 @@ under the License.
+ </configuration>
+ </plugin>
+ <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>
+ <configuration>
+@@ -342,23 +335,6 @@ under the License.
+ </execution>
+ </executions>
+ </plugin>
+- <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/document/*</exclude>
+- </excludes>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+ </plugins>
+ </build>
+
+@@ -508,6 +484,6 @@ under the License.
+ </plugin>
+ </plugins>
+ </build>
+- </profile>
++ </profile>
+ </profiles>
+ </project>
--
-1.7.3.3
+1.7.4.4
diff --git a/0005-Fix-itext-dependency.patch b/0004-Fix-itext-dependency.patch
similarity index 91%
rename from 0005-Fix-itext-dependency.patch
rename to 0004-Fix-itext-dependency.patch
index ee1cf80..d87ffa1 100644
--- a/0005-Fix-itext-dependency.patch
+++ b/0004-Fix-itext-dependency.patch
@@ -1,7 +1,7 @@
-From 6758dce3b179b1c19b3ebfbab166f11cd1f1e655 Mon Sep 17 00:00:00 2001
+From e4530fbf04544c66f322bcf9992aa828564fd3bf Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Fri, 17 Dec 2010 14:11:12 +0100
-Subject: [PATCH 5/6] Fix itext dependency
+Date: Mon, 2 May 2011 15:04:15 +0200
+Subject: [PATCH 4/5] Fix itext dependency
---
.../apache/maven/doxia/module/itext/ITextFont.java | 6 +++---
@@ -10,66 +10,66 @@ Subject: [PATCH 5/6] Fix itext dependency
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
-index 329b407..2f2621a 100644
+index 8882f98..019f3a8 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
@@ -262,7 +262,7 @@ public class ITextFont
- {
- Font font = getCurrentFont();
-
-- return String.valueOf( font.color().getBlue() );
-+ return String.valueOf( font.getColor().getBlue() );
- }
-
- /**
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getBlue() );
++ return String.valueOf( font.getColor().getBlue() );
+ }
+
+ /**
@@ -274,7 +274,7 @@ public class ITextFont
- {
- Font font = getCurrentFont();
-
-- return String.valueOf( font.color().getGreen() );
-+ return String.valueOf( font.getColor().getGreen() );
- }
-
- /**
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getGreen() );
++ return String.valueOf( font.getColor().getGreen() );
+ }
+
+ /**
@@ -286,7 +286,7 @@ public class ITextFont
- {
- Font font = getCurrentFont();
-
-- return String.valueOf( font.color().getRed() );
-+ return String.valueOf( font.getColor().getRed() );
- }
-
- /**
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getRed() );
++ return String.valueOf( font.getColor().getRed() );
+ }
+
+ /**
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
-index 1824dbb..4cdcf22 100644
+index d87f149..9c576cc 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
-@@ -1239,9 +1239,9 @@ public class ITextSink
- try
- {
- Image image = Image.getInstance( new URL( urlName ) );
-- image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 );
-- width = image.plainWidth();
-- height = image.plainHeight();
-+ image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 );
-+ width = image.getPlainWidth();
-+ height = image.getPlainHeight();
- }
- catch ( BadElementException e )
- {
+@@ -1231,9 +1231,9 @@ public class ITextSink
+ try
+ {
+ Image image = Image.getInstance( new URL( urlName ) );
+- image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 );
+- width = image.plainWidth();
+- height = image.plainHeight();
++ image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 );
++ width = image.getPlainWidth();
++ height = image.getPlainHeight();
+ }
+ catch ( BadElementException e )
+ {
diff --git a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
-index 4363413..75a106f 100644
+index 76770e4..d6b8d8a 100644
--- a/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
+++ b/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
@@ -77,7 +77,7 @@ public class ITextUtil
- if ( currentField.getType().equals( Rectangle.class ) )
- {
- Rectangle fPageSize = (Rectangle) currentField.get( null );
-- if ( ( rect.width() == fPageSize.width() ) && ( rect.height() == fPageSize.height() ) )
-+ if ( ( rect.getWidth() == fPageSize.getWidth() ) && ( rect.getHeight() == fPageSize.getHeight() ) )
- {
- return currentField.getName();
- }
+ if ( currentField.getType().equals( Rectangle.class ) )
+ {
+ Rectangle fPageSize = (Rectangle) currentField.get( null );
+- if ( ( rect.width() == fPageSize.width() ) && ( rect.height() == fPageSize.height() ) )
++ if ( ( rect.getWidth() == fPageSize.getWidth() ) && ( rect.getHeight() == fPageSize.getHeight() ) )
+ {
+ return currentField.getName();
+ }
--
-1.7.3.3
+1.7.4.4
diff --git a/maven-doxia.spec b/maven-doxia.spec
index d85bc11..ac837e3 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -29,17 +29,15 @@
#
Name: maven-doxia
-Version: 1.1.4
-Release: 3%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Epoch: 0
Summary: Content generation framework
License: ASL 2.0
Group: Development/Libraries
URL: http://maven.apache.org/doxia/
-# svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.1.4 maven-doxia-1.1.4
-# tar czf maven-doxia-1.1.4.tar.gz maven-doxia-1.1.4/
-Source0: %{name}-%{version}.tar.gz
+Source0: http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia/%{version}/dox...
# Point it at the correct plexus-container-default
Source1: %{name}-depmap.xml
@@ -53,20 +51,19 @@ Patch0: 0001-Use-plexus-component-metadata.patch
Patch1: 0002-doxia-core-remove-plexus-component-annotation.patch
Patch2: 0003-remove-clirr.patch
-Patch3: 0004-Comment-out-assert.patch
# Build against iText 2.x
# http://jira.codehaus.org/browse/DOXIA-53
-Patch4: 0005-Fix-itext-dependency.patch
+Patch3: 0004-Fix-itext-dependency.patch
BuildArch: noarch
BuildRequires: java >= 1:1.6.0
-BuildRequires: jpackage-utils >= 0:1.7.2
+BuildRequires: jpackage-utils
BuildRequires: ant, ant-nodeps
-BuildRequires: itext >= 2.1.7-4
-BuildRequires: plexus-cli >= 1.2-8
-BuildRequires: maven2 >= 0:2.0.4-9
+BuildRequires: itext
+BuildRequires: plexus-cli
+BuildRequires: maven
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -81,9 +78,8 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-doxia-tools
-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: servlet25
BuildRequires: classworlds
BuildRequires: apache-commons-collections
@@ -93,7 +89,7 @@ BuildRequires: apache-commons-configuration
BuildRequires: junit
BuildRequires: jakarta-oro
BuildRequires: plexus-i18n
-BuildRequires: plexus-utils >= 1.5.7
+BuildRequires: plexus-utils
BuildRequires: plexus-velocity
BuildRequires: plexus-build-api
BuildRequires: velocity
@@ -103,6 +99,13 @@ BuildRequires: plexus-containers-component-javadoc
BuildRequires: plexus-containers-container-default
BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-project
+BuildRequires: xmlgraphics-commons
+BuildRequires: avalon-framework
+BuildRequires: geronimo-parent-poms
+BuildRequires: geronimo-jms
+BuildRequires: javamail
+
+
Requires: classworlds
Requires: apache-commons-collections
@@ -112,7 +115,7 @@ Requires: junit
Requires: jakarta-oro
Requires: plexus-container-default
Requires: plexus-i18n
-Requires: plexus-utils >= 1.5.7
+Requires: plexus-utils
Requires: plexus-velocity
Requires: velocity
Requires: fop
@@ -139,27 +142,19 @@ Group: Development/Documentation
API documentation for %{name}.
%prep
-%setup -q
+%setup -q -n doxia-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-
-#rm -fr doxia-maven-plugin
-
-# use new plexus-javadoc taglet replacement
-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 disabled because some use old plexus-container and don't work
+# with new
+mvn-rpmbuild \
-e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
install javadoc:aggregate
@@ -216,17 +211,21 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%defattr(-,root,root,-)
%{_javadir}/%{name}
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%{_datadir}/maven2/lib/*
%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%doc %{_javadocdir}/%{name}
%changelog
+* Fri May 6 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.2-1
+- Update to latest upstream (1.2)
+- Use maven 3 to build
+- Remove version limits on BR/R (not valid anymore anyway)
+- Remove "assert" patch (no explanation for it's existence)
+
* Tue Feb 22 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.1.4-3
- Change oro to jakarta-oro in BR/R
diff --git a/sources b/sources
index 58415db..dce76d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b200e64242997a85dd8569027225ff9c maven-doxia-1.1.4.tar.gz
+f68dd50c3dbc57cf920e788a9ad39e57 doxia-1.2-source-release.zip
13 years