[maven-shared] Rebuild with maven221
Yang Yong
yyang at fedoraproject.org
Tue Sep 14 10:23:08 UTC 2010
commit 73da57bcc46924ac832efe3919feed51ee6f7b2e
Author: Yong Yang <yyang at localhost.localdomain>
Date: Tue Sep 14 18:23:55 2010 +0800
Rebuild with maven221
maven-shared-jpp-depmap.xml | 281 +++++++++++++++++++++++-------------------
maven-shared.spec | 104 +++++-----------
2 files changed, 188 insertions(+), 197 deletions(-)
---
diff --git a/maven-shared-jpp-depmap.xml b/maven-shared-jpp-depmap.xml
index b18e682..7e0a7f5 100644
--- a/maven-shared-jpp-depmap.xml
+++ b/maven-shared-jpp-depmap.xml
@@ -1,78 +1,78 @@
<dependencies>
- <dependency>
- <maven>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- <version>1.4</version>
- </maven>
- <jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>empty-dep</artifactId>
- <version>1.4</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>5.1.10</version>
- </maven>
- <jpp>
- <groupId>JPP/jetty5</groupId>
- <artifactId>jetty5</artifactId>
- <version>5.1.12</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.0</version>
- </maven>
- <jpp>
- <groupId>JPP/objectweb-asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.1</version>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>asm</groupId>
- <artifactId>asm-parent</artifactId>
- <version>3.0</version>
- </maven>
- <jpp>
- <groupId>JPP/objectweb-asm</groupId>
- <artifactId>asm-parent</artifactId>
- <version>3.1</version>
- </jpp>
- </dependency>
+ <dependency>
+ <maven>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ <version>1.4</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven2</groupId>
+ <artifactId>empty-dep</artifactId>
+ <version>1.4</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <version>5.1.10</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/jetty5</groupId>
+ <artifactId>jetty5</artifactId>
+ <version>5.1.12</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.0</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/objectweb-asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.1</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>asm</groupId>
+ <artifactId>asm-parent</artifactId>
+ <version>3.0</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/objectweb-asm</groupId>
+ <artifactId>asm-parent</artifactId>
+ <version>3.1</version>
+ </jpp>
+ </dependency>
- <dependency>
- <maven>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>reporting-impl</artifactId>
- <version>2.0.4</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-shared</groupId>
- <artifactId>reporting-impl</artifactId>
- <version>2.0.4</version>
- </jpp>
- </dependency>
+ <dependency>
+ <maven>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>reporting-impl</artifactId>
+ <version>2.0.4</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven-shared</groupId>
+ <artifactId>reporting-impl</artifactId>
+ <version>2.0.4</version>
+ </jpp>
+ </dependency>
- <dependency>
- <maven>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-test-tools</artifactId>
- <version>1.0-alpha-2</version>
- </maven>
- <jpp>
- <groupId>JPP/maven-plugin-testing</groupId>
- <artifactId>maven-test-tools</artifactId>
- <version>1.2</version>
- </jpp>
- </dependency>
+ <dependency>
+ <maven>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-test-tools</artifactId>
+ <version>1.0-alpha-2</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven-plugin-testing</groupId>
+ <artifactId>maven-test-tools</artifactId>
+ <version>1.2</version>
+ </jpp>
+ </dependency>
<!--
<dependency>
@@ -89,48 +89,50 @@
</dependency>
-->
- <dependency>
- <maven>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>tomcat5-servlet-2.4-api</artifactId>
- <version>2.4</version>
- </jpp>
- </dependency>
+ <dependency>
+ <maven>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>tomcat5-servlet-2.4-api</artifactId>
+ <version>2.4</version>
+ </jpp>
+ </dependency>
- <!-- Plexus component API has been folded into containers now, and is no longer needed -->
- <dependency>
- <maven>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- <version>1.0-alpha-20</version>
- </maven>
- </dependency>
+ <!-- Plexus component API has been folded into containers now, and is no longer needed -->
+ <!--
+ <dependency>
+ <maven>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ <version>1.0-alpha-20</version>
+ </maven>
+ </dependency>
+ -->
- <dependency>
- <maven>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.1.0</version>
- </maven>
- </dependency>
+ <dependency>
+ <maven>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.1.0</version>
+ </maven>
+ </dependency>
- <dependency>
- <maven>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model-v3</artifactId>
- <version>2.0</version>
- </maven>
- <jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>model</artifactId>
- <version>2.0.8</version>
- </jpp>
- </dependency>
+ <dependency>
+ <maven>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model-v3</artifactId>
+ <version>2.0</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven2</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0.8</version>
+ </jpp>
+ </dependency>
<dependency>
<maven>
@@ -138,22 +140,47 @@
<artifactId>easymock</artifactId>
<version>2.2</version>
</maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>easymock2</artifactId>
- <version>2.5.2</version>
- </jpp>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>easymock2</artifactId>
+ <version>2.5.2</version>
+ </jpp>
</dependency>
<dependency>
- <maven>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>2.4</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>2.4</version>
- </jpp>
- </dependency>
+ <maven>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.4</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.4</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.1</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.6.5</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.8.1</version>
+ </jpp>
+ </dependency>
+
</dependencies>
diff --git a/maven-shared.spec b/maven-shared.spec
index d3c8185..552b669 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -67,7 +67,7 @@ Summary: Maven Shared Components
URL: http://maven.apache.org/shared/
Name: maven-shared
Version: 15
-Release: 10%{?dist}
+Release: 11%{?dist}
License: ASL 2.0
Group: Development/Libraries
@@ -79,13 +79,16 @@ Source1: %{name}-jpp-depmap.xml
Patch0: %{name}-pom.patch
Patch1: maven-ant-pom_xml.patch
-#Patch1: %{name}-ant-pom.patch
-#Patch2: %{name}-file-management-pom.patch
-#Patch3: %{name}-io-ArtifactLocatorStrategyTest.patch
-#Patch5: %{name}-disable-cobertura.patch
-#Patch6: %{name}-modelv3.patch
+Patch2: maven-dependency-tree-pom.patch
+Patch3: maven-osgi-pom.patch
+Patch4: maven-repository-build-pom.patch
+Patch5: maven-runtime-pom.patch
+Patch6: maven-runtime-XMLMavenRuntimeVisitor.patch
+Patch7: maven-artifact-resolver-pom.patch
BuildRequires: jpackage-utils >= 0:1.7.2
+BuildRequires: ant
+BuildRequires: ant-nodeps
BuildRequires: maven2 >= 0:2.0.4-9
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
@@ -104,6 +107,7 @@ BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-plugin-testing-tools
BuildRequires: maven-test-tools
BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-component-api
BuildRequires: maven-plugin-cobertura
BuildRequires: junit
BuildRequires: saxon
@@ -116,7 +120,12 @@ BuildRequires: tomcat5-servlet-2.4-api
BuildRequires: tomcat5
BuildRequires: easymock2
BuildRequires: objectweb-asm
+BuildRequires: dom4j
+BuildRequires: aqute-bndlib
+BuildRequires: maven-wagon
+Requires: ant
+Requires: ant-nodeps
Requires: maven2 >= 0:2.0.4
Requires: plexus-utils
Requires: saxon
@@ -125,6 +134,9 @@ Requires: plexus-utils
Requires: plexus-registry
Requires: plexus-digest
Requires: objectweb-asm
+Requires: dom4j
+Requires: aqute-bndlib
+Requires: maven-wagon
BuildArch: noarch
@@ -375,7 +387,13 @@ order, and also for a given class within a project.
%setup -q -n %{name}-components-%{shared_components_version}
chmod -R go=u-w *
%patch0 -b .sav0
-%patch1 -b .sav0
+%patch1 -b .sav1
+%patch2 -b .sav2
+%patch3 -b .sav3
+%patch4 -b .sav4
+%patch5 -b .sav5
+%patch6 -b .sav6
+%patch7 -b .sav7
# need namespace for new version modello
sed -i "s|<model>|<model xmlns=\"http://modello.codehaus.org/MODELLO/1.3.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://modello.codehaus.org/MODELLO/1.3.0 http://modello.codehaus.org/xsd/modello-1.3.0.xsd\" xml.namespace=\"..\" xml.schemaLocation=\"..\" xsd.namespace=\"..\" xsd.targetNamespace=\"..\">|" file-management/src/main/mdo/fileset.mdo
@@ -398,9 +416,10 @@ mvn-jpp \
-Dmaven.test.skip=true \
-Dmaven.test.failure.ignore=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+ install javadoc:aggregate
%install
+
rm -rf $RPM_BUILD_ROOT
# main package infrastructure
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/maven-shared
@@ -564,68 +583,8 @@ popd
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/downloader
-cp -pr maven-downloader/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/downloader
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/dependency-tree
-cp -pr maven-dependency-tree/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/dependency-tree
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/dependency-analyzer
-cp -pr maven-dependency-analyzer/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/dependency-analyzer
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/verifier
-cp -pr maven-verifier/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/verifier
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/monitor
-cp -pr maven-shared-monitor/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/monitor
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/io
-cp -pr maven-shared-io/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/io
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/jar
-cp -pr maven-shared-jar/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/jar
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/repository-builder
-cp -pr maven-repository-builder/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/repository-builder
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/reporting-impl
-cp -pr maven-reporting-impl/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/reporting-impl
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/model-converter
-cp -pr maven-model-converter/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/model-converter
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/invoker
-cp -pr maven-invoker/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/invoker
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/common-artifact-filters
-cp -pr maven-common-artifact-filters/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/common-artifact-filters
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/ant
-cp -pr maven-ant/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/ant
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/osgi
-cp -pr maven-osgi/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/osgi
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/file-management
-cp -pr file-management/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/file-management
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-artifact-resolver
-cp -pr maven-artifact-resolver/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-artifact-resolver
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-filtering
-cp -pr maven-filtering/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-filtering
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-reporting-api
-cp -pr maven-reporting-api/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-reporting-api
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-runtime
-cp -pr maven-runtime/target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/maven-runtime
+cp -pr target/site/apidocs/* \
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/
ln -s %{name}-%{shared_components_version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -747,6 +706,11 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jun 01 2010 Yong Yang <yyang at redhat.com> 15-11
+- Rebuld with maven221
+- Add patches
+- Use javadoc:aggregate
+
* Tue Jun 01 2010 Yong Yang <yyang at redhat.com> 15-10
- Fix installed jar name of artifact-resolver, filtering, reporting-api, runtime
More information about the scm-commits
mailing list