From cccc81aa1829c6cb6f55896d09318c1385315a2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2026 18:34:30 +0000 Subject: [PATCH 1/6] chore(deps): bump the maven-dependencies group with 8 updates Bumps the maven-dependencies group with 8 updates: | Package | From | To | | --- | --- | --- | | [org.apache:apache](https://github.com/apache/maven-apache-parent) | `39` | `40` | | [org.apache.groovy:groovy-all](https://github.com/apache/groovy) | `5.1.2` | `6.0.0` | | [org.apache.groovy:groovy](https://github.com/apache/groovy) | `5.1.2` | `6.0.0` | | [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) | `1.18.13` | `1.18.14` | | [net.bytebuddy:byte-buddy-agent](https://github.com/raphw/byte-buddy) | `1.18.13` | `1.18.14` | | [org.hibernate.orm:hibernate-core](https://github.com/hibernate/hibernate-orm) | `7.4.7.Final` | `7.4.9.Final` | | org.apache.felix:maven-bundle-plugin | `6.1.2` | `6.2.0` | | [fish.payara.extras:payara-micro](https://github.com/payara/payara) | `7.2026.8` | `7.2026.9` | Updates `org.apache:apache` from 39 to 40 - [Release notes](https://github.com/apache/maven-apache-parent/releases) - [Commits](https://github.com/apache/maven-apache-parent/commits) Updates `org.apache.groovy:groovy-all` from 5.1.2 to 6.0.0 - [Commits](https://github.com/apache/groovy/commits) Updates `org.apache.groovy:groovy` from 5.1.2 to 6.0.0 - [Commits](https://github.com/apache/groovy/commits) Updates `org.apache.groovy:groovy` from 5.1.2 to 6.0.0 - [Commits](https://github.com/apache/groovy/commits) Updates `net.bytebuddy:byte-buddy` from 1.18.13 to 1.18.14 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.18.13...byte-buddy-1.18.14) Updates `net.bytebuddy:byte-buddy-agent` from 1.18.13 to 1.18.14 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.18.13...byte-buddy-1.18.14) Updates `net.bytebuddy:byte-buddy-agent` from 1.18.13 to 1.18.14 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.18.13...byte-buddy-1.18.14) Updates `org.hibernate.orm:hibernate-core` from 7.4.7.Final to 7.4.9.Final - [Release notes](https://github.com/hibernate/hibernate-orm/releases) - [Changelog](https://github.com/hibernate/hibernate-orm/blob/7.4.9/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-orm/compare/7.4.7...7.4.9) Updates `org.apache.felix:maven-bundle-plugin` from 6.1.2 to 6.2.0 Updates `fish.payara.extras:payara-micro` from 7.2026.8 to 7.2026.9 - [Release notes](https://github.com/payara/payara/releases) - [Commits](https://github.com/payara/payara/compare/payara-server-7.2026.8...payara-server-7.2026.9) --- updated-dependencies: - dependency-name: org.apache:apache dependency-version: '40' dependency-type: direct:production update-type: version-update:semver-major dependency-group: maven-dependencies - dependency-name: org.apache.groovy:groovy-all dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: maven-dependencies - dependency-name: org.apache.groovy:groovy dependency-version: 6.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: maven-dependencies - dependency-name: org.apache.groovy:groovy dependency-version: 6.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: maven-dependencies - dependency-name: net.bytebuddy:byte-buddy dependency-version: 1.18.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: maven-dependencies - dependency-name: net.bytebuddy:byte-buddy-agent dependency-version: 1.18.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: maven-dependencies - dependency-name: net.bytebuddy:byte-buddy-agent dependency-version: 1.18.14 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: maven-dependencies - dependency-name: org.hibernate.orm:hibernate-core dependency-version: 7.4.9.Final dependency-type: direct:production update-type: version-update:semver-patch dependency-group: maven-dependencies - dependency-name: org.apache.felix:maven-bundle-plugin dependency-version: 6.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: maven-dependencies - dependency-name: fish.payara.extras:payara-micro dependency-version: 7.2026.9 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: maven-dependencies ... Signed-off-by: dependabot[bot] --- integration-tests/jakarta-ee/pom.xml | 2 +- pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/jakarta-ee/pom.xml b/integration-tests/jakarta-ee/pom.xml index 9a5425865f..0541d7a613 100644 --- a/integration-tests/jakarta-ee/pom.xml +++ b/integration-tests/jakarta-ee/pom.xml @@ -36,7 +36,7 @@ 3.0.1.Final firefox - 7.2026.8 + 7.2026.9 ${skipITs} asadmin ${payara.start.skip} diff --git a/pom.xml b/pom.xml index 9d3774a1fa..79d8fd59a2 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache apache - 39 + 40 org.apache.shiro @@ -125,12 +125,12 @@ 5.7.0 5.23.0 - 1.18.13 + 1.18.14 5.1.0 - 5.1.2 + 6.0.0 6.1.3 3.5.0 - 7.4.7.Final + 7.4.9.Final 1.2.5 1.18.48 @@ -321,7 +321,7 @@ org.apache.felix maven-bundle-plugin - 6.1.2 + 6.2.0 From 2ee54add1bab87a0c98a4bd62c724b2d5f71f783 Mon Sep 17 00:00:00 2001 From: lprimak Date: Tue, 22 Sep 2026 15:26:37 -0500 Subject: [PATCH 2/6] update to new apache parent --- pom.xml | 109 ++++++++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 59 deletions(-) diff --git a/pom.xml b/pom.xml index 79d8fd59a2..6c85be9213 100644 --- a/pom.xml +++ b/pom.xml @@ -341,41 +341,33 @@ apache-rat-plugin - - **/.externalToolBuilders/* - **/infinitest.filters + + **/.externalToolBuilders/* + **/infinitest.filters - velocity.log - CONTRIBUTING.md - AGENTS.md - SECURITY.md - **/README.md - **/*.json - **/spring.factories - **/org.springframework.boot.autoconfigure.AutoConfiguration.imports - **/spring.provides - **/*.iml - **/*.idea/** - **/target/** - **/nb-configuration.xml - **/faces-config.NavData - **/org.mockito.plugins.MockMaker - **/.project - **/.classpath - **/.settings/* - .github/linters/codespell.txt - .mvn/* - .jenkins_maven_args - + velocity.log + CONTRIBUTING.md + AGENTS.md + SECURITY.md + **/README.md + **/*.json + **/spring.factories + **/org.springframework.boot.autoconfigure.AutoConfiguration.imports + **/spring.provides + **/*.iml + **/*.idea/** + **/target/** + **/nb-configuration.xml + **/faces-config.NavData + **/org.mockito.plugins.MockMaker + **/.project + **/.classpath + **/.settings/* + .github/linters/codespell.txt + .mvn/* + .jenkins_maven_args + - - - - org.apache.commons - commons-lang3 - ${commons.lang3.version} - - org.codehaus.mojo @@ -1437,37 +1429,36 @@ org.apache.rat apache-rat-plugin - 0.18 false - - **/.externalToolBuilders/* - **/infinitest.filters + + **/.externalToolBuilders/* + **/infinitest.filters - velocity.log - CONTRIBUTING.md - AGENTS.md - SECURITY.md - **/README.md - **/*.json - **/spring.factories - **/org.springframework.boot.autoconfigure.AutoConfiguration.imports - **/spring.provides - **/*.iml - **/*.idea/** - **/target/** - **/nb-configuration.xml - **/faces-config.NavData - **/.project - **/.classpath - **/.settings/* - .github/linters/codespell.txt - **/org.mockito.plugins.MockMaker - .mvn/* - .jenkins_maven_args - + velocity.log + CONTRIBUTING.md + AGENTS.md + SECURITY.md + **/README.md + **/*.json + **/spring.factories + **/org.springframework.boot.autoconfigure.AutoConfiguration.imports + **/spring.provides + **/*.iml + **/*.idea/** + **/target/** + **/nb-configuration.xml + **/faces-config.NavData + **/.project + **/.classpath + **/.settings/* + .github/linters/codespell.txt + **/org.mockito.plugins.MockMaker + .mvn/* + .jenkins_maven_args + From 4fa1b980d21c536e362ecb84474ed1234ac6dab8 Mon Sep 17 00:00:00 2001 From: lprimak Date: Tue, 22 Sep 2026 16:47:48 -0500 Subject: [PATCH 3/6] chore: remove Apache-release profile, as it's now completely in the parent POM --- pom.xml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/pom.xml b/pom.xml index 6c85be9213..4c4a065d77 100644 --- a/pom.xml +++ b/pom.xml @@ -1654,34 +1654,6 @@ - - apache-release - - - - - net.nicoulaj.maven.plugins - checksum-maven-plugin - 1.11 - - - source-release-checksum - - artifacts - - - - - - SHA-512 - SHA3-512 - - false - - - - - generate-sbom From c522ae571cedbaabfa80f467fadc96b1ca8eaef4 Mon Sep 17 00:00:00 2001 From: lprimak Date: Sat, 26 Sep 2026 12:24:44 -0500 Subject: [PATCH 4/6] chore: aligned java version in POM and Jenkins configuration to Apache parent naming convention --- .jenkins.groovy | 2 +- pom.xml | 24 +++++++++--------------- support/features/pom.xml | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.jenkins.groovy b/.jenkins.groovy index 5de09d4b11..866615b042 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' + -Dmaven.test.failure.ignore=true -Pskip_jakarta_ee_tests -DjavaVersion=17' } post { always { diff --git a/pom.xml b/pom.xml index 4c4a065d77..002ff35d1e 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ 1.8 2.7.4 1.1.1 - 17 + 17 11.0.26 11.0.0 12.1.13 @@ -134,8 +134,6 @@ 1.2.5 1.18.48 - ${jdk.version} - ${root.dir}/src/checkstyle.xml ${root.dir}/src/suppressions.xml @@ -310,7 +308,7 @@ org.apache.shiro.samples.* true - https://docs.oracle.com/en/java/javase/${jdk.version}/docs/api/ + https://docs.oracle.com/en/java/javase/${javaVersion}/docs/api/ https://docs.spring.io/spring-framework/docs/${spring.version}/javadoc-api/ https://docs.spring.io/spring-boot/${spring-boot.version}/api/java/ https://junit.org/junit5/docs/${junit.version}/api/ @@ -380,7 +378,7 @@ gmavenplus-plugin ${gmaven.version} - ${jdk.version} + ${javaVersion} @@ -1533,16 +1531,6 @@ - - fast - - true - true - - - install - - jdk8 @@ -1654,6 +1642,12 @@ + + apache-release + + 25 + + generate-sbom diff --git a/support/features/pom.xml b/support/features/pom.xml index 6f1cf1d450..e2f5b3a6b0 100644 --- a/support/features/pom.xml +++ b/support/features/pom.xml @@ -146,7 +146,7 @@ file:${project.build.directory}/classes/features.xml org.apache.karaf.features:framework - ${jdk.version} + ${javaVersion} framework From c53898e78ec2572204a4fd54cb1f738968c02b3e Mon Sep 17 00:00:00 2001 From: lprimak Date: Sat, 26 Sep 2026 12:50:30 -0500 Subject: [PATCH 5/6] build: bump minimal java build version to 21 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 002ff35d1e..507da09bba 100644 --- a/pom.xml +++ b/pom.xml @@ -105,6 +105,7 @@ 2.7.4 1.1.1 17 + 21 11.0.26 11.0.0 12.1.13 From aa422628e680f78de46145f6d784bbef696bc643 Mon Sep 17 00:00:00 2001 From: lprimak Date: Sat, 26 Sep 2026 13:04:25 -0500 Subject: [PATCH 6/6] chore: align maven enforcer plugin with Apache parent --- pom.xml | 62 +++++++++++++++++++++------------------------------------ 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/pom.xml b/pom.xml index 507da09bba..bd916004b0 100644 --- a/pom.xml +++ b/pom.xml @@ -547,6 +547,29 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-forbidden-dependencies + + enforce + + + true + + + + *:powermock-api-easymock + *:powermock-module-junit4 + + + + + + + maven-checkstyle-plugin @@ -756,45 +779,6 @@ true - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-maven - - enforce - - - - - [3.5.0,4) - - - [11,) - - - - - - enforce-forbidden-dependencies - - enforce - - - true - - - - *:powermock-api-easymock - *:powermock-module-junit4 - - - - - - - com.github.siom79.japicmp japicmp-maven-plugin