(maven-reporting-exec) 01/01: first

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MSHARED-1392
in repository https://gitbox.apache.org/repos/asf/maven-reporting-exec.git

commit 3ae9a32b956c22a29de20b36fe99723942fbd17f
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat May 11 21:36:06 2024 +0200

    first
---
 pom.xml                                            | 32 +++++++++++-----------
 .../exec/TestDefaultMavenReportExecutor.java       |  7 +++--
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 842a70b..25f7e3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>41</version>
+    <version>42</version>
     <relativePath />
   </parent>
 
@@ -57,8 +57,8 @@
 
   <properties>
     <javaVersion>8</javaVersion>
-    <mavenVersion>3.2.5</mavenVersion>
-    <aetherVersion>1.0.0.v20140518</aetherVersion>
+    <mavenVersion>3.6.3</mavenVersion>
+    <resolverVersion>1.4.1</resolverVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <sitePluginVersion>4.0.0-M13</sitePluginVersion>
     <projectInfoReportsPluginVersion>3.5.0</projectInfoReportsPluginVersion>
@@ -132,14 +132,14 @@
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-api</artifactId>
-      <version>${aetherVersion}</version>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
+      <version>${resolverVersion}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-util</artifactId>
-      <version>${aetherVersion}</version>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
+      <version>${resolverVersion}</version>
     </dependency>
 
     <dependency>
@@ -181,21 +181,21 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-aether-provider</artifactId>
+      <artifactId>maven-resolver-provider</artifactId>
       <version>${mavenVersion}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-connector-basic</artifactId>
-      <version>${aetherVersion}</version>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-connector-basic</artifactId>
+      <version>${resolverVersion}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-transport-http</artifactId>
-      <version>${aetherVersion}</version>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-transport-http</artifactId>
+      <version>${resolverVersion}</version>
       <scope>test</scope>
     </dependency>
 
diff --git 
a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
 
b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
index db42def..97f7263 100644
--- 
a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
+++ 
b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
@@ -28,6 +28,7 @@ import org.apache.maven.Maven;
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.cli.MavenCli;
+import org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.DefaultMavenExecutionResult;
 import org.apache.maven.execution.MavenExecutionRequest;
@@ -245,7 +246,7 @@ public class TestDefaultMavenReportExecutor extends 
PlexusTestCase {
             return localArtifactRepository;
         }
         String localRepoPath =
-                System.getProperty("localRepository", 
MavenCli.userMavenConfigurationHome.getPath() + "/repository");
+                System.getProperty("localRepository", 
MavenCli.USER_MAVEN_CONFIGURATION_HOME.getPath() + "/repository");
 
         localArtifactRepository = 
lookup(RepositorySystem.class).createLocalRepository(new File(localRepoPath));
         return localArtifactRepository;
@@ -255,9 +256,9 @@ public class TestDefaultMavenReportExecutor extends 
PlexusTestCase {
 
         SettingsBuildingRequest settingsBuildingRequest = new 
DefaultSettingsBuildingRequest();
 
-        
settingsBuildingRequest.setGlobalSettingsFile(MavenCli.DEFAULT_GLOBAL_SETTINGS_FILE);
+        
settingsBuildingRequest.setGlobalSettingsFile(SettingsXmlConfigurationProcessor.DEFAULT_GLOBAL_SETTINGS_FILE);
 
-        
settingsBuildingRequest.setUserSettingsFile(MavenCli.DEFAULT_USER_SETTINGS_FILE);
+        
settingsBuildingRequest.setUserSettingsFile(SettingsXmlConfigurationProcessor.DEFAULT_USER_SETTINGS_FILE);
 
         
settingsBuildingRequest.getSystemProperties().putAll(System.getProperties());