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:13:48 UTC
[maven-changes-plugin] branch mvn4 created (now a3e43d5)
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-changes-plugin.git.
at a3e43d5 mvn4 aggregator
This branch includes the following new commits:
new a3e43d5 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-changes-plugin] 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-changes-plugin.git
commit a3e43d5dd6b6ae025fa9ab7d351778efaef98206
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:13:45 2022 +0100
mvn4 aggregator
---
pom.xml | 36 +++++++++++++---------
.../maven/plugins/jira/JiraUnicodeTestCase.java | 9 ++++--
2 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 153dfed..645735e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,12 +74,12 @@ under the License.
</distributionManagement>
<properties>
- <javaVersion>7</javaVersion>
- <doxiaVersion>1.9.1</doxiaVersion>
- <doxiaSitetoolsVersion>1.9.2</doxiaSitetoolsVersion>
- <mavenVersion>3.0.5</mavenVersion>
+ <javaVersion>8</javaVersion>
+ <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
<sitePluginVersion>3.3</sitePluginVersion>
- <wagonVersion>2.4</wagonVersion>
+ <wagonVersion>3.5.2-SNAPSHOT</wagonVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
@@ -120,18 +120,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.3</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </exclusion>
- </exclusions>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -141,7 +135,7 @@ under the License.
<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>
@@ -384,7 +378,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -405,6 +399,18 @@ under the License.
<version>${wagonVersion}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-resolver-provider</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-connector-basic</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java b/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java
index 76d5be6..9add6b9 100644
--- a/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/jira/JiraUnicodeTestCase.java
@@ -25,10 +25,11 @@ import java.io.InputStream;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.maven.project.MavenProject;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -56,7 +57,9 @@ public class JiraUnicodeTestCase
MavenProject project = new JiraUnicodeTestProjectStub();
MavenSession session = newMavenSession( project );
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( "target/local-repo" ) );
+ LocalRepository localRepo = new LocalRepository( "target/local-repo" );
+ repoSession.setLocalRepositoryManager(
+ new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, localRepo ) );
setVariableValueToObject( mojo, "project", project );
setVariableValueToObject( mojo, "mavenSession", session );
String jiraXml;