Author: bimargulies
Date: Mon Feb 2 21:22:42 2015
New Revision: 1656583
URL: http://svn.apache.org/r1656583
Log:
ARCHETYPE-471: update maven baseline to 2.2.1.
Modified:
maven/archetype/trunk/archetype-common/pom.xml
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
maven/archetype/trunk/archetype-common/src/test/resources/projects/create-3/profiles.xml
maven/archetype/trunk/pom.xml
Modified: maven/archetype/trunk/archetype-common/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=1656583&r1=1656582&r2=1656583&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/pom.xml (original)
+++ maven/archetype/trunk/archetype-common/pom.xml Mon Feb 2 21:22:42 2015
@@ -195,13 +195,6 @@
</goals>
</execution>
<execution>
- <id>site-docs</id>
- <phase>pre-site</phase>
- <goals>
- <goal>xdoc</goal>
- </goals>
- </execution>
- <execution>
<id>site-xsd</id>
<phase>pre-site</phase>
<goals>
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java?rev=1656583&r1=1656582&r2=1656583&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
Mon Feb 2 21:22:42 2015
@@ -66,15 +66,15 @@ public class ArchetypeTest
//
----------------------------------------------------------------------
ArtifactRepositoryLayout layout =
- (ArtifactRepositoryLayout) container.lookup(
ArtifactRepositoryLayout.ROLE, "legacy" );
+ (ArtifactRepositoryLayout) getContainer().lookup(
ArtifactRepositoryLayout.ROLE, "legacy" );
- String mavenRepoLocal = getTestFile( "target/local-repository"
).toURL().toString();
+ String mavenRepoLocal = getTestFile( "target/local-repository"
).toURI().toURL().toString();
ArtifactRepository localRepository = new DefaultArtifactRepository(
"local", mavenRepoLocal, layout );
List<ArtifactRepository> remoteRepositories = new
ArrayList<ArtifactRepository>();
- String mavenRepoRemote = getTestFile( "src/test/repository"
).toURL().toString();
+ String mavenRepoRemote = getTestFile( "src/test/repository"
).toURI().toURL().toString();
ArtifactRepository remoteRepository = new DefaultArtifactRepository(
"remote", mavenRepoRemote, layout );
@@ -214,7 +214,7 @@ public class ArchetypeTest
{
URL[] urls = new URL[1];
- urls[0] = archetypeArtifact.getFile().toURL();
+ urls[0] = archetypeArtifact.getFile().toURI().toURL();
archetypeJarLoader = new URLClassLoader( urls );
}
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java?rev=1656583&r1=1656582&r2=1656583&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/descriptor/ArchetypeXsdTest.java
Mon Feb 2 21:22:42 2015
@@ -41,7 +41,7 @@ public class ArchetypeXsdTest
public void testXsd()
throws Exception
{
- File archetypeXsd = new File( getBasedir(),
"/target/generated-site/xsd/" + ARCHETYPE_XSD );
+ File archetypeXsd = new File( getBasedir(),
"/target/generated-site/resources/xsd/" + ARCHETYPE_XSD );
SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setValidating( true );
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java?rev=1656583&r1=1656582&r2=1656583&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
Mon Feb 2 21:22:42 2015
@@ -50,7 +50,7 @@ public class WikiArchetypeDataSourceTest
assertTrue( wikiSource.exists() );
Properties p = new Properties();
- p.put( "url", wikiSource.toURL().toExternalForm() );
+ p.put( "url", wikiSource.toURI().toURL().toExternalForm() );
ArchetypeDataSource ads = new WikiArchetypeDataSource();
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java?rev=1656583&r1=1656582&r2=1656583&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
Mon Feb 2 21:22:42 2015
@@ -30,8 +30,11 @@ import org.apache.maven.archetype.catalo
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.Model;
+import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.interpolation.ModelInterpolator;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -124,13 +127,15 @@ public class ArchetyperRoundtripTest
+ "archetype" );
File generatedArchetypePom = new File( generatedArchetypeDirectory,
"pom.xml" );
MavenProject generatedArchetypeProject = projectBuilder.build(
generatedArchetypePom, localRepository, null );
+ ModelInterpolator modelInterpolator = (ModelInterpolator)lookup(
ModelInterpolator.ROLE );
+ Model generatedArchetypeModel = modelInterpolator.interpolate(
generatedArchetypeProject.getModel(), generatedArchetypePom.getParentFile(),
new DefaultProjectBuilderConfiguration(), true );
File archetypeDirectory =
new File( generatedArchetypeDirectory, "src" + File.separator +
"main" + File.separator + "resources" );
File archetypeArchive = archetype.archiveArchetype(
archetypeDirectory, new File(
- generatedArchetypeProject.getBuild().getDirectory() ),
-
generatedArchetypeProject.getBuild().getFinalName() );
+ generatedArchetypeModel.getBuild().getDirectory() ),
+
generatedArchetypeModel.getBuild().getFinalName() );
String baseName =
StringUtils.replace( generatedArchetypeProject.getGroupId(), ".",
File.separator ) + File.separator
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java?rev=1656583&r1=1656582&r2=1656583&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
Mon Feb 2 21:22:42 2015
@@ -31,8 +31,11 @@ import org.apache.maven.archetype.catalo
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.Model;
+import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.interpolation.ModelInterpolator;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -139,18 +142,20 @@ public class ArchetyperRoundtripWithProx
+ "archetype" );
File generatedArchetypePom = new File( generatedArchetypeDirectory,
"pom.xml" );
MavenProject generatedArchetypeProject = projectBuilder.build(
generatedArchetypePom, localRepository, null );
+ ModelInterpolator modelInterpolator = (ModelInterpolator)lookup(
ModelInterpolator.ROLE );
+ Model generatedArchetypeModel = modelInterpolator.interpolate(
generatedArchetypeProject.getModel(), generatedArchetypePom.getParentFile(),
new DefaultProjectBuilderConfiguration(), true );
File archetypeDirectory =
new File( generatedArchetypeDirectory, "src" + File.separator +
"main" + File.separator + "resources" );
File archetypeArchive = archetype.archiveArchetype(
archetypeDirectory, new File(
- generatedArchetypeProject.getBuild().getDirectory() ),
-
generatedArchetypeProject.getBuild().getFinalName() );
+ generatedArchetypeModel.getBuild().getDirectory() ),
+
generatedArchetypeModel.getBuild().getFinalName() );
String baseName =
StringUtils.replace( generatedArchetypeProject.getGroupId(), ".",
File.separator ) + File.separator
+ generatedArchetypeProject.getArtifactId() + File.separator +
generatedArchetypeProject.getVersion()
- + File.separator +
generatedArchetypeProject.getBuild().getFinalName();
+ + File.separator +
generatedArchetypeModel.getBuild().getFinalName();
File archetypeInRepository = new File( centralRepository.getBasedir(),
baseName + ".jar" );
File archetypePomInRepository = new File(
centralRepository.getBasedir(), baseName + ".pom" );
archetypeInRepository.getParentFile().mkdirs();
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java?rev=1656583&r1=1656582&r2=1656583&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
Mon Feb 2 21:22:42 2015
@@ -31,8 +31,11 @@ import org.apache.maven.archetype.catalo
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.archetype.common.Constants;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.Model;
+import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.interpolation.ModelInterpolator;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -103,6 +106,8 @@ public class RoundtripMultiModuleTest
MavenProject project = projectBuilder.build( pom, localRepository,
null );
+ ModelInterpolator modelInterpolator = (ModelInterpolator)lookup(
ModelInterpolator.ROLE );
+
ArchetypeCreationRequest acr =
new ArchetypeCreationRequest().setProject( project
).setLocalRepository( localRepository ).setFiltereds(
Constants.DEFAULT_FILTERED_EXTENSIONS ).setLanguages(
Constants.DEFAULT_LANGUAGES ).setPostPhase(
@@ -140,18 +145,19 @@ public class RoundtripMultiModuleTest
+ "archetype" );
File generatedArchetypePom = new File( generatedArchetypeDirectory,
"pom.xml" );
MavenProject generatedArchetypeProject = projectBuilder.build(
generatedArchetypePom, localRepository, null );
+ Model generatedModel = modelInterpolator.interpolate(
generatedArchetypeProject.getModel(), generatedArchetypePom.getParentFile(),
new DefaultProjectBuilderConfiguration(), true );
File archetypeDirectory =
new File( generatedArchetypeDirectory, "src" + File.separator +
"main" + File.separator + "resources" );
- File archetypeArchive = archetype.archiveArchetype(
archetypeDirectory, new File(
- generatedArchetypeProject.getBuild().getDirectory() ),
-
generatedArchetypeProject.getBuild().getFinalName() );
+ File archetypeArchive = archetype.archiveArchetype( archetypeDirectory,
+ new File( generatedModel.getBuild().getDirectory() ),
+ generatedModel.getBuild().getFinalName() );
String baseName =
StringUtils.replace( generatedArchetypeProject.getGroupId(), ".",
File.separator ) + File.separator
+ generatedArchetypeProject.getArtifactId() + File.separator +
generatedArchetypeProject.getVersion()
- + File.separator +
generatedArchetypeProject.getBuild().getFinalName();
+ + File.separator + generatedModel.getBuild().getFinalName();
File archetypeInRepository = new File( centralRepository.getBasedir(),
baseName + ".jar" );
File archetypePomInRepository = new File(
centralRepository.getBasedir(), baseName + ".pom" );
archetypeInRepository.getParentFile().mkdirs();
Modified:
maven/archetype/trunk/archetype-common/src/test/resources/projects/create-3/profiles.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/resources/projects/create-3/profiles.xml?rev=1656583&r1=1656582&r2=1656583&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/test/resources/projects/create-3/profiles.xml
(original)
+++
maven/archetype/trunk/archetype-common/src/test/resources/projects/create-3/profiles.xml
Mon Feb 2 21:22:42 2015
@@ -1,4 +1,4 @@
<!-- org/apache/maven/archetype/test
A String to search for -->
-<profiles>
-</profiles>
\ No newline at end of file
+<profilesXml>
+</profilesXml>
Modified: maven/archetype/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/pom.xml?rev=1656583&r1=1656582&r2=1656583&view=diff
==============================================================================
--- maven/archetype/trunk/pom.xml (original)
+++ maven/archetype/trunk/pom.xml Mon Feb 2 21:22:42 2015
@@ -73,10 +73,10 @@
</distributionManagement>
<properties>
- <mavenVersion>2.0.8</mavenVersion><!-- with 2.0.9 proxy test fails -->
+ <mavenVersion>2.2.1</mavenVersion>
<netbeans.hint.useExternalMaven>true</netbeans.hint.useExternalMaven>
<mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
- <wagonVersion>1.0</wagonVersion>
+ <wagonVersion>2.8</wagonVersion>
<maven.site.path>archetype-archives/archetype-LATEST</maven.site.path>
</properties>
@@ -142,7 +142,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.8</version>
+ <version>3.0.21</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -152,7 +152,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
- <version>1.0-alpha-5</version>
+ <version>1.0-alpha-6</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -234,7 +234,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.7</version><!-- regression in Modello 1.8 causing build
failure -->
+ <version>1.8.3</version><!-- regression in Modello 1.8 causing build
failure -->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
