maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r679609 - in /maven/components/trunk: ./ maven-embedder/src/test/java/org/apache/maven/embedder/ maven-project/ maven-project/src/main/java/org/apache/maven/project/ maven-project/src/main/java/org/apache/maven/project/builder/ maven-projec...
Date Thu, 24 Jul 2008 23:07:00 GMT
Author: sisbell
Date: Thu Jul 24 16:06:59 2008
New Revision: 679609

URL: http://svn.apache.org/viewvc?rev=679609&view=rev
Log:
Merge of SI_MAVEN_2_1 branch. New builder code.

Added:
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/
      - copied from r679606, maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
      - copied unchanged from r679606, maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
      - copied unchanged from r679606, maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java
      - copied unchanged from r679606, maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
      - copied unchanged from r679606, maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
      - copied unchanged from r679606, maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
      - copied unchanged from r679606, maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectUri.java
      - copied unchanged from r679606, maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/ProjectUri.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/
      - copied from r679606, maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
      - copied unchanged from r679606, maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
Modified:
    maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
    maven/components/trunk/maven-project/pom.xml
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
    maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
    maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
    maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
    maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
    maven/components/trunk/pom.xml

Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=679609&r1=679608&r2=679609&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
(original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Thu Jul 24 16:06:59 2008
@@ -334,9 +334,9 @@
 
         MavenProject project = maven.readProject( pomFile );
 
-        assertEquals( "http://host/viewer?path=/trunk/parent/modules/child1", project.getScm().getUrl()
);
-        assertEquals( "scm:svn:http://host/trunk/parent/modules/child1", project.getScm().getConnection()
);
-        assertEquals( "scm:svn:https://host/trunk/parent/modules/child1", project.getScm().getDeveloperConnection()
);
+        assertEquals( "http://host/viewer?path=/trunk/parent/child1", project.getScm().getUrl()
);
+        assertEquals( "scm:svn:http://host/trunk/parent/child1", project.getScm().getConnection()
);
+        assertEquals( "scm:svn:https://host/trunk/parent/child1", project.getScm().getDeveloperConnection()
);
     }
 
     public void testProjectReading_SkipMissingModuleSilently()

Modified: maven/components/trunk/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=679609&r1=679608&r2=679609&view=diff
==============================================================================
--- maven/components/trunk/maven-project/pom.xml (original)
+++ maven/components/trunk/maven-project/pom.xml Thu Jul 24 16:06:59 2008
@@ -68,7 +68,15 @@
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
       <scope>test</scope>
-    </dependency>    
+    </dependency>  
+    <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>wstx-asl</artifactId>
+    </dependency> 
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-shared-model</artifactId>
+    </dependency> 
   </dependencies>
   <build>
     <plugins>

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=679609&r1=679608&r2=679609&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Thu Jul 24 16:06:59 2008
@@ -46,6 +46,7 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginManagement;
+import org.apache.maven.model.Parent;
 import org.apache.maven.model.ReportPlugin;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.Resource;
@@ -69,6 +70,9 @@
 import org.apache.maven.project.validation.ModelValidationResult;
 import org.apache.maven.project.validation.ModelValidator;
 import org.apache.maven.project.workspace.ProjectWorkspace;
+import org.apache.maven.project.builder.PomArtifactResolver;
+import org.apache.maven.project.builder.ProjectBuilder;
+import org.apache.maven.project.builder.PomClassicDomainModel;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -77,24 +81,9 @@
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
+import java.io.*;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
+import java.util.*;
 
 /*:apt
 
@@ -137,7 +126,7 @@
     implements MavenProjectBuilder,
     Initializable, LogEnabled
 {
-    protected MavenProfilesBuilder profilesBuilder;
+    protected MavenProfilesBuilder profilesBuilder;                        
 
     protected ArtifactResolver artifactResolver;
 
@@ -166,6 +155,8 @@
 
     private ProjectWorkspace projectWorkspace;
 
+    private ProjectBuilder projectBuilder;
+
     //DO NOT USE, it is here only for backward compatibility reasons. The existing
     // maven-assembly-plugin (2.2-beta-1) is accessing it via reflection.
 
@@ -500,11 +491,9 @@
 
         if ( project == null )
         {
-//            getLogger().debug( "Allowing project-build to proceed for: " + projectDescriptor
);
-
-            Model model = readModel( "unknown", projectDescriptor, STRICT_MODEL_PARSING );
-
-            project = buildInternal( model,
+            Model model = readModelFromLocalPath( "unknown", projectDescriptor, new PomArtifactResolver(config.getLocalRepository(),
+                    buildArtifactRepositories( getSuperModel() ), artifactResolver) );
+            project = buildInternal(model,
                 config,
                 buildArtifactRepositories( getSuperModel() ),
                 projectDescriptor,
@@ -512,11 +501,6 @@
                 true,
                 true );
         }
-//        else
-//        {
-//            getLogger().debug( "Returning cached project: " + project );
-//        }
-
         return project;
     }
 
@@ -525,8 +509,8 @@
                                            ArtifactRepository localRepository )
         throws ProjectBuildingException
     {
-        String projectId = safeVersionlessKey( artifact.getGroupId(), artifact.getArtifactId()
);
 
+        String projectId = safeVersionlessKey( artifact.getGroupId(), artifact.getArtifactId()
);
         remoteArtifactRepositories = normalizeToArtifactRepositories( remoteArtifactRepositories,
projectId );
 
         Artifact projectArtifact;
@@ -548,21 +532,20 @@
                 artifact.getScope() );
         }
 
-        Model model;
-
+        Model legacy_model;
         try
         {
             artifactResolver.resolve( projectArtifact, remoteArtifactRepositories, localRepository
);
 
             File file = projectArtifact.getFile();
 
-            model = readModel( projectId, file, STRICT_MODEL_PARSING );
+            legacy_model = readModelLegacy( projectId, file, STRICT_MODEL_PARSING );
 
             String downloadUrl = null;
 
             ArtifactStatus status = ArtifactStatus.NONE;
 
-            DistributionManagement distributionManagement = model.getDistributionManagement();
+            DistributionManagement distributionManagement = legacy_model.getDistributionManagement();
 
             if ( distributionManagement != null )
             {
@@ -581,7 +564,7 @@
             }
             else
             {
-                projectArtifact.setDownloadUrl( model.getUrl() );
+                projectArtifact.setDownloadUrl( legacy_model.getUrl() );
             }
         }
         catch ( ArtifactResolutionException e )
@@ -593,7 +576,7 @@
             throw new ProjectBuildingException( projectId, "POM '" + projectId + "' not found
in repository: " + e.getMessage(), e );
         }
 
-        return model;
+        return legacy_model;
     }
 
     private List normalizeToArtifactRepositories( List remoteArtifactRepositories,
@@ -841,6 +824,7 @@
 
 //        getLogger().debug( "Caching project: " + project.getId() + " (also keyed by file:
" + project.getFile() + ")" );
 
+
         projectWorkspace.storeProjectByCoordinate( project );
         projectWorkspace.storeProjectByFile( project );
 
@@ -1791,7 +1775,7 @@
         }
     }
 
-    private Model readModel( String projectId,
+    private Model readModelLegacy( String projectId,
                              File file,
                              boolean strict )
         throws ProjectBuildingException
@@ -2085,4 +2069,31 @@
     {
         this.logger = logger;
     }
+
+    private Model readModelFromLocalPath( String projectId,
+                            File projectDescriptor,
+                            PomArtifactResolver resolver )
+       throws ProjectBuildingException
+   {
+       if(projectDescriptor == null) {
+           throw new IllegalArgumentException("projectDescriptor: null, Project Id =" + projectId);
+       }
+
+       if(projectBuilder == null) {
+           throw new IllegalArgumentException("projectBuilder: not initialized");
+       }
+
+       MavenProject mavenProject;
+       try {
+           mavenProject = projectBuilder.buildFromLocalPath(new FileInputStream(projectDescriptor),
+                   null, null, resolver,
+                   projectDescriptor.getParentFile());
+       } catch (IOException e) {
+           e.printStackTrace();
+           throw new ProjectBuildingException(projectId, "File = " + projectDescriptor.getAbsolutePath()
, e);
+       }
+
+      return mavenProject.getModel();
+
+   }
 }

Modified: maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=679609&r1=679608&r2=679609&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
Thu Jul 24 16:06:59 2008
@@ -111,11 +111,24 @@
      |
      -->
     <component>
+        <role>org.apache.maven.project.builder.ProjectBuilder</role>
+        <role-hint>default</role-hint>
+        <implementation>org.apache.maven.project.builder.impl.DefaultProjectBuilder</implementation>
+        <requirements>
+            <requirement>
+                <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+            </requirement>
+        </requirements>
+    </component>
+    <component>
       <role>org.apache.maven.project.MavenProjectBuilder</role>
       <role-hint>default</role-hint>
       <implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
       <requirements>
         <requirement>
+             <role>org.apache.maven.project.builder.ProjectBuilder</role>
+        </requirement>
+        <requirement>
           <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
         </requirement>
         <requirement>

Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java?rev=679609&r1=679608&r2=679609&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
(original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
Thu Jul 24 16:06:59 2008
@@ -53,6 +53,6 @@
 
     protected File getLocalRepositoryPath()
     {
-        return getTestFile( "src/test/resources/inheritance-repo/" + getTestSeries() );
+        return getTestFile("src/test/resources/inheritance-repo/" + getTestSeries() );
     }
 }

Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java?rev=679609&r1=679608&r2=679609&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
(original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
Thu Jul 24 16:06:59 2008
@@ -69,12 +69,12 @@
         System.out.println( "Child SCM developer connection is: "
                             + project1.getScm().getDeveloperConnection() );
 
-        assertEquals( project1.getScm().getUrl(), project0.getScm().getUrl() + "/modules/p1"
);
+        assertEquals( project1.getScm().getUrl(), project0.getScm().getUrl() + "/p1" );
         assertEquals( project1.getScm().getConnection(), project0.getScm().getConnection()
-                                                         + "/modules/p1" );
+                                                         + "/p1" );
         assertEquals( project1.getScm().getDeveloperConnection(), project0.getScm()
                                                                           .getDeveloperConnection()
-                                                                  + "/modules/p1" );
+                                                                  + "/p1" );
     }
 
     public void testScmInfoCalculatedCorrectlyOnChildOnlyRead()
@@ -93,10 +93,10 @@
         System.out.println( "Child SCM developer connection is: "
                             + project1.getScm().getDeveloperConnection() );
 
-        assertEquals( project1.getScm().getUrl(), "http://host/viewer?path=/p0/modules/p1"
);
-        assertEquals( project1.getScm().getConnection(), "scm:svn:http://host/p0/modules/p1"
);
+        assertEquals( project1.getScm().getUrl(), "http://host/viewer?path=/p0/p1" );
+        assertEquals( project1.getScm().getConnection(), "scm:svn:http://host/p0/p1" );
         assertEquals( project1.getScm().getDeveloperConnection(),
-                      "scm:svn:https://host/p0/modules/p1" );
+                      "scm:svn:https://host/p0/p1" );
     }
 
 //    public void testScmInfoCalculatedCorrectlyOnChildReadFromLocalRepository()

Modified: maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=679609&r1=679608&r2=679609&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
(original)
+++ maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
Thu Jul 24 16:06:59 2008
@@ -76,11 +76,24 @@
       </requirements>
     </component>
     <component>
+        <role>org.apache.maven.project.builder.ProjectBuilder</role>
+        <role-hint>default</role-hint>
+        <implementation>org.apache.maven.project.builder.impl.DefaultProjectBuilder</implementation>
+        <requirements>
+            <requirement>
+                <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+            </requirement>
+        </requirements>
+    </component>
+    <component>
       <role>org.apache.maven.project.MavenProjectBuilder</role>
       <role-hint>test</role-hint>
       <implementation>org.apache.maven.project.TestProjectBuilder</implementation>
       <requirements>
         <requirement>
+             <role>org.apache.maven.project.builder.ProjectBuilder</role>
+        </requirement>          
+        <requirement>
           <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
         </requirement>
         <requirement>

Modified: maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=679609&r1=679608&r2=679609&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
(original)
+++ maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
Thu Jul 24 16:06:59 2008
@@ -74,11 +74,24 @@
       </requirements>
     </component>
     <component>
+        <role>org.apache.maven.project.builder.ProjectBuilder</role>
+        <role-hint>default</role-hint>
+        <implementation>org.apache.maven.project.builder.impl.DefaultProjectBuilder</implementation>
+        <requirements>
+            <requirement>
+                <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+            </requirement>
+        </requirements>
+    </component>      
+    <component>
       <role>org.apache.maven.project.MavenProjectBuilder</role>
       <role-hint>test</role-hint>
       <implementation>org.apache.maven.project.TestProjectBuilder</implementation>
       <requirements>
         <requirement>
+             <role>org.apache.maven.project.builder.ProjectBuilder</role>
+        </requirement>
+        <requirement>
           <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
         </requirement>
         <requirement>

Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=679609&r1=679608&r2=679609&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Thu Jul 24 16:06:59 2008
@@ -1,20 +1,20 @@
 <?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.
-  -->
+<!--
+  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/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven</groupId>
@@ -32,14 +32,15 @@
     publication, and distribution publication are all controlled from
     the declarative file. Maven can be extended by plugins to utilise a
     number of other development tools for reporting or the build
-    process. </description>
+    process.
+  </description>
   <url>http://maven.apache.org/</url>
   <inceptionYear>2001</inceptionYear>
   <issueManagement>
     <system>jira</system>
     <url>http://jira.codehaus.org/browse/MNG</url>
   </issueManagement>
-  
+
   <!-- TODO: TAKE THIS OUT BEFORE WE RELEASE! -->
   <repositories>
     <repository>
@@ -271,8 +272,10 @@
     <plexusInterpolationVersion>1.1</plexusInterpolationVersion>
     <plexusUtilsVersion>1.5.5</plexusUtilsVersion>
     <wagonVersion>1.0-beta-3</wagonVersion>
+    <mavenSharedModel>1.0-SNAPSHOT</mavenSharedModel>
+    <woodstoxVersion>3.2.6</woodstoxVersion>
   </properties>
-  
+
   <!--start-->
   <dependencies>
     <dependency>
@@ -367,7 +370,7 @@
             <artifactId>plexus-component-api</artifactId>
           </exclusion>
         </exclusions>
-      </dependency>      
+      </dependency>
       <!--  Wagon -->
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
@@ -405,6 +408,16 @@
         <version>${doxiaVersion}</version>
       </dependency>
       <dependency>
+        <groupId>org.apache.maven.shared</groupId>
+        <artifactId>maven-shared-model</artifactId>
+        <version>${mavenSharedModel}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>wstx-asl</artifactId>
+        <version>${woodstoxVersion}</version>
+      </dependency>
+      <dependency>
         <groupId>easymock</groupId>
         <artifactId>easymock</artifactId>
         <version>${easyMockVersion}</version>
@@ -424,7 +437,7 @@
             <groupId>commons-logging</groupId>
           </exclusion>
         </exclusions>
-      </dependency>   
+      </dependency>
       <!-- Needed for backward compat aspect. -->
       <dependency>
         <groupId>aspectj</groupId>



Mime
View raw message