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
commit 143ebbc670995f7e22c48250944add55b51031a5 Author: lprimak <[email protected]> AuthorDate: Wed Jan 21 22:52:39 2026 -0600 added integration-tests/support module back ina improved guice cituation somewhat --- integration-tests/guice/pom.xml | 13 ++++++------- integration-tests/pom.xml | 2 +- integration-tests/support/pom.xml | 29 +++++++++++------------------ pom.xml | 2 +- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/integration-tests/guice/pom.xml b/integration-tests/guice/pom.xml index e7dd785f5..f35b68823 100644 --- a/integration-tests/guice/pom.xml +++ b/integration-tests/guice/pom.xml @@ -38,8 +38,8 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.jetty.ee11</groupId> - <artifactId>jetty-ee11-maven-plugin</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-maven-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -116,16 +116,15 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-apache-jsp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-apache-jsp</artifactId> <version>${jetty.version}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>apache-jstl</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-annotations</artifactId> <version>${jetty.version}</version> - <type>pom</type> <scope>test</scope> </dependency> <dependency> diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 5ef25c482..6864c26f3 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -44,6 +44,7 @@ <modules> <module>meecrowave-support</module> <module>jaxrs</module> + <module>support</module> <module>jakarta-ee-support</module> </modules> @@ -62,7 +63,6 @@ <profile> <id>deferred-for-3x</id> <modules> - <module>support</module> <module>guice</module> <module>jakarta-ee</module> </modules> diff --git a/integration-tests/support/pom.xml b/integration-tests/support/pom.xml index 70f07f19f..5189d7857 100644 --- a/integration-tests/support/pom.xml +++ b/integration-tests/support/pom.xml @@ -84,13 +84,13 @@ <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee11</groupId> - <artifactId>jetty-ee11-webapp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-webapp</artifactId> <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee11</groupId> - <artifactId>jetty-ee11-apache-jsp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-apache-jsp</artifactId> <version>${jetty.version}</version> </dependency> <dependency> @@ -101,28 +101,21 @@ </dependency> <dependency> <groupId>com.github.mjeanroy</groupId> - <artifactId>junit-servers-jetty-9</artifactId> - <!-- Exclude Jetty 9.2 artifacts --> + <artifactId>junit-servers-jetty-12</artifactId> + <version>3.4.0</version> + <!-- Exclude older Jetty artifacts --> <exclusions> <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jndi</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>*</artifactId> </exclusion> <exclusion> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> + <artifactId>*</artifactId> </exclusion> <exclusion> <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-server</artifactId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> diff --git a/pom.xml b/pom.xml index 101cb467f..a8e653373 100644 --- a/pom.xml +++ b/pom.xml @@ -415,7 +415,7 @@ <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.version}</version> + <version>11.0.26</version> <configuration> <contextPath>/</contextPath> <httpConnector>
