This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/3.x by this push:
new cd1fd7aef chore: clean up POM and disable EE tests with JDK < 21
cd1fd7aef is described below
commit cd1fd7aefffa85f8fb68dd23fe260337cee268b2
Author: lprimak <[email protected]>
AuthorDate: Tue Jan 27 20:29:36 2026 -0600
chore: clean up POM and disable EE tests with JDK < 21
---
.github/workflows/maven.yml | 2 +-
core/pom.xml | 1 -
integration-tests/jakarta-ee/pom.xml | 6 ------
integration-tests/jaxrs/app/pom.xml | 1 -
integration-tests/support/pom.xml | 1 -
pom.xml | 26 +++++++-------------------
samples/guice/pom.xml | 1 -
samples/servlet-plugin/pom.xml | 1 -
samples/spring-hibernate/pom.xml | 1 -
samples/spring-mvc/pom.xml | 1 -
samples/web/pom.xml | 1 -
support/guice/pom.xml | 1 -
support/jaxrs/pom.xml | 1 -
support/spring/pom.xml | 1 -
web/pom.xml | 1 -
15 files changed, 8 insertions(+), 38 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 57109b3a5..f2a11c6d2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -95,7 +95,7 @@ jobs:
-Dgh_user=${{ github.actor }} -Dgh_token=${{ secrets.GITHUB_TOKEN }}
- name: Build with Maven (non-Linux)
- if: matrix.os != 'ubuntu-latest'
+ if: matrix.os != 'ubuntu-latest' || matrix.jdk < 21
run: >-
./mvnw verify --show-version --errors --batch-mode
--no-transfer-progress
-Pskip_jakarta_ee_tests
diff --git a/core/pom.xml b/core/pom.xml
index faa195336..3978a149f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -151,7 +151,6 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotations.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/integration-tests/jakarta-ee/pom.xml
b/integration-tests/jakarta-ee/pom.xml
index 1497bed26..da51de75e 100644
--- a/integration-tests/jakarta-ee/pom.xml
+++ b/integration-tests/jakarta-ee/pom.xml
@@ -33,13 +33,7 @@
</parent>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <!-- override older compiler source / target flags set by Apache
parent POM -->
-
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
-
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
- <arquillian.core.version>1.10.0.Final</arquillian.core.version>
<arquillian.graphene.version>3.0.0-alpha.4</arquillian.graphene.version>
- <shrinkwrap.resolver.version>3.3.4</shrinkwrap.resolver.version>
<drone.browser>firefox</drone.browser>
<payara.version>7.2026.1</payara.version>
diff --git a/integration-tests/jaxrs/app/pom.xml
b/integration-tests/jaxrs/app/pom.xml
index 62a882ef1..cce90751b 100644
--- a/integration-tests/jaxrs/app/pom.xml
+++ b/integration-tests/jaxrs/app/pom.xml
@@ -74,7 +74,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/integration-tests/support/pom.xml
b/integration-tests/support/pom.xml
index 5189d7857..029eeac4d 100644
--- a/integration-tests/support/pom.xml
+++ b/integration-tests/support/pom.xml
@@ -47,7 +47,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 9441b05a4..241f85065 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,6 @@
<!-- Don't change this version without also changing the
shiro-hazelcast and shiro-features OSGi metadata: -->
<hazelcast.version>5.6.0</hazelcast.version>
<hsqldb.version>2.7.4</hsqldb.version>
- <jakarta.annotation.api.version>3.0.0</jakarta.annotation.api.version>
<jcache.api.version>1.1.1</jcache.api.version>
<jdk.version>17</jdk.version>
<jetty.version>12.1.5</jetty.version>
@@ -130,7 +129,6 @@
<junit.server.jetty.version>3.4.0</junit.server.jetty.version>
<hibernate.version>7.2.1.Final</hibernate.version>
<taglibs.standard.version>1.2.5</taglibs.standard.version>
- <jakarta.annotations.version>2.1.1</jakarta.annotations.version>
<lombok.version>1.18.42</lombok.version>
<maven.compiler.release>${jdk.version}</maven.compiler.release>
@@ -1076,11 +1074,6 @@
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotation.api.version}</version>
- </dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
@@ -1184,6 +1177,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-bom</artifactId>
+ <version>11.0.0</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
<dependency>
<!-- Required in the sample apps only for 3rd-party libraries
that expect to call
the commons logging APIs -->
@@ -1210,12 +1210,6 @@
<scope>runtime</scope>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>jakarta.servlet.jsp</groupId>
- <artifactId>jakarta.servlet.jsp-api</artifactId>
- <version>4.0.0</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-spec</artifactId>
@@ -1228,12 +1222,6 @@
<version>${taglibs.standard.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml
index b27ee6180..34898d6b3 100644
--- a/samples/guice/pom.xml
+++ b/samples/guice/pom.xml
@@ -53,7 +53,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml
index bef802b8a..296b71ce2 100644
--- a/samples/servlet-plugin/pom.xml
+++ b/samples/servlet-plugin/pom.xml
@@ -98,7 +98,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml
index 9825e6bad..4409da570 100644
--- a/samples/spring-hibernate/pom.xml
+++ b/samples/spring-hibernate/pom.xml
@@ -63,7 +63,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml
index da1a4daaa..1882e07b9 100644
--- a/samples/spring-mvc/pom.xml
+++ b/samples/spring-mvc/pom.xml
@@ -97,7 +97,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/samples/web/pom.xml b/samples/web/pom.xml
index 00eff461a..95387e262 100644
--- a/samples/web/pom.xml
+++ b/samples/web/pom.xml
@@ -75,7 +75,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index d207130fd..83483c9c1 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -73,7 +73,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml
index 0acf9a49a..876a76c5a 100644
--- a/support/jaxrs/pom.xml
+++ b/support/jaxrs/pom.xml
@@ -69,7 +69,6 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotations.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/support/spring/pom.xml b/support/spring/pom.xml
index 2bc9e08d1..bc60daebf 100644
--- a/support/spring/pom.xml
+++ b/support/spring/pom.xml
@@ -47,7 +47,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/web/pom.xml b/web/pom.xml
index 45bc99bcb..47fae972d 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -56,7 +56,6 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.1.0</version>
</dependency>
<dependency>
<groupId>org.owasp.encoder</groupId>
