Merge pull request #357 from cstamas/MNG-7706-drop-unused

Drop unused parameter ${localRepository}.
siom79 · Feb 23, 2023 · e980e0f · e980e0f
2 parents a8db642 + f7bbca0
commit e980e0f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 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
@@ -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<RemoteRepository> remoteRepos;
-	@org.apache.maven.plugins.annotations.Parameter(defaultValue = "${localRepository}")
-	private ArtifactRepository localRepository;
 	@org.apache.maven.plugins.annotations.Parameter(defaultValue = "${project.remoteArtifactRepositories}")
 	private List<ArtifactRepository> 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<Artifact> resolveArtifact(Dependency dependency, MavenParameters mav
 	}
 
 	private Set<Artifact> 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
@@ -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.<File>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
@@ -11,19 +11,17 @@
 
 public class MavenParameters {
 	private final List<ArtifactRepository> artifactRepositories;
-	private final ArtifactRepository localRepository;
 	private final MavenProject mavenProject;
 	private final MojoExecution mojoExecution;
 	private final String versionRangeWithProjectVersion;
 	private final RepositorySystem repoSystem;
 	private final RepositorySystemSession repoSession;
 	private final List<RemoteRepository> remoteRepos;
 
-	public MavenParameters(final List<ArtifactRepository> artifactRepositories, final ArtifactRepository localRepository,
+	public MavenParameters(final List<ArtifactRepository> artifactRepositories,
 						   final MavenProject mavenProject, final MojoExecution mojoExecution, final String versionRangeWithProjectVersion,
 						   final RepositorySystem repoSystem, final RepositorySystemSession repoSession, final List<RemoteRepository> remoteRepos) {
 		this.artifactRepositories = artifactRepositories;
-		this.localRepository = localRepository;
 		this.mavenProject = mavenProject;
 		this.mojoExecution = mojoExecution;
 		this.versionRangeWithProjectVersion = versionRangeWithProjectVersion;
@@ -36,10 +34,6 @@ public List<ArtifactRepository> 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
@@ -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<ArtifactRepository>(), mock(ArtifactRepository.class),
+		return new MavenParameters(new ArrayList<ArtifactRepository>(), 
 			new MavenProject(), mock(MojoExecution.class), "", mock(RepositorySystem.class), mock(
 				RepositorySystemSession.class), Collections.singletonList(remoteRepository));
 	}