Author: jdcasey
Date: Tue Jun 9 17:07:27 2009
New Revision: 783068
URL: http://svn.apache.org/viewvc?rev=783068&view=rev
Log:
[MNG-4167] Remove coordinate interpolator. Not reverting to
VersionExpressionTransformation, since both cause problems.
Removed:
maven/components/branches/maven-2.2.0-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/CoordinateInterpolator.java
maven/components/branches/maven-2.2.0-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/DefaultCoordinateInterpolator.java
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractCoordinateInterpolationTest.java
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/DefaultCoordinateInterpolatorTest.java
Modified:
maven/components/branches/maven-2.2.0-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/maven-2.2.0-RC/maven-project/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
Modified:
maven/components/branches/maven-2.2.0-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=783068&r1=783067&r2=783068&view=diff
==============================================================================
---
maven/components/branches/maven-2.2.0-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/maven-2.2.0-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Jun 9 17:07:27 2009
@@ -19,25 +19,6 @@
* under the License.
*/
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-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 org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactStatus;
import org.apache.maven.artifact.ArtifactUtils;
@@ -82,7 +63,6 @@
import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
import org.apache.maven.project.injection.ModelDefaultsInjector;
import org.apache.maven.project.injection.ProfileInjector;
-import org.apache.maven.project.interpolation.CoordinateInterpolator;
import org.apache.maven.project.interpolation.ModelInterpolationException;
import org.apache.maven.project.interpolation.ModelInterpolator;
import org.apache.maven.project.path.PathTranslator;
@@ -102,6 +82,25 @@
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.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;
+
/*:apt
-----
@@ -173,8 +172,6 @@
private ModelInterpolator modelInterpolator;
- private CoordinateInterpolator coordinateInterpolator;
-
private ArtifactRepositoryFactory artifactRepositoryFactory;
// ----------------------------------------------------------------------
@@ -908,19 +905,6 @@
// Only track the file of a POM in the source tree
project.setFile( projectDescriptor );
-
- try
- {
- coordinateInterpolator.interpolateArtifactCoordinates( project
);
- }
- catch ( IOException e )
- {
- throw new ProjectBuildingException( project.getId(), "Failed
to write POM with interpolated coordinate expressions.", e );
- }
- catch ( ModelInterpolationException e )
- {
- throw new InvalidProjectModelException( projectId,
pomLocation, e.getMessage(), e );
- }
}
project.setManagedVersionMap( createManagedVersionMap( projectId,
Modified:
maven/components/branches/maven-2.2.0-RC/maven-project/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=783068&r1=783067&r2=783068&view=diff
==============================================================================
---
maven/components/branches/maven-2.2.0-RC/maven-project/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/branches/maven-2.2.0-RC/maven-project/src/main/resources/META-INF/plexus/components.xml
Tue Jun 9 17:07:27 2009
@@ -49,21 +49,6 @@
|
-->
<component>
-
<role>org.apache.maven.project.interpolation.CoordinateInterpolator</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.project.interpolation.DefaultCoordinateInterpolator</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.project.path.PathTranslator</role>
- </requirement>
- </requirements>
- </component>
-<!--
- |
- |
- |
- -->
- <component>
<role>org.apache.maven.project.interpolation.ModelInterpolator</role>
<implementation>org.apache.maven.project.interpolation.StringSearchModelInterpolator</implementation>
<requirements>
@@ -112,9 +97,6 @@
<role>org.apache.maven.project.interpolation.ModelInterpolator</role>
</requirement>
<requirement>
-
<role>org.apache.maven.project.interpolation.CoordinateInterpolator</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
</requirement>
<requirement>
Modified:
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java?rev=783068&r1=783067&r2=783068&view=diff
==============================================================================
---
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
(original)
+++
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
Tue Jun 9 17:07:27 2009
@@ -32,7 +32,6 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.Resource;
-import org.apache.maven.project.interpolation.CoordinateInterpolator;
import org.apache.maven.project.interpolation.ModelInterpolationException;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.StringUtils;
Modified:
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=783068&r1=783067&r2=783068&view=diff
==============================================================================
---
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
(original)
+++
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
Tue Jun 9 17:07:27 2009
@@ -72,9 +72,6 @@
<role-hint>test</role-hint>
</requirement>
<requirement>
-
<role>org.apache.maven.project.interpolation.CoordinateInterpolator</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.interpolation.ModelInterpolator</role>
</requirement>
<requirement>
Modified:
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=783068&r1=783067&r2=783068&view=diff
==============================================================================
---
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
(original)
+++
maven/components/branches/maven-2.2.0-RC/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
Tue Jun 9 17:07:27 2009
@@ -72,9 +72,6 @@
<role-hint>test</role-hint>
</requirement>
<requirement>
-
<role>org.apache.maven.project.interpolation.CoordinateInterpolator</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.interpolation.ModelInterpolator</role>
</requirement>
<requirement>
