You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:14:23 UTC
[maven-archetype] branch mvn4 created (now 6262296)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git.
at 6262296 mvn4 aggregator
This branch includes the following new commits:
new 6262296 mvn4 aggregator
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-archetype] 01/01: mvn4 aggregator
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit 6262296ce5217e0897b33a47baacd0b518b156fb
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:14:20 2022 +0100
mvn4 aggregator
---
archetype-common/pom.xml | 4 +--
.../generator/DefaultArchetypeGeneratorTest.java | 15 ++++++----
.../apache/maven/archetype/old/ArchetypeTest.java | 35 ++++++++++++----------
.../LocalCatalogArchetypeDataSourceTest.java | 12 +++++---
.../archetype/test/ArchetypeGenerationTest.java | 12 +++++---
.../InternalCatalogArchetypesVerificationTest.java | 12 +++++---
archetype-samples/mojo/pom.xml | 2 +-
.../simple-inheritence/enforcer-rules/pom.xml | 2 +-
pom.xml | 21 ++++++++-----
9 files changed, 70 insertions(+), 45 deletions(-)
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index 012667c..5378012 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -102,9 +102,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-aether-provider</artifactId>
- <version>3.0</version>
- <scope>runtime</scope>
+ <artifactId>maven-resolver-provider</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
index ef99de0..0c6a0e1 100644
--- a/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
@@ -37,11 +37,14 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
public class DefaultArchetypeGeneratorTest
extends AbstractMojoTestCase
@@ -542,7 +545,7 @@ public class DefaultArchetypeGeneratorTest
}
private ArchetypeGenerationRequest createArchetypeGenerationRequest( String project, Archetype archetype )
- {
+ throws NoLocalRepositoryManagerException {
outputDirectory = getBasedir() + "/target/test-classes/projects/" + project;
projectDirectory = new File( outputDirectory, "file-value" );
@@ -564,8 +567,10 @@ public class DefaultArchetypeGeneratorTest
request.setProperties( ADDITIONAL_PROPERTIES );
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepository.getBasedir() ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ LocalRepository localRepo = new LocalRepository( request.getLocalRepository().getBasedir() );
+ repositorySession.setLocalRepositoryManager(
+ new SimpleLocalRepositoryManagerFactory().newInstance( repositorySession, localRepo ) );
buildingRequest.setRepositorySession( repositorySession );
request.setProjectBuildingRequest( buildingRequest );
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
index 55875cb..4141c88 100644
--- a/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
@@ -1,17 +1,5 @@
package org.apache.maven.archetype.old;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
/*
* Copyright 2004-2006 The Apache Software Foundation.
*
@@ -28,6 +16,18 @@ import java.util.Map;
* limitations under the License.
*/
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.exception.InvalidPackaging;
import org.apache.maven.artifact.Artifact;
@@ -42,13 +42,16 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.codehaus.plexus.velocity.VelocityComponent;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -89,8 +92,10 @@ public class ArchetypeTest
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
buildingRequest.setRemoteRepositories( remoteRepositories );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepository.getBasedir() ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ LocalRepository localRepo = new LocalRepository( localRepository.getBasedir() );
+ repositorySession.setLocalRepositoryManager(
+ new SimpleLocalRepositoryManagerFactory().newInstance( repositorySession, localRepo ) );
buildingRequest.setRepositorySession( repositorySession );
ArchetypeGenerationRequest request = new ArchetypeGenerationRequest()
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSourceTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSourceTest.java
index 219ba29..01e1927 100644
--- a/archetype-common/src/test/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSourceTest.java
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/source/LocalCatalogArchetypeDataSourceTest.java
@@ -27,9 +27,11 @@ import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.codehaus.plexus.PlexusTestCase;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
public class LocalCatalogArchetypeDataSourceTest extends PlexusTestCase
{
@@ -65,8 +67,10 @@ public class LocalCatalogArchetypeDataSourceTest extends PlexusTestCase
ArchetypeManager archetype = lookup( ArchetypeManager.class );
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( getTestFile( "target/test-classes/repositories/test-catalog" ) ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ LocalRepository localRepo = new LocalRepository( getTestFile( "target/test-classes/repositories/test-catalog" ) );
+ repositorySession.setLocalRepositoryManager(
+ new SimpleLocalRepositoryManagerFactory().newInstance( repositorySession, localRepo ) );
buildingRequest.setRepositorySession( repositorySession );
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
index e610dfa..a2bbdcb 100644
--- a/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
@@ -28,7 +28,7 @@ import org.apache.maven.artifact.repository.MavenArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
@@ -37,7 +37,9 @@ import java.util.Properties;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.codehaus.plexus.util.FileUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
/** @author Jason van Zyl */
public class ArchetypeGenerationTest
@@ -56,8 +58,10 @@ public class ArchetypeGenerationTest
.toURI().toURL().toExternalForm(), "local-repo" );
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( "target/test-classes/repositories/central" ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ LocalRepository localRepo = new LocalRepository( "target/test-classes/repositories/central" );
+ repositorySession.setLocalRepositoryManager(
+ new SimpleLocalRepositoryManagerFactory().newInstance( repositorySession, localRepo ) );
buildingRequest.setRepositorySession( repositorySession );
ArchetypeCatalog catalog = archetype.getLocalCatalog( buildingRequest );
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
index 4404110..d15174a 100644
--- a/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
+++ b/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerificationTest.java
@@ -32,10 +32,12 @@ import org.apache.maven.artifact.repository.MavenArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
/**
*
@@ -87,8 +89,10 @@ public class InternalCatalogArchetypesVerificationTest
.setLocalRepository( localRepository );
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepository.getBasedir() ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ LocalRepository localRepo = new LocalRepository( request.getLocalRepository().getBasedir() );
+ repositorySession.setLocalRepositoryManager(
+ new SimpleLocalRepositoryManagerFactory().newInstance( repositorySession, localRepo ) );
buildingRequest.setRepositorySession( repositorySession );
request.setProjectBuildingRequest( buildingRequest );
diff --git a/archetype-samples/mojo/pom.xml b/archetype-samples/mojo/pom.xml
index 74fa710..2c7491c 100644
--- a/archetype-samples/mojo/pom.xml
+++ b/archetype-samples/mojo/pom.xml
@@ -42,7 +42,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.1</version>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/maven-archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml b/maven-archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml
index b81511f..cfb6d7a 100644
--- a/maven-archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml
+++ b/maven-archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml
@@ -81,7 +81,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-compat</artifactId>
<version>2.0.7</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 1b3a1bc..4a956b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
<relativePath />
</parent>
@@ -74,9 +74,9 @@
<properties>
<maven.archetype.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-archetype.git</maven.archetype.scm.devConnection>
- <mavenVersion>3.0</mavenVersion>
- <wagonVersion>3.3.3</wagonVersion><!-- provided by Maven core -->
- <javaVersion>7</javaVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <wagonVersion>3.5.2-SNAPSHOT</wagonVersion>
+ <javaVersion>8</javaVersion>
<netbeans.hint.useExternalMaven>true</netbeans.hint.useExternalMaven>
<surefire.version>2.22.2</surefire.version>
<maven.site.path>archetype-archives/archetype-LATEST</maven.site.path>
@@ -150,12 +150,17 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
- <version>3.0.1</version>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-resolver-provider</artifactId>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.13.1</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -220,7 +225,7 @@
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -354,7 +359,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
</dependencies>
</plugin>