Skip to content

Commit f7bbca0

Browse files
committed
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
1 parent 4d8bb2f commit f7bbca0

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ public class JApiCmpMojo extends AbstractMojo {
9090
private RepositorySystemSession repoSession;
9191
@org.apache.maven.plugins.annotations.Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true)
9292
private List<RemoteRepository> remoteRepos;
93-
@org.apache.maven.plugins.annotations.Parameter(defaultValue = "${localRepository}")
94-
private ArtifactRepository localRepository;
9593
@org.apache.maven.plugins.annotations.Parameter(defaultValue = "${project.remoteArtifactRepositories}")
9694
private List<ArtifactRepository> artifactRepositories;
9795
@org.apache.maven.plugins.annotations.Parameter(defaultValue = "${project}")
@@ -103,7 +101,7 @@ public class JApiCmpMojo extends AbstractMojo {
103101
private Options options;
104102

105103
public void execute() throws MojoExecutionException, MojoFailureException {
106-
MavenParameters mavenParameters = new MavenParameters(this.artifactRepositories, this.localRepository,
104+
MavenParameters mavenParameters = new MavenParameters(this.artifactRepositories,
107105
this.mavenProject, this.mojoExecution, this.versionRangeWithProjectVersion, this.repoSystem, this.repoSession,
108106
this.remoteRepos);
109107
PluginParameters pluginParameters = new PluginParameters(this.skip, this.newVersion, this.oldVersion, this.parameter, this.dependencies, Optional.of(
@@ -903,7 +901,6 @@ private Set<Artifact> resolveArtifact(Dependency dependency, MavenParameters mav
903901
}
904902

905903
private Set<Artifact> resolveArtifact(Artifact artifact, MavenParameters mavenParameters, PluginParameters pluginParameters, ConfigurationVersion configurationVersion) throws MojoFailureException {
906-
notNull(mavenParameters.getLocalRepository(), "Maven parameter localRepository should be provided by maven container.");
907904
notNull(mavenParameters.getRepoSystem(), "Maven parameter repoSystem should be provided by maven container.");
908905
notNull(mavenParameters.getRepoSession(), "Maven parameter repoSession should be provided by maven container.");
909906
ArtifactRequest request = new ArtifactRequest();

japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpReport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private JApiCmpMojo getMojo() {
102102
return this.mojo;
103103
}
104104
this.mojo = new JApiCmpMojo();
105-
this.mavenParameters = new MavenParameters(this.artifactRepositories, this.localRepository,
105+
this.mavenParameters = new MavenParameters(this.artifactRepositories,
106106
this.mavenProject, this.mojoExecution, this.versionRangeWithProjectVersion, this.repoSystem, this.repoSession,
107107
this.remoteRepos);
108108
this.pluginParameters = new PluginParameters(this.skip, this.newVersion, this.oldVersion, this.parameter, this.dependencies, Optional.<File>absent(), Optional.of(

japicmp-maven-plugin/src/main/java/japicmp/maven/MavenParameters.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,17 @@
1111

1212
public class MavenParameters {
1313
private final List<ArtifactRepository> artifactRepositories;
14-
private final ArtifactRepository localRepository;
1514
private final MavenProject mavenProject;
1615
private final MojoExecution mojoExecution;
1716
private final String versionRangeWithProjectVersion;
1817
private final RepositorySystem repoSystem;
1918
private final RepositorySystemSession repoSession;
2019
private final List<RemoteRepository> remoteRepos;
2120

22-
public MavenParameters(final List<ArtifactRepository> artifactRepositories, final ArtifactRepository localRepository,
21+
public MavenParameters(final List<ArtifactRepository> artifactRepositories,
2322
final MavenProject mavenProject, final MojoExecution mojoExecution, final String versionRangeWithProjectVersion,
2423
final RepositorySystem repoSystem, final RepositorySystemSession repoSession, final List<RemoteRepository> remoteRepos) {
2524
this.artifactRepositories = artifactRepositories;
26-
this.localRepository = localRepository;
2725
this.mavenProject = mavenProject;
2826
this.mojoExecution = mojoExecution;
2927
this.versionRangeWithProjectVersion = versionRangeWithProjectVersion;
@@ -36,10 +34,6 @@ public List<ArtifactRepository> getArtifactRepositories() {
3634
return artifactRepositories;
3735
}
3836

39-
public ArtifactRepository getLocalRepository() {
40-
return localRepository;
41-
}
42-
4337
public MavenProject getMavenProject() {
4438
return mavenProject;
4539
}

japicmp-maven-plugin/src/test/java/japicmp/maven/SkipModuleStrategyTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void testMavenProjectNameIsNotAvailable() {
9191

9292
private MavenParameters createMavenParameters() {
9393
RemoteRepository remoteRepository = new RemoteRepository.Builder("id", "type", "http://example.org").build();
94-
return new MavenParameters(new ArrayList<ArtifactRepository>(), mock(ArtifactRepository.class),
94+
return new MavenParameters(new ArrayList<ArtifactRepository>(),
9595
new MavenProject(), mock(MojoExecution.class), "", mock(RepositorySystem.class), mock(
9696
RepositorySystemSession.class), Collections.singletonList(remoteRepository));
9797
}

0 commit comments

Comments
 (0)