Merge branch 'master' into update-pom

siom79 · Aug 2, 2023 · 007d014 · 007d014
2 parents 4ee62a0 + 68425b0
commit 007d014
Show file tree

Hide file tree

Showing 40 changed files with 55 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ The website is located at [https://siom79.github.io/japicmp](https://siom79.gith
 # japicmp
 japicmp is a tool to compare two versions of a jar archive:
 ``` bash
-java -jar japicmp-0.17.1-jar-with-dependencies.jar -n new-version.jar -o old-version.jar
+java -jar japicmp-0.17.2-jar-with-dependencies.jar -n new-version.jar -o old-version.jar
 ```
 It can also be used as a library:
 ```java
@@ -17,7 +17,7 @@ japicmp is available in the Maven Central Repository:
 <dependency>
 	<groupId>com.github.siom79.japicmp</groupId>
 	<artifactId>japicmp</artifactId>
-	<version>0.17.1</version>
+	<version>0.17.2</version>
 </dependency>
 ```
 A maven plugin allows you to integrate the checks into your build:
@@ -26,7 +26,7 @@ A maven plugin allows you to integrate the checks into your build:
 <plugin>
 	<groupId>com.github.siom79.japicmp</groupId>
 	<artifactId>japicmp-maven-plugin</artifactId>
-	<version>0.17.1</version>
+	<version>0.17.2</version>
 	<configuration>
 		<oldVersion>
 			<dependency>

diff --git a/japicmp-ant-task/pom.xml b/japicmp-ant-task/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-base</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-maven-plugin/pom.xml b/japicmp-maven-plugin/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-base</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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));
 	}

diff --git a/japicmp-testbase/japicmp-test-ant-task/pom.xml b/japicmp-testbase/japicmp-test-ant-task/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-bundle-v1/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-bundle-v1/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>japicmp-testbundle-v1</artifactId>

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-bundle-v2/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-bundle-v2/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>japicmp-testbundle-v2</artifactId>

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-bundle/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-bundle/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-testbase</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-classifier/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-classifier/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-guava/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-guava/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>japicmp-test-maven-plugin-guava</artifactId>
 

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-ignoremissingartifact/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-ignoremissingartifact/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-testbase</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-japicmp/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-japicmp/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>japicmp-test-maven-plugin-japicmp</artifactId>
 

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-packaging/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-packaging/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-testbase</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>war</packaging>

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-pom-module/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-pom-module/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-testbase</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-post-analysis-script-artifact-test/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-post-analysis-script-artifact-test/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-post-analysis-script-artifact/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-post-analysis-script-artifact/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-maven-plugin-userproperty/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin-userproperty/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-maven-plugin/pom.xml b/japicmp-testbase/japicmp-test-maven-plugin/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v1/pom.xml b/japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v1/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-test-service-impl-base</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v2/pom.xml b/japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-impl-v2/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-test-service-impl-base</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-test/pom.xml b/japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-test/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-test-service-impl-base</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v1/pom.xml b/japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v1/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-test-service-impl-base</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v2/pom.xml b/japicmp-testbase/japicmp-test-service-impl-base/japicmp-test-service-v2/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-test-service-impl-base</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-service-impl-base/pom.xml b/japicmp-testbase/japicmp-test-service-impl-base/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-testbase</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test-v1/pom.xml b/japicmp-testbase/japicmp-test-v1/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>japicmp-test-v1</artifactId>

diff --git a/japicmp-testbase/japicmp-test-v2/pom.xml b/japicmp-testbase/japicmp-test-v2/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>japicmp-test-v2</artifactId>

diff --git a/japicmp-testbase/japicmp-test-vx-client/pom.xml b/japicmp-testbase/japicmp-test-vx-client/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-testbase</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test/pom.xml b/japicmp-testbase/japicmp-test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-testbase</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>japicmp-test</artifactId>

diff --git a/japicmp-testbase/japicmp-test2-v1/pom.xml b/japicmp-testbase/japicmp-test2-v1/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-testbase</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/japicmp-test2-v2/pom.xml b/japicmp-testbase/japicmp-test2-v2/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>japicmp-testbase</artifactId>
 		<groupId>com.github.siom79.japicmp</groupId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/japicmp-testbase/pom.xml b/japicmp-testbase/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-base</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>japicmp-testbase</artifactId>

diff --git a/japicmp/pom.xml b/japicmp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.siom79.japicmp</groupId>
 		<artifactId>japicmp-base</artifactId>
-		<version>0.17.2-SNAPSHOT</version>
+		<version>0.17.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>japicmp</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.github.siom79.japicmp</groupId>
 	<artifactId>japicmp-base</artifactId>
-	<version>0.17.2-SNAPSHOT</version>
+	<version>0.17.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>japicmp-base</name>

diff --git a/src/site/markdown/CliTool.md b/src/site/markdown/CliTool.md
@@ -137,13 +137,13 @@ OPTIONS
 When your library implements interfaces or extends classes from other libraries than the JDK and you want to evaluate binary
 compatibility you must specify the classpath for the two different versions:
 
-    java -jar japicmp-0.17.1-jar-with-dependencies.jar -n new-version.jar -o old-version.jar --new-classpath other-library-v2.jar
+    java -jar japicmp-0.17.2-jar-with-dependencies.jar -n new-version.jar -o old-version.jar --new-classpath other-library-v2.jar
         --old-classpath other-library-v1.jar
 
 In case the classpath for both versions did not change, you can add the library using the standard way:
 
-	java -cp japicmp-0.17.1-jar-with-dependencies.jar;otherLibrary.jar japicmp.JApiCmp -n new-version.jar -o old-version.jar
+	java -cp japicmp-0.17.2-jar-with-dependencies.jar;otherLibrary.jar japicmp.JApiCmp -n new-version.jar -o old-version.jar
 
 For reporting purposes you can also provide more than one jar as old or new version(s):
 
-	java -jar japicmp-0.17.1-jar-with-dependencies.jar -o lib1-old.jar;lib2-old.jar -n lib1-new.jar;lib2-new.jar
+	java -jar japicmp-0.17.2-jar-with-dependencies.jar -o lib1-old.jar;lib2-old.jar -n lib1-new.jar;lib2-new.jar