From f7bbca0b340d3091c6c4368a4e15b388b725c06d Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 23 Feb 2023 16:07:01 +0100 Subject: [PATCH] Drop unused parameter ${localRepository}. Not only it is unused, but starting with Maven 3.9.1 it will cause a WARNING, making plugin look bad. For details, see here: https://issues.apache.org/jira/browse/MNG-7706 --- .../src/main/java/japicmp/maven/JApiCmpMojo.java | 5 +---- .../src/main/java/japicmp/maven/JApiCmpReport.java | 2 +- .../src/main/java/japicmp/maven/MavenParameters.java | 8 +------- .../test/java/japicmp/maven/SkipModuleStrategyTest.java | 2 +- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java b/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java index e1a5f2425..a1d9a82c7 100644 --- a/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java +++ b/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java @@ -90,8 +90,6 @@ public class JApiCmpMojo extends AbstractMojo { private RepositorySystemSession repoSession; @org.apache.maven.plugins.annotations.Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true) private List remoteRepos; - @org.apache.maven.plugins.annotations.Parameter(defaultValue = "${localRepository}") - private ArtifactRepository localRepository; @org.apache.maven.plugins.annotations.Parameter(defaultValue = "${project.remoteArtifactRepositories}") private List artifactRepositories; @org.apache.maven.plugins.annotations.Parameter(defaultValue = "${project}") @@ -103,7 +101,7 @@ public class JApiCmpMojo extends AbstractMojo { private Options options; public void execute() throws MojoExecutionException, MojoFailureException { - MavenParameters mavenParameters = new MavenParameters(this.artifactRepositories, this.localRepository, + MavenParameters mavenParameters = new MavenParameters(this.artifactRepositories, this.mavenProject, this.mojoExecution, this.versionRangeWithProjectVersion, this.repoSystem, this.repoSession, this.remoteRepos); PluginParameters pluginParameters = new PluginParameters(this.skip, this.newVersion, this.oldVersion, this.parameter, this.dependencies, Optional.of( @@ -903,7 +901,6 @@ private Set resolveArtifact(Dependency dependency, MavenParameters mav } private Set resolveArtifact(Artifact artifact, MavenParameters mavenParameters, PluginParameters pluginParameters, ConfigurationVersion configurationVersion) throws MojoFailureException { - notNull(mavenParameters.getLocalRepository(), "Maven parameter localRepository should be provided by maven container."); notNull(mavenParameters.getRepoSystem(), "Maven parameter repoSystem should be provided by maven container."); notNull(mavenParameters.getRepoSession(), "Maven parameter repoSession should be provided by maven container."); ArtifactRequest request = new ArtifactRequest(); diff --git a/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpReport.java b/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpReport.java index 139514577..34699216b 100644 --- a/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpReport.java +++ b/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpReport.java @@ -102,7 +102,7 @@ private JApiCmpMojo getMojo() { return this.mojo; } this.mojo = new JApiCmpMojo(); - this.mavenParameters = new MavenParameters(this.artifactRepositories, this.localRepository, + this.mavenParameters = new MavenParameters(this.artifactRepositories, this.mavenProject, this.mojoExecution, this.versionRangeWithProjectVersion, this.repoSystem, this.repoSession, this.remoteRepos); this.pluginParameters = new PluginParameters(this.skip, this.newVersion, this.oldVersion, this.parameter, this.dependencies, Optional.absent(), Optional.of( diff --git a/japicmp-maven-plugin/src/main/java/japicmp/maven/MavenParameters.java b/japicmp-maven-plugin/src/main/java/japicmp/maven/MavenParameters.java index 71818106c..b1963e2aa 100644 --- a/japicmp-maven-plugin/src/main/java/japicmp/maven/MavenParameters.java +++ b/japicmp-maven-plugin/src/main/java/japicmp/maven/MavenParameters.java @@ -11,7 +11,6 @@ public class MavenParameters { private final List artifactRepositories; - private final ArtifactRepository localRepository; private final MavenProject mavenProject; private final MojoExecution mojoExecution; private final String versionRangeWithProjectVersion; @@ -19,11 +18,10 @@ public class MavenParameters { private final RepositorySystemSession repoSession; private final List remoteRepos; - public MavenParameters(final List artifactRepositories, final ArtifactRepository localRepository, + public MavenParameters(final List artifactRepositories, final MavenProject mavenProject, final MojoExecution mojoExecution, final String versionRangeWithProjectVersion, final RepositorySystem repoSystem, final RepositorySystemSession repoSession, final List remoteRepos) { this.artifactRepositories = artifactRepositories; - this.localRepository = localRepository; this.mavenProject = mavenProject; this.mojoExecution = mojoExecution; this.versionRangeWithProjectVersion = versionRangeWithProjectVersion; @@ -36,10 +34,6 @@ public List getArtifactRepositories() { return artifactRepositories; } - public ArtifactRepository getLocalRepository() { - return localRepository; - } - public MavenProject getMavenProject() { return mavenProject; } diff --git a/japicmp-maven-plugin/src/test/java/japicmp/maven/SkipModuleStrategyTest.java b/japicmp-maven-plugin/src/test/java/japicmp/maven/SkipModuleStrategyTest.java index 3ce88997f..bfaaf497b 100644 --- a/japicmp-maven-plugin/src/test/java/japicmp/maven/SkipModuleStrategyTest.java +++ b/japicmp-maven-plugin/src/test/java/japicmp/maven/SkipModuleStrategyTest.java @@ -91,7 +91,7 @@ public void testMavenProjectNameIsNotAvailable() { private MavenParameters createMavenParameters() { RemoteRepository remoteRepository = new RemoteRepository.Builder("id", "type", "http://example.org").build(); - return new MavenParameters(new ArrayList(), mock(ArtifactRepository.class), + return new MavenParameters(new ArrayList(), new MavenProject(), mock(MojoExecution.class), "", mock(RepositorySystem.class), mock( RepositorySystemSession.class), Collections.singletonList(remoteRepository)); }