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 2cd21f6537e066c70f9d002e972a6312cfb5ad25 Author: Michael Osipov <micha...@apache.org> AuthorDate: Sat May 11 21:36:06 2024 +0200 [MSHARED-1392] Upgrade to Parent 42 and Maven 3.6.3 This closes #22 --- pom.xml | 42 +++++++++++++--------- .../exec/TestDefaultMavenReportExecutor.java | 42 ++++++++++++++-------- 2 files changed, 53 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 842a70b..cc43ac8 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> @@ -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> @@ -132,14 +136,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 +185,27 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-aether-provider</artifactId> + <artifactId>maven-compat</artifactId> + <version>${mavenVersion}</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.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..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,7 +28,11 @@ 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; import org.apache.maven.execution.DefaultMavenExecutionResult; import org.apache.maven.execution.MavenExecutionRequest; @@ -40,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; @@ -150,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); @@ -207,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()); @@ -240,24 +244,32 @@ 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.userMavenConfigurationHome.getPath() + "/repository"); - - localArtifactRepository = lookup(RepositorySystem.class).createLocalRepository(new File(localRepoPath)); - return localArtifactRepository; + System.getProperty("localRepository", MavenCli.USER_MAVEN_CONFIGURATION_HOME.getPath() + "/repository"); + return artifactRepositoryFactory.createArtifactRepository( + "local", + Paths.get(localRepoPath).toUri().toASCIIString(), + defaultArtifactRepositoryLayout, + snapshotsPolicy, + releasesPolicy); } public Settings getSettings() throws ComponentLookupException, SettingsBuildingException { 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());