maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r620422 [1/3] - in /maven/components/branches/maven-2.0.x-terse: ./ maven-core/src/main/java/org/apache/maven/lifecycle/ maven-model/ maven-model/src/main/mdo/ maven-plugin-descriptor/ maven-plugin-parameter-documenter/ maven-plugin-registr...
Date Mon, 11 Feb 2008 06:01:39 GMT
Author: brett
Date: Sun Feb 10 22:01:36 2008
New Revision: 620422

URL: http://svn.apache.org/viewvc?rev=620422&view=rev
Log:
[MNG-3397] add a new model version that uses attributes for the most common elements. See
relevant discussion on the dev@ list

Added:
    maven/components/branches/maven-2.0.x-terse/maven-project/src/main/java/org/apache/maven/project/ModelReader.java
  (with props)
    maven/components/branches/maven-2.0.x-terse/maven-project/src/main/resources/org/apache/maven/project/pom-4.1.0.xml
      - copied, changed from r620315, maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/java/org/apache/maven/project/ModelReaderTest.java
  (with props)
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/resources/old-entity.xml
      - copied, changed from r620315, maven/components/branches/maven-2.0.x/maven-project/src/test/resources/canonical-pom.xml
Modified:
    maven/components/branches/maven-2.0.x-terse/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
    maven/components/branches/maven-2.0.x-terse/maven-model/pom.xml
    maven/components/branches/maven-2.0.x-terse/maven-model/src/main/mdo/maven.mdo
    maven/components/branches/maven-2.0.x-terse/maven-plugin-descriptor/pom.xml
    maven/components/branches/maven-2.0.x-terse/maven-plugin-parameter-documenter/pom.xml
    maven/components/branches/maven-2.0.x-terse/maven-plugin-registry/pom.xml
    maven/components/branches/maven-2.0.x-terse/maven-profile/pom.xml
    maven/components/branches/maven-2.0.x-terse/maven-project/pom.xml
    maven/components/branches/maven-2.0.x-terse/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    maven/components/branches/maven-2.0.x-terse/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
    maven/components/branches/maven-2.0.x-terse/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
    maven/components/branches/maven-2.0.x-terse/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/resources/projects/scope/transitive-compile-dep.xml
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/resources/projects/scope/transitive-default-dep.xml
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/resources/projects/scope/transitive-provided-dep.xml
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/resources/projects/scope/transitive-runtime-dep.xml
    maven/components/branches/maven-2.0.x-terse/maven-project/src/test/resources/projects/scope/transitive-test-dep.xml
    maven/components/branches/maven-2.0.x-terse/maven-repository-metadata/pom.xml
    maven/components/branches/maven-2.0.x-terse/maven-settings/pom.xml
    maven/components/branches/maven-2.0.x-terse/pom.xml

Modified: maven/components/branches/maven-2.0.x-terse/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x-terse/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=620422&r1=620421&r2=620422&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x-terse/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++ maven/components/branches/maven-2.0.x-terse/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Sun Feb 10 22:01:36 2008
@@ -595,12 +595,6 @@
     {
         List reportPlugins = project.getReportPlugins();
 
-        if ( project.getModel().getReports() != null )
-        {
-            getLogger().error(
-                "Plugin contains a <reports/> section: this is IGNORED - please use
<reporting/> instead." );
-        }
-
         if ( project.getReporting() == null || !project.getReporting().isExcludeDefaults()
)
         {
             if ( reportPlugins == null )
@@ -1246,12 +1240,6 @@
             // use the plugin if inherit was true in a base class, or it is in the current
POM, otherwise use the default inheritence setting
             if ( plugin.isInheritanceApplied() || pluginDescriptor.isInheritedByDefault()
)
             {
-                if ( plugin.getGoals() != null )
-                {
-                    getLogger().error(
-                        "Plugin contains a <goals/> section: this is IGNORED - please
use <executions/> instead." );
-                }
-
                 List executions = plugin.getExecutions();
 
                 if ( executions != null )

Modified: maven/components/branches/maven-2.0.x-terse/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x-terse/maven-model/pom.xml?rev=620422&r1=620421&r2=620422&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x-terse/maven-model/pom.xml (original)
+++ maven/components/branches/maven-2.0.x-terse/maven-model/pom.xml Sun Feb 10 22:01:36 2008
@@ -35,9 +35,24 @@
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
-          <version>4.0.0</version>
+          <version>4.1.0</version>
           <model>src/main/mdo/maven.mdo</model>
+          <packagedVersions>
+            <packagedVersion>4.0.0</packagedVersion>
+            <packagedVersion>4.1.0</packagedVersion>
+          </packagedVersions>
         </configuration>
+        <executions>
+          <execution>
+            <id>standard</id>
+            <goals>
+              <goal>converters</goal>
+              <goal>java</goal>
+              <goal>stax-reader</goal>
+              <goal>xpp3-writer</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
@@ -49,7 +64,6 @@
           <plugin>
             <groupId>org.codehaus.modello</groupId>
             <artifactId>modello-maven-plugin</artifactId>
-            <version>1.0-alpha-8</version>
             <executions>
               <execution>
                 <id>v3</id>
@@ -85,6 +99,11 @@
     </profile>
   </profiles>
   <dependencies>
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+      <version>1.0.1</version>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>



Mime
View raw message