This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/main by this push:
new a0940f436 chore: re-enable API compatibility checks post 3.0 release
(#2814)
a0940f436 is described below
commit a0940f43697d545d2852a850c660eaf743a568f4
Author: Lenny Primak <[email protected]>
AuthorDate: Mon Jun 29 21:12:26 2026 -0500
chore: re-enable API compatibility checks post 3.0 release (#2814)
---
.jenkins.groovy | 2 +-
.mvn/maven.config | 2 +-
pom.xml | 3 ++-
src/japicmp/postAnalysisScript.groovy | 36 -----------------------------------
support/guice/pom.xml | 1 -
5 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/.jenkins.groovy b/.jenkins.groovy
index 7a0a8df9d..c58f9d914 100644
--- a/.jenkins.groovy
+++ b/.jenkins.groovy
@@ -132,7 +132,7 @@ pipeline {
steps {
echo 'Building'
sh './mvnw verify --show-version --errors
--batch-mode --no-transfer-progress \
- -Dmaven.test.failure.ignore=true
-Pskip_jakarta_ee_tests -Djdk.version=17 -Djapicmp.skip=true'
+ -Dmaven.test.failure.ignore=true
-Pskip_jakarta_ee_tests -Djdk.version=17'
}
post {
always {
diff --git a/.mvn/maven.config b/.mvn/maven.config
index ac68ccb77..3f198962a 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -1 +1 @@
--Djapicmp.skip=true
+-Djapicmp-skip=false
diff --git a/pom.xml b/pom.xml
index 8e464ad54..7a2284036 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,8 @@
<project.build.outputTimestamp>2026-02-07T22:56:07Z</project.build.outputTimestamp>
<root.dir>${maven.multiModuleProjectDirectory}</root.dir>
<jacoco.skip>true</jacoco.skip>
+ <japicmp-skip>false</japicmp-skip>
+ <japicmp.skip>${japicmp-skip}</japicmp.skip>
<!-- workaround for gmavenplus plugin until maven 4 is being used -->
<maven.project.sourceRoots.warningsDisabled>true</maven.project.sourceRoots.warningsDisabled>
<!--suppress CheckTagEmptyBody -->
@@ -466,7 +468,6 @@
<excludes>
<exclude>org.apache.shiro.subject.SimplePrincipalMap</exclude>
</excludes>
-<!--
<postAnalysisScript>${root.dir}/src/japicmp/postAnalysisScript.groovy</postAnalysisScript>-->
</parameter>
</configuration>
</plugin>
diff --git a/src/japicmp/postAnalysisScript.groovy
b/src/japicmp/postAnalysisScript.groovy
deleted file mode 100644
index 608209f3d..000000000
--- a/src/japicmp/postAnalysisScript.groovy
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import static japicmp.model.JApiCompatibilityChange.*
-import static japicmp.model.JApiChangeStatus.*
-
-def it = jApiClasses.iterator()
-while (it.hasNext()) {
- def jApiClass = it.next()
- // filter out interfaces changes that are default methods
- if (jApiClass.getChangeStatus() != UNCHANGED) {
- def methodIt = jApiClass.getMethods().iterator()
- while (methodIt.hasNext()) {
- def method = methodIt.next()
- def methodChanges = method.getCompatibilityChanges()
- methodChanges.remove(METHOD_NEW_DEFAULT)
- }
- }
-}
-return jApiClasses
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index 73cdb9099..7d7bb0666 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -33,7 +33,6 @@
<properties>
<module.name>guice</module.name>
- <japicmp.skip>true</japicmp.skip>
<groups>none()</groups>
</properties>
