Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .jenkins.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/jakarta-ee/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<arquillian.graphene.version>3.0.1.Final</arquillian.graphene.version>
<drone.browser>firefox</drone.browser>

<payara.version>7.2026.8</payara.version>
<payara.version>7.2026.9</payara.version>
<payara.start.skip>${skipITs}</payara.start.skip>
<asadmin.cmd>asadmin</asadmin.cmd>
<unix-sed-skip>${payara.start.skip}</unix-sed-skip>
Expand Down
228 changes: 85 additions & 143 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>39</version>
<version>40</version>
</parent>

<groupId>org.apache.shiro</groupId>
Expand Down Expand Up @@ -104,7 +104,8 @@
<commons.text.version>1.8</commons.text.version>
<hsqldb.version>2.7.4</hsqldb.version>
<jcache.api.version>1.1.1</jcache.api.version>
<jdk.version>17</jdk.version>
<javaVersion>17</javaVersion>
<minimalJavaBuildVersion>21</minimalJavaBuildVersion>
<tomcat.version>11.0.26</tomcat.version>
<jakarta.ee.version>11.0.0</jakarta.ee.version>
<jetty.version>12.1.13</jetty.version>
Expand All @@ -125,17 +126,15 @@
<!-- Test 3rd-party dependencies: -->
<easymock.version>5.7.0</easymock.version>
<mockito.version>5.23.0</mockito.version>
<bytebuddy.version>1.18.13</bytebuddy.version>
<bytebuddy.version>1.18.14</bytebuddy.version>
<gmaven.version>5.1.0</gmaven.version>
<groovy.version>5.1.2</groovy.version>
<groovy.version>6.0.0</groovy.version>
<junit.version>6.1.3</junit.version>
<junit.server.jetty.version>3.5.0</junit.server.jetty.version>
<hibernate.version>7.4.7.Final</hibernate.version>
<hibernate.version>7.4.9.Final</hibernate.version>
<taglibs.standard.version>1.2.5</taglibs.standard.version>
<lombok.version>1.18.48</lombok.version>

<maven.compiler.release>${jdk.version}</maven.compiler.release>

<!-- checkstyle -->
<checkstyle.configLocation>${root.dir}/src/checkstyle.xml</checkstyle.configLocation>
<checkstyle.suppressionsLocation>${root.dir}/src/suppressions.xml</checkstyle.suppressionsLocation>
Expand Down Expand Up @@ -310,7 +309,7 @@
<excludePackageNames>org.apache.shiro.samples.*</excludePackageNames>
<linksource>true</linksource>
<links>
<link>https://docs.oracle.com/en/java/javase/${jdk.version}/docs/api/</link>
<link>https://docs.oracle.com/en/java/javase/${javaVersion}/docs/api/</link>
<link>https://docs.spring.io/spring-framework/docs/${spring.version}/javadoc-api/</link>
<link>https://docs.spring.io/spring-boot/${spring-boot.version}/api/java/</link>
<link>https://junit.org/junit5/docs/${junit.version}/api/</link>
Expand All @@ -321,7 +320,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>6.1.2</version>
<version>6.2.0</version>
<dependencies>
<!-- Required to upgrade bnd in the maven-bundle-plugin to be able to handle Multi-Release jars -->
<dependency>
Expand All @@ -341,41 +340,33 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<!-- note that this configuration needs to be maintained both in pluginManagement and reporting sections -->
<excludes>
<exclude>**/.externalToolBuilders/*</exclude>
<exclude>**/infinitest.filters</exclude>
<inputExcludes>
<inputExclude>**/.externalToolBuilders/*</inputExclude>
<inputExclude>**/infinitest.filters</inputExclude>
<!-- Apparently some test in samples/spring-client generates velocity log - would better to reconfigure to output to target/ -->
<exclude>velocity.log</exclude>
<exclude>CONTRIBUTING.md</exclude>
<exclude>AGENTS.md</exclude>
<exclude>SECURITY.md</exclude>
<exclude>**/README.md</exclude>
<exclude>**/*.json</exclude>
<exclude>**/spring.factories</exclude>
<exclude>**/org.springframework.boot.autoconfigure.AutoConfiguration.imports</exclude>
<exclude>**/spring.provides</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/*.idea/**</exclude>
<exclude>**/target/**</exclude>
<exclude>**/nb-configuration.xml</exclude>
<exclude>**/faces-config.NavData</exclude>
<exclude>**/org.mockito.plugins.MockMaker</exclude>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/*</exclude>
<exclude>.github/linters/codespell.txt</exclude>
<exclude>.mvn/*</exclude>
<exclude>.jenkins_maven_args</exclude>
</excludes>
<inputExclude>velocity.log</inputExclude>
<inputExclude>CONTRIBUTING.md</inputExclude>
<inputExclude>AGENTS.md</inputExclude>
<inputExclude>SECURITY.md</inputExclude>
<inputExclude>**/README.md</inputExclude>
<inputExclude>**/*.json</inputExclude>
<inputExclude>**/spring.factories</inputExclude>
<inputExclude>**/org.springframework.boot.autoconfigure.AutoConfiguration.imports</inputExclude>
<inputExclude>**/spring.provides</inputExclude>
<inputExclude>**/*.iml</inputExclude>
<inputExclude>**/*.idea/**</inputExclude>
<inputExclude>**/target/**</inputExclude>
<inputExclude>**/nb-configuration.xml</inputExclude>
<inputExclude>**/faces-config.NavData</inputExclude>
<inputExclude>**/org.mockito.plugins.MockMaker</inputExclude>
<inputExclude>**/.project</inputExclude>
<inputExclude>**/.classpath</inputExclude>
<inputExclude>**/.settings/*</inputExclude>
<inputExclude>.github/linters/codespell.txt</inputExclude>
<inputExclude>.mvn/*</inputExclude>
<inputExclude>.jenkins_maven_args</inputExclude>
</inputExcludes>
</configuration>
<!-- This can be removed when RAT plugin is updated to use commons-lang3 3.20.0 or above -->
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -388,7 +379,7 @@
<artifactId>gmavenplus-plugin</artifactId>
<version>${gmaven.version}</version>
<configuration>
<targetBytecode>${jdk.version}</targetBytecode>
<targetBytecode>${javaVersion}</targetBytecode>
</configuration>
<dependencies>
<dependency>
Expand Down Expand Up @@ -556,6 +547,29 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-forbidden-dependencies</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<fail>true</fail>
<rules>
<bannedDependencies>
<excludes>
<exclude>*:powermock-api-easymock</exclude>
<exclude>*:powermock-module-junit4</exclude>
</excludes>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
Expand Down Expand Up @@ -765,45 +779,6 @@
<deployAtEnd>true</deployAtEnd>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>[3.5.0,4)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[11,)</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
<execution>
<id>enforce-forbidden-dependencies</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<fail>true</fail>
<rules>
<bannedDependencies>
<excludes>
<exclude>*:powermock-api-easymock</exclude>
<exclude>*:powermock-module-junit4</exclude>
</excludes>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
Expand Down Expand Up @@ -1437,37 +1412,36 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.18</version>
<!-- only run at the root -->
<inherited>false</inherited>
<configuration>
<!-- note that this configuration needs to be maintained both in pluginManagement and reporting sections -->
<excludes>
<exclude>**/.externalToolBuilders/*</exclude>
<exclude>**/infinitest.filters</exclude>
<inputExcludes>
<inputExclude>**/.externalToolBuilders/*</inputExclude>
<inputExclude>**/infinitest.filters</inputExclude>
<!-- Apparently some test in samples/spring-client generates velocity log - would better to reconfigure to output to target/ -->
<exclude>velocity.log</exclude>
<exclude>CONTRIBUTING.md</exclude>
<exclude>AGENTS.md</exclude>
<exclude>SECURITY.md</exclude>
<exclude>**/README.md</exclude>
<exclude>**/*.json</exclude>
<exclude>**/spring.factories</exclude>
<exclude>**/org.springframework.boot.autoconfigure.AutoConfiguration.imports</exclude>
<exclude>**/spring.provides</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/*.idea/**</exclude>
<exclude>**/target/**</exclude>
<exclude>**/nb-configuration.xml</exclude>
<exclude>**/faces-config.NavData</exclude>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/*</exclude>
<exclude>.github/linters/codespell.txt</exclude>
<exclude>**/org.mockito.plugins.MockMaker</exclude>
<exclude>.mvn/*</exclude>
<exclude>.jenkins_maven_args</exclude>
</excludes>
<inputExclude>velocity.log</inputExclude>
<inputExclude>CONTRIBUTING.md</inputExclude>
<inputExclude>AGENTS.md</inputExclude>
<inputExclude>SECURITY.md</inputExclude>
<inputExclude>**/README.md</inputExclude>
<inputExclude>**/*.json</inputExclude>
<inputExclude>**/spring.factories</inputExclude>
<inputExclude>**/org.springframework.boot.autoconfigure.AutoConfiguration.imports</inputExclude>
<inputExclude>**/spring.provides</inputExclude>
<inputExclude>**/*.iml</inputExclude>
<inputExclude>**/*.idea/**</inputExclude>
<inputExclude>**/target/**</inputExclude>
<inputExclude>**/nb-configuration.xml</inputExclude>
<inputExclude>**/faces-config.NavData</inputExclude>
<inputExclude>**/.project</inputExclude>
<inputExclude>**/.classpath</inputExclude>
<inputExclude>**/.settings/*</inputExclude>
<inputExclude>.github/linters/codespell.txt</inputExclude>
<inputExclude>**/org.mockito.plugins.MockMaker</inputExclude>
<inputExclude>.mvn/*</inputExclude>
<inputExclude>.jenkins_maven_args</inputExclude>
</inputExcludes>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -1542,16 +1516,6 @@
</reporting>

<profiles>
<profile>
<id>fast</id>
<properties>
<maven.test.skip.exec>true</maven.test.skip.exec>
<maven.test.skip>true</maven.test.skip>
</properties>
<build>
<defaultGoal>install</defaultGoal>
</build>
</profile>
<profile>
<id>jdk8</id>
<activation>
Expand Down Expand Up @@ -1665,31 +1629,9 @@
</profile>
<profile>
<id>apache-release</id>
<build>
<plugins>
<!-- calculate checksums of source release for Apache dist area -->
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.11</version>
<executions>
<execution>
<id>source-release-checksum</id>
<goals>
<goal>artifacts</goal>
</goals>
</execution>
</executions>
<configuration>
<algorithms>
<algorithm>SHA-512</algorithm>
<algorithm>SHA3-512</algorithm>
</algorithms>
<csvSummary>false</csvSummary>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<minimalJavaBuildVersion>25</minimalJavaBuildVersion>
</properties>
</profile>
<profile>
<id>generate-sbom</id>
Expand Down
2 changes: 1 addition & 1 deletion support/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
</descriptors>
<distribution>org.apache.karaf.features:framework</distribution>
<javase>${jdk.version}</javase>
<javase>${javaVersion}</javase>
<framework>
<feature>framework</feature>
</framework>
Expand Down
Loading