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 b0e5a6a9d674163b673df9ab0151d515af16f475 Author: lprimak <[email protected]> AuthorDate: Wed Jan 28 00:02:26 2026 -0600 chore: enabled servlet-plugin but ITs do not yet run, so they remain disabled --- samples/pom.xml | 2 +- samples/servlet-plugin/pom.xml | 42 ++++++++++++++---------------------------- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/samples/pom.xml b/samples/pom.xml index cf337e683..a93099eb5 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -43,6 +43,7 @@ <module>quickstart</module> <module>quickstart-guice</module> <module>web</module> + <module>servlet-plugin</module> </modules> <profiles> @@ -56,7 +57,6 @@ <module>spring-hibernate</module> <module>spring-boot-web</module> <module>guice</module> - <module>servlet-plugin</module> </modules> </profile> </profiles> diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml index 296b71ce2..5cd52fe7e 100644 --- a/samples/servlet-plugin/pom.xml +++ b/samples/servlet-plugin/pom.xml @@ -32,16 +32,19 @@ <name>Apache Shiro :: Samples :: Servlet Plugin</name> <packaging>war</packaging> + <properties> + <skipITs>true</skipITs> + </properties> + <build> <plugins> <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.version}</version> <configuration> <contextPath>/</contextPath> <httpConnector> - <port>9080</port> + <port>9180</port> <idleTimeout>60000</idleTimeout> </httpConnector> <requestLog implementation="org.eclipse.jetty.server.NCSARequestLog"> @@ -56,29 +59,6 @@ </plugins> </build> - <!-- Currently the test fails with JDK11, so exclude it --> - <profiles> - <profile> - <id>jdk9-plus</id> - <activation> - <jdk>[9,)</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/ContainerIntegrationIT.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <dependencies> <dependency> <groupId>org.apache.shiro</groupId> @@ -117,15 +97,21 @@ <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.ee10</groupId> + <artifactId>jetty-ee10-annotations</artifactId> <version>${jetty.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>apache-jstl</artifactId> - <version>${jetty.version}</version> + <version>10.0.26</version> <type>pom</type> <scope>test</scope> </dependency>
