You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/09/18 13:10:00 UTC
svn commit: r696629 [7/7] - in /maven/components/branches/jvz: ./
maven-core-it-runner/ maven-core/ maven-core/src/main/aspect/
maven-core/src/main/java/org/apache/maven/
maven-core/src/main/java/org/apache/maven/errors/
maven-core/src/main/java/org/ap...
Modified: maven/components/branches/jvz/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=696629&r1=696628&r2=696629&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml (original)
+++ maven/components/branches/jvz/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml Thu Sep 18 04:09:54 2008
@@ -55,7 +55,7 @@
<finalName>${project.artifactId}-${project.version}</finalName>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
- <scriptSourceDirectory>${project.basedir}/src/main/scripts</scriptSourceDirectory>
+ <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<resources>
<resource>
Modified: maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java?rev=696629&r1=696628&r2=696629&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java (original)
+++ maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java Thu Sep 18 04:09:54 2008
@@ -25,9 +25,13 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.Resource;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.WriterFactory;
import java.io.File;
+import java.io.ByteArrayOutputStream;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -40,8 +44,6 @@
private File localRepoDir;
- private DefaultMavenProjectBuilder projectBuilder;
-
@Override
public void setUp()
throws Exception
@@ -105,36 +107,13 @@
File f1 = getTestFile( "src/test/resources/projects/duplicate-plugins-merged-pom.xml" );
MavenProject project = getProject( f1 );
-
+ Writer out = WriterFactory.newXmlWriter( System.out );
+ MavenXpp3Writer writer = new MavenXpp3Writer();
+ writer.write( out, project.getModel() );
+ out.close();
assertEquals( 2, ( (Plugin) project.getBuildPlugins().get( 0 ) ).getDependencies().size() );
}
- public void testBuildDirectoryExpressionInterpolatedWithTranslatedValue()
- throws Exception
- {
- File pom = getTestFile( "src/test/resources/projects/build-path-expression-pom.xml" );
-
- MavenProject project = getProject( pom );
-
- projectBuilder.calculateConcreteState( project, new DefaultProjectBuilderConfiguration() );
-
- Build build = project.getBuild();
- assertNotNull( "Project should have a build section containing the test resource.", build );
-
- String sourceDirectory = build.getSourceDirectory();
- assertNotNull( "Project build should contain a valid source directory.", sourceDirectory );
-
- List resources = build.getResources();
- assertNotNull( "Project should contain a build resource.", resources );
- assertEquals( "Project should contain exactly one build resource.", 1, resources.size() );
-
- Resource res = (Resource) resources.get( 0 );
- assertEquals( "Project resource should be the same directory as the source directory.",
- sourceDirectory,
- res.getDirectory() );
-
- System.out.println( "Interpolated, translated resource directory is: " + res.getDirectory() );
- }
@Override
protected ArtifactRepository getLocalRepository()
Modified: maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java?rev=696629&r1=696628&r2=696629&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java (original)
+++ maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java Thu Sep 18 04:09:54 2008
@@ -493,31 +493,6 @@
assertEquals( expected, actual );
}
- public void testShouldMergeTwoPluginDependenciesOnMergeDupePluginDefs()
- {
- PluginContainer first = new PluginContainer();
- Plugin fPlugin = createPlugin( "g", "a", "1", Collections.EMPTY_MAP );
- Dependency fDep = new Dependency();
- fDep.setGroupId( "group" );
- fDep.setArtifactId( "artifact" );
- fDep.setVersion( "1" );
-
- first.addPlugin( fPlugin );
- fPlugin.addDependency( fDep );
-
- Plugin sPlugin = createPlugin( "g", "a", "1", Collections.EMPTY_MAP );
- Dependency sDep = new Dependency();
- sDep.setGroupId( "group" );
- sDep.setArtifactId( "artifact2" );
- sDep.setVersion( "1" );
- first.addPlugin( sPlugin );
- sPlugin.addDependency( sDep );
-
- ModelUtils.mergeDuplicatePluginDefinitions( first );
-
- assertEquals( 2, ((Plugin)first.getPlugins().get( 0 ) ).getDependencies().size() );
- }
-
public void testShouldNotMergePluginExecutionWhenExecInheritedIsFalseAndTreatAsInheritanceIsTrue()
{
String gid = "group";
Modified: maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java?rev=696629&r1=696628&r2=696629&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java (original)
+++ maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/TestArtifactResolver.java Thu Sep 18 04:09:54 2008
@@ -27,6 +27,7 @@
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
@@ -35,8 +36,7 @@
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
+import org.apache.maven.model.*;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
@@ -50,10 +50,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
public class TestArtifactResolver
extends DefaultArtifactResolver
@@ -240,4 +237,108 @@
container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
}
+ public static final class ProjectUtils
+ {
+ private ProjectUtils()
+ {
+ }
+
+ public static List buildArtifactRepositories( List repositories,
+ ArtifactRepositoryFactory artifactRepositoryFactory,
+ PlexusContainer container )
+ throws InvalidRepositoryException
+ {
+
+ List repos = new ArrayList();
+
+ for ( Iterator i = repositories.iterator(); i.hasNext(); )
+ {
+ Repository mavenRepo = (Repository) i.next();
+
+ ArtifactRepository artifactRepo =
+ buildArtifactRepository( mavenRepo, artifactRepositoryFactory, container );
+
+ if ( !repos.contains( artifactRepo ) )
+ {
+ repos.add( artifactRepo );
+ }
+ }
+ return repos;
+ }
+
+ public static ArtifactRepository buildDeploymentArtifactRepository( DeploymentRepository repo,
+ ArtifactRepositoryFactory artifactRepositoryFactory,
+ PlexusContainer container )
+ throws InvalidRepositoryException
+ {
+ if ( repo != null )
+ {
+ String id = repo.getId();
+ String url = repo.getUrl();
+
+ return artifactRepositoryFactory.createDeploymentArtifactRepository( id, url, repo.getLayout(),
+ repo.isUniqueVersion() );
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public static ArtifactRepository buildArtifactRepository( Repository repo,
+ ArtifactRepositoryFactory artifactRepositoryFactory,
+ PlexusContainer container )
+ throws InvalidRepositoryException
+ {
+ if ( repo != null )
+ {
+ String id = repo.getId();
+ String url = repo.getUrl();
+
+ if ( id == null || id.trim().length() < 1 )
+ {
+ throw new MissingRepositoryElementException( "Repository ID must not be empty (URL is: " + url + ")." );
+ }
+
+ if ( url == null || url.trim().length() < 1 )
+ {
+ throw new MissingRepositoryElementException( "Repository URL must not be empty (ID is: " + id + ").", id );
+ }
+
+ ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repo.getSnapshots() );
+ ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repo.getReleases() );
+
+ return artifactRepositoryFactory.createArtifactRepository( id, url, repo.getLayout(), snapshots, releases );
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ private static ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( RepositoryPolicy policy )
+ {
+ boolean enabled = true;
+ String updatePolicy = null;
+ String checksumPolicy = null;
+
+ if ( policy != null )
+ {
+ enabled = policy.isEnabled();
+ if ( policy.getUpdatePolicy() != null )
+ {
+ updatePolicy = policy.getUpdatePolicy();
+ }
+ if ( policy.getChecksumPolicy() != null )
+ {
+ checksumPolicy = policy.getChecksumPolicy();
+ }
+ }
+
+ return new ArtifactRepositoryPolicy( enabled, updatePolicy, checksumPolicy );
+ }
+
+ }
+
+
}
\ No newline at end of file
Modified: maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java?rev=696629&r1=696628&r2=696629&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java (original)
+++ maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java Thu Sep 18 04:09:54 2008
@@ -29,7 +29,6 @@
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.injection.ModelDefaultsInjector;
import org.codehaus.plexus.PlexusTestCase;
import java.util.ArrayList;
@@ -155,7 +154,7 @@
MavenProject project = new MavenProject( model );
- ModelDefaultsInjector injector = (ModelDefaultsInjector) lookup( ModelDefaultsInjector.ROLE );
+ TestModelDefaultsInjector injector = new TestModelDefaultsInjector();
injector.injectDefaults( model );
Modified: maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java?rev=696629&r1=696628&r2=696629&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java (original)
+++ maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java Thu Sep 18 04:09:54 2008
@@ -70,6 +70,7 @@
MavenProject project0 = getProjectWithDependencies( pom0 );
MavenProject project1 = getProjectWithDependencies( pom1 );
+ assertNotNull("Parent is null", project1.getParent());
assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() );
Map map = project1.getArtifactMap();
Modified: maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java?rev=696629&r1=696628&r2=696629&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java (original)
+++ maven/components/branches/jvz/maven-project/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java Thu Sep 18 04:09:54 2008
@@ -24,6 +24,7 @@
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Model;
+import org.apache.maven.project.artifact.TestModelDefaultsInjector;
import java.util.List;
@@ -35,7 +36,7 @@
{
public void testShouldConstructWithNoParams()
{
- new DefaultModelDefaultsInjector();
+ new TestModelDefaultsInjector();
}
public void testShouldMergeManagedDependencyOfTypeEJBToDependencyList()
@@ -66,7 +67,7 @@
model.addDependency( dep );
- new DefaultModelDefaultsInjector().injectDefaults( model );
+ new TestModelDefaultsInjector().injectDefaults( model );
List resultingDeps = model.getDependencies();
@@ -99,7 +100,7 @@
model.setDependencyManagement( depMgmt );
- new DefaultModelDefaultsInjector().injectDefaults( model );
+ new TestModelDefaultsInjector().injectDefaults( model );
List deps = model.getDependencies();
assertEquals( 1, deps.size() );
@@ -136,7 +137,7 @@
model.setDependencyManagement( depMgmt );
- new DefaultModelDefaultsInjector().injectDefaults( model );
+ new TestModelDefaultsInjector().injectDefaults( model );
List deps = model.getDependencies();
assertEquals( 1, deps.size() );
@@ -174,7 +175,7 @@
model.setDependencyManagement( depMgmt );
- new DefaultModelDefaultsInjector().injectDefaults( model );
+ new TestModelDefaultsInjector().injectDefaults( model );
List deps = model.getDependencies();
assertEquals( 1, deps.size() );
@@ -204,7 +205,7 @@
model.setDependencyManagement( depMgmt );
- new DefaultModelDefaultsInjector().injectDefaults( model );
+ new TestModelDefaultsInjector().injectDefaults( model );
List deps = model.getDependencies();
assertEquals( 1, deps.size() );
@@ -234,7 +235,7 @@
model.setDependencyManagement( depMgmt );
- new DefaultModelDefaultsInjector().injectDefaults( model );
+ new TestModelDefaultsInjector().injectDefaults( model );
List deps = model.getDependencies();
assertEquals( 1, deps.size() );
@@ -261,7 +262,7 @@
model.setDependencyManagement( depMgmt );
- new DefaultModelDefaultsInjector().injectDefaults( model );
+ new TestModelDefaultsInjector().injectDefaults( model );
List deps = model.getDependencies();
assertEquals( 1, deps.size() );
@@ -289,7 +290,7 @@
model.setDependencyManagement( depMgmt );
- new DefaultModelDefaultsInjector().injectDefaults( model );
+ new TestModelDefaultsInjector().injectDefaults( model );
List deps = model.getDependencies();
assertEquals( 1, deps.size() );
@@ -322,7 +323,7 @@
model.setDependencyManagement( depMgmt );
- new DefaultModelDefaultsInjector().injectDefaults( model );
+ new TestModelDefaultsInjector().injectDefaults( model );
List deps = model.getDependencies();
assertEquals( 1, deps.size() );
@@ -353,7 +354,7 @@
// try
// {
- new DefaultModelDefaultsInjector().injectDefaults( model );
+ new TestModelDefaultsInjector().injectDefaults( model );
Dependency dependency = (Dependency) model.getDependencies().get( 0 );
assertNull( "check version is null", dependency.getVersion() );
// fail("Should fail to validate dependency without a version.");
Modified: maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=696629&r1=696628&r2=696629&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml (original)
+++ maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml Thu Sep 18 04:09:54 2008
@@ -19,6 +19,27 @@
<plexus>
<components>
+<!--Eliminate this component after Mercury Integration-->
+ <component>
+ <role>org.apache.maven.project.RepositoryHelper</role>
+ <implementation>org.apache.maven.project.DefaultRepositoryHelper</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
+ <role-hint>default</role-hint>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+ <role-hint>default</role-hint>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.MavenTools</role>
+ </requirement>
+ </requirements>
+ </component>
<!-- Due to PLX-108, have to work around it...
<component>
<role>org.apache.maven.artifact.ArtifactResolver</role>
@@ -83,6 +104,12 @@
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
</requirement>
+ <requirement>
+ <role>org.apache.maven.MavenTools</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.project.RepositoryHelper</role>
+ </requirement>
</requirements>
</component>
<component>
@@ -91,14 +118,13 @@
<implementation>org.apache.maven.project.TestProjectBuilder</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.project.builder.ProjectBuilder</role>
- </requirement>
+ <role>org.apache.maven.project.RepositoryHelper</role>
+ </requirement>
<requirement>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
+ <role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
- <role-hint>default</role-hint>
+ <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
</requirement>
<requirement>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
@@ -108,21 +134,9 @@
<role>org.apache.maven.profiles.MavenProfilesBuilder</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.path.PathTranslator</role>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
</requirement>
<requirement>
Modified: maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=696629&r1=696628&r2=696629&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml (original)
+++ maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml Thu Sep 18 04:09:54 2008
@@ -18,7 +18,27 @@
-->
<plexus>
- <components>
+ <components><!--Eliminate this component after Mercury Integration-->
+ <component>
+ <role>org.apache.maven.project.RepositoryHelper</role>
+ <implementation>org.apache.maven.project.DefaultRepositoryHelper</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+ <role-hint>default</role-hint>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.MavenTools</role>
+ </requirement>
+ </requirements>
+ </component>
+
<!-- Due to PLX-108, have to work around it...
<component>
<role>org.apache.maven.artifact.ArtifactResolver</role>
@@ -81,6 +101,12 @@
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
</requirement>
+ <requirement>
+ <role>org.apache.maven.MavenTools</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.project.RepositoryHelper</role>
+ </requirement>
</requirements>
</component>
<component>
@@ -89,14 +115,13 @@
<implementation>org.apache.maven.project.TestProjectBuilder</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.project.builder.ProjectBuilder</role>
+ <role>org.apache.maven.project.RepositoryHelper</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
+ <role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.build.model.ModelLineageBuilder</role>
- <role-hint>default</role-hint>
+ <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
</requirement>
<requirement>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
@@ -106,21 +131,9 @@
<role>org.apache.maven.profiles.MavenProfilesBuilder</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.validation.ModelValidator</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.path.PathTranslator</role>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
</requirement>
<requirement>
Propchange: maven/components/branches/jvz/maven-shared-model/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 18 04:09:54 2008
@@ -0,0 +1,10 @@
+target
+*~
+*.log
+.classpath
+.project
+*.ipr
+*.iws
+*.iml
+.settings
+bin
Modified: maven/components/branches/jvz/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/pom.xml?rev=696629&r1=696628&r2=696629&view=diff
==============================================================================
--- maven/components/branches/jvz/pom.xml (original)
+++ maven/components/branches/jvz/pom.xml Thu Sep 18 04:09:54 2008
@@ -15,13 +15,14 @@
-->
<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">
- <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>9-SNAPSHOT</version>
<relativePath>../pom/maven/pom.xml</relativePath>
- </parent>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
<version>3.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -178,7 +179,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-18</version>
+ <version>1.0-alpha-13</version>
<executions>
<execution>
<id>site-docs</id>
@@ -256,10 +257,11 @@
<module>maven-project</module>
<module>maven-reporting-api</module>
<module>maven-embedder</module>
+ <module>maven-shared-model</module>
<module>maven-toolchain</module>
</modules>
<properties>
- <artifactVersion>3.0-alpha-1</artifactVersion>
+ <artifactVersion>3.0-alpha-2-SNAPSHOT</artifactVersion>
<aspectjVersion>1.5.3</aspectjVersion>
<classWorldsVersion>1.2-alpha-13</classWorldsVersion>
<commonsCliVersion>1.0</commonsCliVersion>
@@ -270,7 +272,7 @@
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.1</plexusInterpolationVersion>
<plexusUtilsVersion>1.5.5</plexusUtilsVersion>
- <wagonVersion>1.0-beta-3</wagonVersion>
+ <wagonVersion>1.0-beta-4</wagonVersion>
<mavenSharedModel>1.0-SNAPSHOT</mavenSharedModel>
<woodstoxVersion>3.2.6</woodstoxVersion>
</properties>