You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/04/20 16:10:19 UTC
svn commit: r766701 - in /maven/components/trunk: ./ apache-maven/
maven-compat/ maven-core/ maven-embedder/ maven-lifecycle/ maven-mercury/
maven-model-builder/ maven-model/ maven-plugin-api/ maven-project/
maven-reporting-api/ maven-repository-mercur...
Author: sisbell
Date: Mon Apr 20 14:10:18 2009
New Revision: 766701
URL: http://svn.apache.org/viewvc?rev=766701&view=rev
Log:
Reverting out pom changes. The poms look fine but ant build file is barfing on the comment syntax and mercury bootstrap is not picking up doxia into its classpath. I've branched this to look into the issue.
Modified:
maven/components/trunk/ (props changed)
maven/components/trunk/apache-maven/ (props changed)
maven/components/trunk/apache-maven/pom.xml
maven/components/trunk/maven-compat/pom.xml
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-lifecycle/pom.xml
maven/components/trunk/maven-mercury/pom.xml
maven/components/trunk/maven-model-builder/pom.xml
maven/components/trunk/maven-model/pom.xml
maven/components/trunk/maven-plugin-api/pom.xml
maven/components/trunk/maven-project/pom.xml
maven/components/trunk/maven-reporting-api/pom.xml
maven/components/trunk/maven-repository-mercury/pom.xml
maven/components/trunk/maven-repository/pom.xml
maven/components/trunk/maven-toolchain/pom.xml
maven/components/trunk/pom.xml
Propchange: maven/components/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 20 14:10:18 2009
@@ -1,7 +1,6 @@
/maven/components/branches/MNG-3932-1:746145-746157
/maven/components/branches/maven-2.0.10-RC:680477
/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
-/maven/components/branches/maven-2.1.x:739385,741841,747468,747683,748815,749612,766523
+/maven/components/branches/maven-2.1.x:739385,741841,747468,747683,748815,749612
/maven/components/branches/sisbell-plugin-manager:738973-739966
/maven/components/sisbell-plugin-manager:738757-738972
-/maven/components/trunk:688587-696625,696644-699681
Propchange: maven/components/trunk/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 20 14:10:18 2009
@@ -1,7 +1,5 @@
/maven/components/branches/MNG-3932-1/apache-maven:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-distribution:680477
/maven/components/branches/maven-2.0.x/maven-distribution:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
-/maven/components/branches/maven-2.1.x/apache-maven:766523
/maven/components/branches/sisbell-plugin-manager/apache-maven:738973-739966
/maven/components/sisbell-plugin-manager/apache-maven:738757-738972
-/maven/components/trunk/maven-distribution:688587-696625,696644-699681
Modified: maven/components/trunk/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/apache-maven/pom.xml (original)
+++ maven/components/trunk/apache-maven/pom.xml Mon Apr 20 14:10:18 2009
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,20 +13,15 @@
License for the specific language governing permissions and
limitations under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
<artifactId>apache-maven</artifactId>
-
<name>Maven Distribution</name>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -88,7 +82,6 @@
<version>${mercuryVersion}</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -104,7 +97,6 @@
</plugin>
</plugins>
</build>
-
<profiles>
<profile>
<id>standard</id>
Modified: maven/components/trunk/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/pom.xml (original)
+++ maven/components/trunk/maven-compat/pom.xml Mon Apr 20 14:10:18 2009
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
@@ -9,20 +8,15 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
<artifactId>maven-compat</artifactId>
-
<name>Maven Compat</name>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -52,7 +46,6 @@
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
Modified: maven/components/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Mon Apr 20 14:10:18 2009
@@ -11,18 +11,14 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
<artifactId>maven-core</artifactId>
-
<name>Maven Core</name>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -114,24 +110,24 @@
<artifactId>plexus-sec-dispatcher</artifactId>
</dependency>
<dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-remote-m2</artifactId>
- <version>${mercuryVersion}</version>
- <scope>test</scope>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
</dependency>
+
<dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-http</artifactId>
- <version>${mercuryVersion}</version>
- <scope>test</scope>
- </dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-remote-m2</artifactId>
+ <version>${mercuryVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-transport-http</artifactId>
+ <version>${mercuryVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
-
<build>
<plugins>
<plugin>
Modified: maven/components/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Mon Apr 20 14:10:18 2009
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
@@ -9,20 +8,15 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
governing permissions and limitations under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
<artifactId>maven-embedder</artifactId>
-
<name>Maven Embedder</name>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -70,11 +64,10 @@
<artifactId>easymock</artifactId>
</dependency>
<dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
</dependency>
</dependencies>
-
<build>
<resources>
<resource>
Modified: maven/components/trunk/maven-lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-lifecycle/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-lifecycle/pom.xml (original)
+++ maven/components/trunk/maven-lifecycle/pom.xml Mon Apr 20 14:10:18 2009
@@ -20,16 +20,13 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
<artifactId>maven-lifecycle</artifactId>
-
<name>Maven Lifecycle Model</name>
<dependencies>
Modified: maven/components/trunk/maven-mercury/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-mercury/pom.xml (original)
+++ maven/components/trunk/maven-mercury/pom.xml Mon Apr 20 14:10:18 2009
@@ -11,16 +11,13 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
<artifactId>maven-mercury</artifactId>
-
<name>Maven Mercury</name>
<dependencies>
@@ -103,14 +100,14 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-metadata</goal>
- <goal>generate-test-metadata</goal>
- </goals>
- </execution>
- </executions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: maven/components/trunk/maven-model-builder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/pom.xml (original)
+++ maven/components/trunk/maven-model-builder/pom.xml Mon Apr 20 14:10:18 2009
@@ -11,19 +11,16 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>
<version>3.0-SNAPSHOT</version>
-
<name>Maven Model Builder</name>
-
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -32,11 +29,11 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
@@ -44,7 +41,7 @@
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -52,14 +49,13 @@
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: maven/components/trunk/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-model/pom.xml (original)
+++ maven/components/trunk/maven-model/pom.xml Mon Apr 20 14:10:18 2009
@@ -20,26 +20,15 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
<artifactId>maven-model</artifactId>
-
<name>Maven Model</name>
<description>Maven Model</description>
-
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -69,7 +58,6 @@
</plugin>
</plugins>
</reporting>
-
<profiles>
<profile>
<id>all-models</id>
@@ -112,4 +100,10 @@
</build>
</profile>
</profiles>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: maven/components/trunk/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-plugin-api/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/pom.xml (original)
+++ maven/components/trunk/maven-plugin-api/pom.xml Mon Apr 20 14:10:18 2009
@@ -20,18 +20,14 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
<artifactId>maven-plugin-api</artifactId>
-
<name>Maven Plugin API</name>
-
<dependencies>
<!-- Maven Artifact live in the compat module now. -->
<dependency>
@@ -43,7 +39,6 @@
<artifactId>plexus-container-default</artifactId>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
Modified: maven/components/trunk/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-project/pom.xml (original)
+++ maven/components/trunk/maven-project/pom.xml Mon Apr 20 14:10:18 2009
@@ -20,21 +20,16 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
<artifactId>maven-project</artifactId>
-
<name>Maven Project</name>
-
<description>This library is used to not only read Maven project object model files, but to assemble inheritence
and to retrieve remote models as required.</description>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -74,11 +69,10 @@
<artifactId>maven-repository</artifactId>
</dependency>
<dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- </dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ </dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
Modified: maven/components/trunk/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-reporting-api/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting-api/pom.xml (original)
+++ maven/components/trunk/maven-reporting-api/pom.xml Mon Apr 20 14:10:18 2009
@@ -20,18 +20,14 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
<artifactId>maven-reporting-api</artifactId>
-
<name>Maven Reporting API</name>
-
<developers>
<developer>
<id>vsiveton</id>
@@ -43,7 +39,6 @@
<timezone>-5</timezone>
</developer>
</developers>
-
<dependencies>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
Modified: maven/components/trunk/maven-repository-mercury/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository-mercury/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-repository-mercury/pom.xml (original)
+++ maven/components/trunk/maven-repository-mercury/pom.xml Mon Apr 20 14:10:18 2009
@@ -20,16 +20,13 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
<artifactId>maven-repository-mercury</artifactId>
-
<name>Mercury Repository implementation</name>
<description>Mercury implementation for the Maven Repository System</description>
@@ -44,7 +41,7 @@
<artifactId>maven-repository</artifactId>
<version>${project.version}</version>
</dependency>
-<!--
+<!--
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository-legacy</artifactId>
@@ -135,7 +132,7 @@
<version>${mercury.version}</version>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository</artifactId>
@@ -143,24 +140,24 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
</dependency>
<dependency>
- <groupId>org.sonatype.plexus</groupId>
- <artifactId>plexus-jetty6</artifactId>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-jetty6</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.sonatype.spice</groupId>
<artifactId>plexus-webdav</artifactId>
<scope>test</scope>
</dependency>
-
+
</dependencies>
<build>
@@ -168,14 +165,14 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-metadata</goal>
- <goal>generate-test-metadata</goal>
- </goals>
- </execution>
- </executions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: maven/components/trunk/maven-repository/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/pom.xml (original)
+++ maven/components/trunk/maven-repository/pom.xml Mon Apr 20 14:10:18 2009
@@ -20,45 +20,41 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
<artifactId>maven-repository</artifactId>
-
<name>Maven Repository</name>
<description>Repository System interface for Maven.</description>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -88,7 +84,7 @@
</execution>
</executions>
</plugin>
-
+
</plugins>
</build>
</project>
Modified: maven/components/trunk/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/pom.xml (original)
+++ maven/components/trunk/maven-toolchain/pom.xml Mon Apr 20 14:10:18 2009
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,20 +13,15 @@
License for the specific language governing permissions and
limitations under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+ <modelVersion>4.0.0</modelVersion>
<artifactId>maven-toolchain</artifactId>
-
<name>Maven Toolchains</name>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -38,7 +32,6 @@
<artifactId>maven-compat</artifactId>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=766701&r1=766700&r2=766701&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Mon Apr 20 14:10:18 2009
@@ -21,18 +21,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>11</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
-
+ <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>3.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
<name>Apache Maven</name>
<description>Maven is a project development management and
comprehension tool. Based on the concept of a project object model:
@@ -44,7 +42,39 @@
</description>
<url>http://maven.apache.org/</url>
<inceptionYear>2001</inceptionYear>
+ <properties>
+ <classWorldsVersion>1.3</classWorldsVersion>
+ <commonsCliVersion>1.0</commonsCliVersion>
+ <!--
+
+ Do not update this, Doxia will be decoupled completely from 3.x and someone can
+ create a rendering engine for it if they like when the release stabilizes. JVZ
+ -->
+ <doxiaVersion>1.0-alpha-9</doxiaVersion>
+ <easyMockVersion>1.2_Java1.3</easyMockVersion>
+ <junitVersion>3.8.1</junitVersion>
+ <plexusVersion>1.0-beta-3.0.6</plexusVersion>
+ <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
+ <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
+ <plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
+ <plexusUtilsVersion>1.5.8</plexusUtilsVersion>
+ <plexusJetty6Version>1.6</plexusJetty6Version>
+ <plexusWebdavVersion>1.0</plexusWebdavVersion>
+ <wagonVersion>1.0-beta-5</wagonVersion>
+ <modelBuilderVersion>1.8</modelBuilderVersion>
+ <mercuryVersion>1.0-alpha-7-SNAPSHOT</mercuryVersion>
+ <mercuryMp3Version>1.0-alpha-1</mercuryMp3Version>
+ <securityDispatcherVersion>1.2</securityDispatcherVersion>
+ <woodstoxVersion>3.2.6</woodstoxVersion>
+ <modelloVersion>1.0.1</modelloVersion>
+ <jxpathVersion>1.3</jxpathVersion>
+ <staxVersion>1.0.1</staxVersion>
+ </properties>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MNG</url>
+ </issueManagement>
<mailingLists>
<mailingList>
<name>Maven Developer List</name>
@@ -120,7 +150,91 @@
</otherArchives>
</mailingList>
</mailingLists>
-
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/components/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/maven/components/trunk</url>
+ </scm>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>${plexusVersion}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ <goal>generate-test-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/maven/components/tags</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <version>${modelloVersion}</version>
+ <configuration>
+ <useJava5>true</useJava5>
+ </configuration>
+ <executions>
+ <execution>
+ <id>site-docs</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>xdoc</goal>
+ <goal>xsd</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>standard</id>
+ <goals>
+ <goal>java</goal>
+ <goal>xpp3-reader</goal>
+ <goal>xpp3-writer</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<modules>
<module>maven-core</module>
<module>apache-maven</module>
@@ -136,54 +250,17 @@
<module>maven-compat</module>
<module>maven-repository</module>
</modules>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/components/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/maven/components/trunk</url>
- </scm>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/MNG</url>
- </issueManagement>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/ref/${project.version}/</url>
- </site>
- </distributionManagement>
-
- <properties>
- <classWorldsVersion>1.3</classWorldsVersion>
- <commonsCliVersion>1.0</commonsCliVersion>
- <!--
-
- Do not update this, Doxia will be decoupled completely from 3.x and someone can
- create a rendering engine for it if they like when the release stabilizes. JVZ
-
- -->
- <doxiaVersion>1.0-alpha-9</doxiaVersion>
- <easyMockVersion>1.2_Java1.3</easyMockVersion>
- <junitVersion>3.8.1</junitVersion>
- <plexusVersion>1.0-beta-3.0.6</plexusVersion>
- <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
- <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
- <plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion>
- <plexusUtilsVersion>1.5.8</plexusUtilsVersion>
- <plexusJetty6Version>1.6</plexusJetty6Version>
- <plexusWebdavVersion>1.0</plexusWebdavVersion>
- <wagonVersion>1.0-beta-5</wagonVersion>
- <modelBuilderVersion>1.8</modelBuilderVersion>
- <mercuryVersion>1.0-alpha-7-SNAPSHOT</mercuryVersion>
- <mercuryMp3Version>1.0-alpha-1</mercuryMp3Version>
- <securityDispatcherVersion>1.2</securityDispatcherVersion>
- <woodstoxVersion>3.2.6</woodstoxVersion>
- <modelloVersion>1.0.1</modelloVersion>
- <jxpathVersion>1.3</jxpathVersion>
- <staxVersion>1.0.1</staxVersion>
- </properties>
-
+ <!--start-->
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<dependencyManagement>
+ <!--end-->
<dependencies>
<!-- Maven Modules -->
<!--start-->
@@ -348,11 +425,11 @@
<artifactId>wstx-asl</artifactId>
<version>${woodstoxVersion}</version>
</dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${staxVersion}</version>
- </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${staxVersion}</version>
+ </dependency>
<!-- Commons -->
<dependency>
<groupId>commons-cli</groupId>
@@ -360,20 +437,20 @@
<version>${commonsCliVersion}</version>
<exclusions>
<exclusion>
- <groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
</exclusion>
<exclusion>
- <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
<version>${jxpathVersion}</version>
- </dependency>
+ </dependency>
<!-- Mercury -->
<dependency>
@@ -396,9 +473,9 @@
<artifactId>mercury-repo-virtual</artifactId>
<version>${mercuryVersion}</version>
</dependency>
- <dependency>
- <groupId>org.sonatype.mercury</groupId>
- <artifactId>mercury-mp3-cli</artifactId>
+ <dependency>
+ <groupId>org.sonatype.mercury</groupId>
+ <artifactId>mercury-mp3-cli</artifactId>
<version>${mercuryMp3Version}</version>
</dependency>
<dependency>
@@ -463,98 +540,12 @@
<!--start-->
</dependencyManagement>
<!--end-->
- <!--start-->
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <!--end-->
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <version>${plexusVersion}</version>
- <executions>
- <execution>
- <goals>
- <goal>generate-metadata</goal>
- <goal>generate-test-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/maven/components/tags</tagBase>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>${modelloVersion}</version>
- <configuration>
- <useJava5>true</useJava5>
- </configuration>
- <executions>
- <execution>
- <id>site-docs</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- <goal>xsd</goal>
- </goals>
- </execution>
- <execution>
- <id>standard</id>
- <goals>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
- <goal>xpp3-writer</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4-SNAPSHOT</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/maven.apache.org/ref/${project.version}/</url>
+ </site>
+ </distributionManagement>
<profiles>
<profile>
<id>osgi</id>