diff --git a/.jenkins.groovy b/.jenkins.groovy index 7a0a8df9d6..c58f9d9148 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 ac68ccb772..3f198962a2 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 8e464ad54a..7a22840369 100644 --- a/pom.xml +++ b/pom.xml @@ -73,6 +73,8 @@ 2026-02-07T22:56:07Z ${maven.multiModuleProjectDirectory} true + false + ${japicmp-skip} true @@ -466,7 +468,6 @@ org.apache.shiro.subject.SimplePrincipalMap - diff --git a/src/japicmp/postAnalysisScript.groovy b/src/japicmp/postAnalysisScript.groovy deleted file mode 100644 index 608209f3d8..0000000000 --- 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 73cdb90996..7d7bb0666f 100644 --- a/support/guice/pom.xml +++ b/support/guice/pom.xml @@ -33,7 +33,6 @@ guice - true none()