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 ca2992f41634969cccff67484e1c13032019d385 Author: lprimak <[email protected]> AuthorDate: Mon Feb 2 17:06:31 2026 -0600 re-enabled guice sample --- samples/guice/pom.xml | 33 ++++++++++++++------------------- samples/pom.xml | 2 +- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/samples/guice/pom.xml b/samples/guice/pom.xml index 34898d6b3..0146411e2 100644 --- a/samples/guice/pom.xml +++ b/samples/guice/pom.xml @@ -40,16 +40,6 @@ </build> <dependencies> - <dependency> - <groupId>org.apache.taglibs</groupId> - <artifactId>taglibs-standard-spec</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.taglibs</groupId> - <artifactId>taglibs-standard-impl</artifactId> - <scope>compile</scope> - </dependency> <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> @@ -93,18 +83,11 @@ <scope>test</scope> </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> <scope>test</scope> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>apache-jstl</artifactId> - <version>10.0.26</version> - <type>pom</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-annotations</artifactId> @@ -118,6 +101,18 @@ </dependency> </dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>jakarta.platform</groupId> + <artifactId>jakarta.jakartaee-bom</artifactId> + <version>10.0.0</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + <profiles> <profile> <id>jdk17</id> diff --git a/samples/pom.xml b/samples/pom.xml index a93099eb5..200641690 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -44,6 +44,7 @@ <module>quickstart-guice</module> <module>web</module> <module>servlet-plugin</module> + <module>guice</module> </modules> <profiles> @@ -56,7 +57,6 @@ <module>spring-mvc</module> <module>spring-hibernate</module> <module>spring-boot-web</module> - <module>guice</module> </modules> </profile> </profiles>
