o Moved Settings out of maven-compat

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@828801 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -181,7 +181,7 @@ END SNIPPET: ant-bootstrap -->
     <modello file="maven-model/src/main/mdo/maven.mdo" version="4.0.0" />
     <modello file="maven-plugin-api/src/main/mdo/lifecycle.mdo" />
     <modello file="maven-model-builder/src/main/mdo/profiles.mdo" />
-    <modello file="maven-compat/src/main/mdo/settings.mdo" version="1.1.0" />
+    <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-compat/src/main/mdo/metadata.mdo" />
     <modello file="maven-compat/src/main/mdo/profiles.mdo" />

maven-compat/pom.xml

@@ -31,6 +31,10 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model-builder</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
@@ -82,22 +86,6 @@
             <model>src/main/mdo/paramdoc.mdo</model>
           </models>
         </configuration>
-        <executions>
-          <execution>
-            <id>settings</id>
-            <goals>
-              <goal>java</goal>
-              <goal>xpp3-reader</goal>
-              <goal>xpp3-writer</goal>
-            </goals>
-            <configuration>
-              <version>1.1.0</version>
-              <models>
-                <model>src/main/mdo/settings.mdo</model>
-              </models>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

maven-settings/pom.xml

@@ -0,0 +1,57 @@
+<?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
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, 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>
+
+  <artifactId>maven-settings</artifactId>
+
+  <name>Maven Settings</name>
+  <description>Maven Settings</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <configuration>
+          <version>1.1.0</version>
+          <models>
+            <model>src/main/mdo/settings.mdo</model>
+          </models>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

maven-settings/src/main/mdo/settings.mdo

@@ -392,11 +392,13 @@
 
     private RuntimeInfo runtimeInfo;
 
+    @Deprecated
     public void setRuntimeInfo( RuntimeInfo runtimeInfo )
     {
         this.runtimeInfo = runtimeInfo;
     }
 
+    @Deprecated
     public RuntimeInfo getRuntimeInfo()
     {
         if ( runtimeInfo == null )
@@ -405,7 +407,6 @@
         }
         return runtimeInfo;
     }
-
             ]]>
           </code>
         </codeSegment>

pom.xml

@@ -132,6 +132,7 @@
     <module>maven-core</module>
     <module>apache-maven</module>
     <module>maven-model</module>
+    <module>maven-settings</module>
     <module>maven-artifact</module>
     <module>maven-plugin-api</module>
     <module>maven-model-builder</module>
@@ -205,6 +206,11 @@
         <artifactId>maven-model</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-settings</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>