You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/06/02 15:56:16 UTC

svn commit: r950566 - in /maven/maven-3/trunk: ./ maven-core/ maven-core/src/main/mdo/ maven-repository-metadata/ maven-repository-metadata/src/ maven-repository-metadata/src/main/ maven-repository-metadata/src/main/mdo/

Author: bentmann
Date: Wed Jun  2 13:56:15 2010
New Revision: 950566

URL: http://svn.apache.org/viewvc?rev=950566&view=rev
Log:
o Separated maven-metadata.xml model into separate module for easy reuse in standalone repository library

Added:
    maven/maven-3/trunk/maven-repository-metadata/   (with props)
    maven/maven-3/trunk/maven-repository-metadata/pom.xml
      - copied, changed from r939632, maven/maven-2/branches/maven-2.2.x/maven-repository-metadata/pom.xml
    maven/maven-3/trunk/maven-repository-metadata/src/
    maven/maven-3/trunk/maven-repository-metadata/src/main/
    maven/maven-3/trunk/maven-repository-metadata/src/main/mdo/
    maven/maven-3/trunk/maven-repository-metadata/src/main/mdo/metadata.mdo
      - copied unchanged from r950495, maven/maven-3/trunk/maven-core/src/main/mdo/metadata.mdo
Removed:
    maven/maven-3/trunk/maven-core/src/main/mdo/metadata.mdo
Modified:
    maven/maven-3/trunk/build.xml
    maven/maven-3/trunk/maven-core/pom.xml
    maven/maven-3/trunk/pom.xml

Modified: maven/maven-3/trunk/build.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/build.xml?rev=950566&r1=950565&r2=950566&view=diff
==============================================================================
--- maven/maven-3/trunk/build.xml (original)
+++ maven/maven-3/trunk/build.xml Wed Jun  2 13:56:15 2010
@@ -195,7 +195,7 @@ Do you want to continue?</input>
     <modello file="maven-model-builder/src/main/mdo/profiles.mdo" />
     <modello file="maven-settings/src/main/mdo/settings.mdo" version="1.1.0" />
     <modello file="maven-core/src/main/mdo/toolchains.mdo" />
-    <modello file="maven-core/src/main/mdo/metadata.mdo" />
+    <modello file="maven-repository-metadata/src/main/mdo/metadata.mdo" />
     <modello file="maven-compat/src/main/mdo/profiles.mdo" />
     <modello file="maven-compat/src/main/mdo/paramdoc.mdo" />
   </target>

Modified: maven/maven-3/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/pom.xml?rev=950566&r1=950565&r2=950566&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/pom.xml (original)
+++ maven/maven-3/trunk/maven-core/pom.xml Wed Jun  2 13:56:15 2010
@@ -35,6 +35,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-repository-metadata</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
     <dependency>
@@ -96,7 +100,6 @@
           <version>1.0.0</version>
           <models>
             <model>src/main/mdo/toolchains.mdo</model>
-            <model>src/main/mdo/metadata.mdo</model>
           </models>
         </configuration>
       </plugin>

Propchange: maven/maven-3/trunk/maven-repository-metadata/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun  2 13:56:15 2010
@@ -0,0 +1,8 @@
+target
+.settings
+.classpath
+.project
+*.iml
+*.ipr
+*.iws
+bin

Copied: maven/maven-3/trunk/maven-repository-metadata/pom.xml (from r939632, maven/maven-2/branches/maven-2.2.x/maven-repository-metadata/pom.xml)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-repository-metadata/pom.xml?p2=maven/maven-3/trunk/maven-repository-metadata/pom.xml&p1=maven/maven-2/branches/maven-2.2.x/maven-repository-metadata/pom.xml&r1=939632&r2=950566&rev=950566&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-repository-metadata/pom.xml (original)
+++ maven/maven-3/trunk/maven-repository-metadata/pom.xml Wed Jun  2 13:56:15 2010
@@ -1,4 +1,5 @@
 <?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
@@ -16,13 +17,15 @@ software distributed under the License i
 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">
+-->
+
+<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>2.2.2-RC1-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-repository-metadata</artifactId>

Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=950566&r1=950565&r2=950566&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Wed Jun  2 13:56:15 2010
@@ -134,6 +134,7 @@
     <module>maven-model</module>
     <module>maven-settings</module>
     <module>maven-artifact</module>
+    <module>maven-repository-metadata</module>
     <module>maven-plugin-api</module>
     <module>maven-model-builder</module>
     <module>maven-embedder</module>
@@ -226,6 +227,11 @@
         <artifactId>maven-artifact</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-repository-metadata</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <!--bootstrap-end-comment-->
       <!--  Plexus -->
       <dependency>