You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/04/17 12:15:18 UTC
[maven-changes-plugin] branch maven-3.2.5 created (now cefc95f)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git
at cefc95f Update to Maven 3.2.5
This branch includes the following new commits:
new cefc95f Update to Maven 3.2.5
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: Update to Maven 3.2.5
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-changes-plugin.git
commit cefc95f79b430ad3d0dc3c37641335f54db40f5d
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Sun Apr 17 14:14:58 2022 +0200
Update to Maven 3.2.5
---
pom.xml | 42 +++++++++++++++-------
.../maven/plugins/jira/JiraUnicodeTestCase.java | 7 ++--
2 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 153dfed..1b5e065 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,11 +75,11 @@ under the License.
<properties>
<javaVersion>7</javaVersion>
- <doxiaVersion>1.9.1</doxiaVersion>
+ <doxiaVersion>1.11.1</doxiaVersion>
<doxiaSitetoolsVersion>1.9.2</doxiaSitetoolsVersion>
- <mavenVersion>3.0.5</mavenVersion>
- <sitePluginVersion>3.3</sitePluginVersion>
- <wagonVersion>2.4</wagonVersion>
+ <mavenVersion>3.2.5</mavenVersion>
+ <sitePluginVersion>3.11.0</sitePluginVersion>
+ <wagonVersion>3.5.1</wagonVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
@@ -120,12 +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</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.3</version>
+ <version>3.1.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
@@ -277,6 +277,12 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId>
<version>${doxiaVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
@@ -353,12 +359,12 @@ under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.2.3</version>
+ <version>4.4.15</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.3</version>
+ <version>4.5.13</version>
</dependency>
<!-- for rss feed generation -->
@@ -384,7 +390,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -394,9 +400,21 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
- <version>1.13.1</version>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-aether-provider</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-connector-basic</artifactId>
+ <version>1.0.0.v20140518</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-transport-wagon</artifactId>
+ <version>1.0.0.v20140518</version>
<scope>test</scope>
</dependency>
<dependency>
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..864a4d2 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,7 @@ public class JiraUnicodeTestCase
MavenProject project = new JiraUnicodeTestProjectStub();
MavenSession session = newMavenSession( project );
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( "target/local-repo" ) );
+ repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, new LocalRepository( "target/local-repo" ) ) );
setVariableValueToObject( mojo, "project", project );
setVariableValueToObject( mojo, "mavenSession", session );
String jiraXml;