You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2021/07/18 21:01:13 UTC
[wicket] 05/05: WICKET-6903 Replace maven-clirr-plugin with
something newer
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit edd4fa002e9ee0027a0835562d61d42c53321cb5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Jul 16 15:25:44 2021 +0300
WICKET-6903 Replace maven-clirr-plugin with something newer
Replace Clirr with Japicmp
(cherry picked from commit d0b8d6934a943637d6b2c3cfc97bdd9b782f1f62)
---
archetypes/quickstart/pom.xml | 5 ++
pom.xml | 100 +++++++++++++--------
testing/wicket-common-tests/pom.xml | 2 +-
testing/wicket-js-tests/pom.xml | 2 +-
testing/wicket-threadtest/pom.xml | 2 +-
wicket-examples/pom.xml | 1 +
wicket-experimental/pom.xml | 2 +-
.../request/flow/RedirectToUrlException.java | 1 -
wicket-user-guide/pom.xml | 2 +-
9 files changed, 72 insertions(+), 45 deletions(-)
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index a8d54e5..2b41582 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -26,6 +26,11 @@
<artifactId>wicket-archetype-quickstart</artifactId>
<packaging>maven-archetype</packaging>
<name>Wicket Quickstart Archetype</name>
+
+ <properties>
+ <japicmp.skip>true</japicmp.skip>
+ </properties>
+
<build>
<resources>
<resource>
diff --git a/pom.xml b/pom.xml
index 120f597..9a7e8b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,6 +158,7 @@
<jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>
<jakarta.websocket-api.version>2.0.0</jakarta.websocket-api.version>
<jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version>
+ <japicmp.skip>true</japicmp.skip> <!-- TODO Wicket 10 Remove this once 10.0.0 is released -->
<jdk-serializable-functional.version>1.9.0</jdk-serializable-functional.version>
<jetty.version>11.0.6</jetty.version>
<junit.version>5.8.0-M1</junit.version>
@@ -177,7 +178,7 @@
<velocity-engine-core.version>2.3</velocity-engine-core.version>
<!-- Maven plugins -->
- <clirr-maven-plugin.version>2.8</clirr-maven-plugin.version>
+ <japicmp-maven-plugin.version>0.15.3</japicmp-maven-plugin.version>
<maven-archetype-plugin.version>3.2.0</maven-archetype-plugin.version>
<maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -758,8 +759,8 @@
<inherited>true</inherited>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -804,6 +805,60 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <version>${japicmp-maven-plugin.version}</version>
+ <configuration>
+ <oldVersion>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>10.0.0</version>
+ <type>jar</type>
+ </dependency>
+ </oldVersion>
+ <newVersion>
+ <file>
+ <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+ </file>
+ </newVersion>
+ <parameter>
+ <skipXmlReport>true</skipXmlReport>
+ <skipHtmlReport>true</skipHtmlReport>
+ <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+ <breakBuildOnSourceIncompatibleModifications>true</breakBuildOnSourceIncompatibleModifications>
+ <onlyBinaryIncompatible>true</onlyBinaryIncompatible>
+ <ignoreMissingClasses>true</ignoreMissingClasses>
+ <excludes>
+ <exclude>
+ <!-- [ERROR] Failed to execute goal com.github.siom79.japicmp:japicmp-maven-plugin:0.15.3:cmp (default) on project wicket-core: There is at least one incompatibility: org.apache.wicket.markup.html.form.EnumChoiceRenderer:METHOD_REMOVED_IN_SUPERCLASS -->
+ org.apache.wicket.markup.html.form.EnumChoiceRenderer
+ </exclude>
+ </excludes>
+ <overrideCompatibilityChangeParameters>
+ <overrideCompatibilityChangeParameter>
+ <compatibilityChange>METHOD_ABSTRACT_NOW_DEFAULT</compatibilityChange>
+ <binaryCompatible>true</binaryCompatible>
+ <sourceCompatible>true</sourceCompatible>
+ </overrideCompatibilityChangeParameter>
+ <overrideCompatibilityChangeParameter>
+ <compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
+ <binaryCompatible>true</binaryCompatible>
+ <sourceCompatible>true</sourceCompatible>
+ </overrideCompatibilityChangeParameter>
+ </overrideCompatibilityChangeParameters>
+ </parameter>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>cmp</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>de.thetaphi</groupId>
<artifactId>forbiddenapis</artifactId>
<version>${forbiddenapis.version}</version>
@@ -1122,39 +1177,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>${clirr-maven-plugin.version}</version>
- <configuration>
- <comparisonVersion>10.0.0</comparisonVersion>
- <failOnError>false</failOnError>
- <logResults>true</logResults>
- <skip>true</skip> <!-- FIXME Wicket 10 -->
- <ignored>
- <!-- TODO remove in 10.x - clirr does not support default methods -->
- <difference>
- <differenceType>7012</differenceType>
- <className>org/apache/wicket/page/IPageManager</className>
- <method>void end()</method>
- </difference>
- <difference>
- <differenceType>7012</differenceType>
- <className>org/apache/wicket/pageStore/IPageStore</className>
- <method>void end(org.apache.wicket.pageStore.IPageContext)</method>
- </difference>
- </ignored>
- </configuration>
- <executions>
- <execution>
- <id>clirr-check</id>
- <phase>compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
@@ -1186,9 +1208,9 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <versionRange>[2.6.1,)</versionRange>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <versionRange>[0.15.3,)</versionRange>
<goals>
<goal>check</goal>
</goals>
diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml
index 7814ad1..d8bcefd 100644
--- a/testing/wicket-common-tests/pom.xml
+++ b/testing/wicket-common-tests/pom.xml
@@ -29,7 +29,7 @@
<description>Tests for all Wicket modules</description>
<properties>
- <clirr.skip>true</clirr.skip>
+ <japicmp.skip>true</japicmp.skip>
</properties>
<dependencies>
diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml
index 198256b..c362551 100644
--- a/testing/wicket-js-tests/pom.xml
+++ b/testing/wicket-js-tests/pom.xml
@@ -29,7 +29,7 @@
<description>JavaScript tests for all Wicket modules</description>
<properties>
- <clirr.skip>true</clirr.skip>
+ <japicmp.skip>true</japicmp.skip>
</properties>
<dependencies>
diff --git a/testing/wicket-threadtest/pom.xml b/testing/wicket-threadtest/pom.xml
index 66dcc2e..d8cb009 100644
--- a/testing/wicket-threadtest/pom.xml
+++ b/testing/wicket-threadtest/pom.xml
@@ -30,7 +30,7 @@
<properties>
<automatic-module-name>org.apache.wicket.thread.tests</automatic-module-name>
- <clirr.skip>true</clirr.skip>
+ <japicmp.skip>true</japicmp.skip>
</properties>
<dependencies>
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index 6745e70..8baaf84 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -33,6 +33,7 @@
<properties>
<dockerfile-maven-plugin.version>1.4.13</dockerfile-maven-plugin.version>
+ <japicmp.skip>true</japicmp.skip>
</properties>
<dependencyManagement>
diff --git a/wicket-experimental/pom.xml b/wicket-experimental/pom.xml
index b511652..f1b59d3 100644
--- a/wicket-experimental/pom.xml
+++ b/wicket-experimental/pom.xml
@@ -33,6 +33,6 @@
</modules>
<properties>
- <clirr.skip>true</clirr.skip>
+ <japicmp.skip>true</japicmp.skip>
</properties>
</project>
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/flow/RedirectToUrlException.java b/wicket-request/src/main/java/org/apache/wicket/request/flow/RedirectToUrlException.java
index 71d4149..655087d 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/flow/RedirectToUrlException.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/flow/RedirectToUrlException.java
@@ -57,7 +57,6 @@ public class RedirectToUrlException extends ReplaceHandlerException
super(new RedirectRequestHandler(redirectUrl, statusCode), true);
}
-
/**
* Construct.
*
diff --git a/wicket-user-guide/pom.xml b/wicket-user-guide/pom.xml
index a6ea1dd..a429eb9 100644
--- a/wicket-user-guide/pom.xml
+++ b/wicket-user-guide/pom.xml
@@ -33,7 +33,7 @@
<properties>
<automatic-module-name>org.apache.wicket.userguide</automatic-module-name>
<asciidoctor.version>1.5.5</asciidoctor.version>
- <clirr.skip>true</clirr.skip>
+ <japicmp.skip>true</japicmp.skip>
<!-- because of windows we need this particular version -->
<jruby.version>1.7.21</jruby.version>
</properties>