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:16:17 UTC
[maven-reporting-exec] 01/01: mvn4 aggregator
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-reporting-exec.git
commit 75838cf1be363983ba01a355a270f5519958e679
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:16:14 2022 +0100
mvn4 aggregator
---
pom.xml | 16 ++++++++--------
.../reporting/exec/TestDefaultMavenReportExecutor.java | 7 ++++---
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0c856bd..d4c0d4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
<relativePath />
</parent>
@@ -56,9 +56,9 @@
</distributionManagement>
<properties>
- <mavenVersion>3.2.5</mavenVersion>
- <aetherVersion>1.0.0.v20140518</aetherVersion>
- <javaVersion>7</javaVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <aetherVersion>1.1.0</aetherVersion>
+ <javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-06-16T19:43:55Z</project.build.outputTimestamp>
</properties>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<!-- Maven -->
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.4</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -168,7 +168,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-aether-provider</artifactId>
+ <artifactId>maven-resolver-provider</artifactId>
<version>${mavenVersion}</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 e5381e7..c9fefec 100644
--- a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
+++ b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
@@ -24,6 +24,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;
@@ -279,7 +280,7 @@ public class TestDefaultMavenReportExecutor
return localArtifactRepository;
}
String localRepoPath =
- System.getProperty( "localRepository", MavenCli.userMavenConfigurationHome.getPath() + "/repository" );
+ System.getProperty( "localRepository", RepositorySystem.userMavenConfigurationHome.getPath() + "/repository" );
localArtifactRepository = lookup( RepositorySystem.class ).createLocalRepository( new File( localRepoPath ) );
return localArtifactRepository;
@@ -291,9 +292,9 @@ public class TestDefaultMavenReportExecutor
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() );