[maven-shared] Rebuild with maven221
Yang Yong
yyang at fedoraproject.org
Tue Sep 14 10:21:24 UTC 2010
commit 867c4b4444a03834d2812409d195d82a1054b97e
Author: Yong Yang <yyang at localhost.localdomain>
Date: Tue Sep 14 18:22:11 2010 +0800
Rebuild with maven221
maven-ant-pom_xml.patch | 16 +++++++++++++---
maven-artifact-resolver-pom.patch | 14 ++++++++++++++
maven-dependency-tree-pom.patch | 18 ++++++++++++++++++
maven-osgi-pom.patch | 14 ++++++++++++++
maven-repository-build-pom.patch | 19 +++++++++++++++++++
maven-runtime-XMLMavenRuntimeVisitor.patch | 13 +++++++++++++
maven-runtime-pom.patch | 19 +++++++++++++++++++
7 files changed, 110 insertions(+), 3 deletions(-)
---
diff --git a/maven-ant-pom_xml.patch b/maven-ant-pom_xml.patch
index 554f48c..5b829b2 100644
--- a/maven-ant-pom_xml.patch
+++ b/maven-ant-pom_xml.patch
@@ -1,6 +1,16 @@
---- maven-ant/pom.xml.orig 2010-05-26 17:44:20.794875227 +0800
-+++ maven-ant/pom.xml 2010-05-26 17:46:17.303163275 +0800
-@@ -58,6 +58,11 @@
+--- maven-ant/pom.xml.orig 2010-09-10 16:10:16.042326353 +0800
++++ maven-ant/pom.xml 2010-09-10 16:15:54.417885449 +0800
+@@ -53,11 +53,21 @@
+
+ <dependencies>
+ <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-artifact</artifactId>
++ <version>2.0.6</version>
++ </dependency>
++ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-13</version>
</dependency>
<dependency>
diff --git a/maven-artifact-resolver-pom.patch b/maven-artifact-resolver-pom.patch
new file mode 100644
index 0000000..e6bb1dc
--- /dev/null
+++ b/maven-artifact-resolver-pom.patch
@@ -0,0 +1,14 @@
+--- maven-artifact-resolver/pom.xml.orig 2010-09-14 17:32:16.072105581 +0800
++++ maven-artifact-resolver/pom.xml 2010-09-14 17:32:45.351654413 +0800
+@@ -41,6 +41,11 @@
+ -->
+
+ <dependencies>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-model</artifactId>
++ <version>2.0.8</version>
++ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
diff --git a/maven-dependency-tree-pom.patch b/maven-dependency-tree-pom.patch
new file mode 100644
index 0000000..e9a7f0c
--- /dev/null
+++ b/maven-dependency-tree-pom.patch
@@ -0,0 +1,18 @@
+--- maven-dependency-tree/pom.xml.orig 2010-09-10 16:49:56.200487313 +0800
++++ maven-dependency-tree/pom.xml 2010-09-10 17:58:32.535709241 +0800
+@@ -55,6 +55,15 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-artifact</artifactId>
++ </dependency>
++ <dependency>
++ <groupId>org.codehaus.plexus</groupId>
++ <artifactId>plexus-component-api</artifactId>
++ <version>1.0-alpha-15</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.8</version>
+ </dependency>
diff --git a/maven-osgi-pom.patch b/maven-osgi-pom.patch
new file mode 100644
index 0000000..f97b08b
--- /dev/null
+++ b/maven-osgi-pom.patch
@@ -0,0 +1,14 @@
+--- maven-osgi/pom.xml.orig 2010-09-13 17:32:07.453727331 +0800
++++ maven-osgi/pom.xml 2010-09-13 17:33:33.392662627 +0800
+@@ -35,6 +35,11 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-artifact</artifactId>
++ <version>2.0.9</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.6</version>
+ </dependency>
diff --git a/maven-repository-build-pom.patch b/maven-repository-build-pom.patch
new file mode 100644
index 0000000..47061ef
--- /dev/null
+++ b/maven-repository-build-pom.patch
@@ -0,0 +1,19 @@
+--- maven-repository-builder/pom.xml.orig 2010-09-14 14:41:14.432386906 +0800
++++ maven-repository-builder/pom.xml 2010-09-14 16:40:59.295846669 +0800
+@@ -40,6 +40,16 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-repository-metadata</artifactId>
++ <version>2.0.4</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven.wagon</groupId>
++ <artifactId>wagon-provider-api</artifactId>
++ <version>2.0.4</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.4</version>
+ </dependency>
diff --git a/maven-runtime-XMLMavenRuntimeVisitor.patch b/maven-runtime-XMLMavenRuntimeVisitor.patch
new file mode 100644
index 0000000..cc37db5
--- /dev/null
+++ b/maven-runtime-XMLMavenRuntimeVisitor.patch
@@ -0,0 +1,13 @@
+--- maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java.orig 2009-11-02 23:05:33.000000000 +0800
++++ maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java 2010-09-14 17:15:47.622372781 +0800
+@@ -117,6 +117,10 @@
+ {
+ throw new MavenRuntimeException( "Cannot sort projects", exception );
+ }
++ catch (Exception exception )
++ {
++ throw new MavenRuntimeException( "Cannot sort projects", exception );
++ }
+ }
+
+ // private methods --------------------------------------------------------
diff --git a/maven-runtime-pom.patch b/maven-runtime-pom.patch
new file mode 100644
index 0000000..1e8cb12
--- /dev/null
+++ b/maven-runtime-pom.patch
@@ -0,0 +1,19 @@
+--- maven-runtime/pom.xml.orig 2010-09-14 16:51:30.925824317 +0800
++++ maven-runtime/pom.xml 2010-09-14 17:04:03.603399933 +0800
+@@ -49,6 +49,16 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-model</artifactId>
++ <version>2.0.8</version>
++ </dependency>
++ <dependency>
++ <groupId>org.codehaus.plexus</groupId>
++ <artifactId>plexus-utils</artifactId>
++ <version>1.5.6</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.8</version>
+ </dependency>
More information about the scm-commits
mailing list