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
The following commit(s) were added to refs/heads/MSHARED-1392 by this push:
new 6af1f07 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3
6af1f07 is described below
commit 6af1f0740cea9d0023ebf9f8dc00bd9c9be20022
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat May 11 21:58:08 2024 +0200
[MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3
This closes #22
---
pom.xml | 10 +++++++
.../exec/TestDefaultMavenReportExecutor.java | 35 ++++++++++++++--------
2 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 25f7e3a..cc43ac8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,21 +77,25 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -179,6 +183,12 @@
<version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-resolver-provider</artifactId>
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 97f7263..f9cff57 100644
---
a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
+++
b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
@@ -19,6 +19,7 @@
package org.apache.maven.reporting.exec;
import java.io.File;
+import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -27,6 +28,9 @@ import org.apache.maven.DefaultMaven;
import org.apache.maven.Maven;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.cli.MavenCli;
import org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
@@ -41,7 +45,6 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
import org.apache.maven.settings.building.SettingsBuilder;
@@ -151,11 +154,11 @@ public class TestDefaultMavenReportExecutor extends
PlexusTestCase {
try {
MavenReportExecutorRequest mavenReportExecutorRequest = new
MavenReportExecutorRequest();
-
mavenReportExecutorRequest.setLocalRepository(getLocalArtifactRepository());
+ mavenReportExecutorRequest.setLocalRepository(getLocalRepo());
mavenReportExecutorRequest.setProject(mavenProject);
- MavenSession mavenSession =
getMavenSession(getLocalArtifactRepository(), mavenProject);
+ MavenSession mavenSession = getMavenSession(getLocalRepo(),
mavenProject);
mavenSession.setCurrentProject(mavenProject);
mavenSession.setProjects(Arrays.asList(mavenProject));
mavenReportExecutorRequest.setMavenSession(mavenSession);
@@ -208,8 +211,8 @@ public class TestDefaultMavenReportExecutor extends
PlexusTestCase {
getContainer().lookup(MavenExecutionRequestPopulator.class).populateDefaults(request);
- request.setLocalRepository(getLocalArtifactRepository());
-
request.setLocalRepositoryPath(getLocalArtifactRepository().getBasedir());
+ request.setLocalRepository(getLocalRepo());
+ request.setLocalRepositoryPath(getLocalRepo().getBasedir());
request.setCacheNotFound(false);
request.setSystemProperties(System.getProperties());
@@ -241,15 +244,23 @@ public class TestDefaultMavenReportExecutor extends
PlexusTestCase {
};
}
- private ArtifactRepository getLocalArtifactRepository() throws Exception {
- if (localArtifactRepository != null) {
- return localArtifactRepository;
- }
+ private ArtifactRepository getLocalRepo() throws Exception {
+ ArtifactRepositoryFactory artifactRepositoryFactory =
lookup(ArtifactRepositoryFactory.class);
+ ArtifactRepositoryLayout defaultArtifactRepositoryLayout =
lookup(ArtifactRepositoryLayout.class, "default");
+ String updatePolicyFlag =
ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
+ String checksumPolicyFlag =
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
+ ArtifactRepositoryPolicy snapshotsPolicy =
+ new ArtifactRepositoryPolicy(true, updatePolicyFlag,
checksumPolicyFlag);
+ ArtifactRepositoryPolicy releasesPolicy =
+ new ArtifactRepositoryPolicy(true, updatePolicyFlag,
checksumPolicyFlag);
String localRepoPath =
System.getProperty("localRepository",
MavenCli.USER_MAVEN_CONFIGURATION_HOME.getPath() + "/repository");
-
- localArtifactRepository =
lookup(RepositorySystem.class).createLocalRepository(new File(localRepoPath));
- return localArtifactRepository;
+ return artifactRepositoryFactory.createArtifactRepository(
+ "local",
+ Paths.get(localRepoPath).toUri().toASCIIString(),
+ defaultArtifactRepositoryLayout,
+ snapshotsPolicy,
+ releasesPolicy);
}
public Settings getSettings() throws ComponentLookupException,
SettingsBuildingException {
