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 b831cb3a4 enh: restore Guice integration tests
b831cb3a4 is described below
commit b831cb3a4afa93a17740dd77ac0f4a6fffdc34a0
Author: lprimak <[email protected]>
AuthorDate: Mon Feb 2 13:45:09 2026 -0600
enh: restore Guice integration tests
---
integration-tests/guice/pom.xml | 28 +++++++++++++---------
.../samples/guice/SampleShiroServletModule.java | 1 +
integration-tests/pom.xml | 10 +-------
integration-tests/support/pom.xml | 10 --------
pom.xml | 24 ++-----------------
5 files changed, 21 insertions(+), 52 deletions(-)
diff --git a/integration-tests/guice/pom.xml b/integration-tests/guice/pom.xml
index f35b68823..39ad172cd 100644
--- a/integration-tests/guice/pom.xml
+++ b/integration-tests/guice/pom.xml
@@ -40,6 +40,7 @@
<plugin>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-maven-plugin</artifactId>
+ <version>${jetty.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -54,27 +55,20 @@
</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>
<scope>provided</scope>
- <version>6.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@@ -134,6 +128,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/integration-tests/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java
b/integration-tests/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java
index 5b6dca73f..986a86e16 100644
---
a/integration-tests/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java
+++
b/integration-tests/guice/src/main/java/org/apache/shiro/samples/guice/SampleShiroServletModule.java
@@ -47,6 +47,7 @@ public class SampleShiroServletModule extends ShiroWebModule {
@Override
protected void configureShiroWeb() {
bindConstant().annotatedWith(Names.named("shiro.loginUrl")).to("/login.jsp");
+
bindConstant().annotatedWith(Names.named("shiro.blockSemicolon")).to("false");
try {
this.bindRealm().toConstructor(IniRealm.class.getConstructor(Ini.class));
} catch (NoSuchMethodException e) {
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 1b74078ea..53a6e898c 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -45,6 +45,7 @@
<module>meecrowave-support</module>
<module>jaxrs</module>
<module>support</module>
+ <module>guice</module>
<module>jakarta-ee-support</module>
<module>jakarta-ee</module>
</modules>
@@ -60,15 +61,6 @@
</dependencies>
</dependencyManagement>
- <profiles>
- <profile>
- <id>deferred-for-3x</id>
- <modules>
- <module>guice</module>
- </modules>
- </profile>
- </profiles>
-
<reporting>
<plugins>
<plugin>
diff --git a/integration-tests/support/pom.xml
b/integration-tests/support/pom.xml
index 643e2148e..db95351b6 100644
--- a/integration-tests/support/pom.xml
+++ b/integration-tests/support/pom.xml
@@ -34,16 +34,6 @@
</properties>
<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>
diff --git a/pom.xml b/pom.xml
index b14aae89d..bdf28186c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@
<!-- Replaced by the build number plugin at build time: -->
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
<project.build.outputTimestamp>2026-01-15T21:40:21Z</project.build.outputTimestamp>
+ <root.dir>${maven.multiModuleProjectDirectory}</root.dir>
<jacoco.skip>true</jacoco.skip>
<!-- workaround for gmavenplus plugin until maven 4 is being used -->
<maven.project.sourceRoots.warningsDisabled>true</maven.project.sourceRoots.warningsDisabled>
@@ -106,7 +107,7 @@
<hsqldb.version>2.7.4</hsqldb.version>
<jcache.api.version>1.1.1</jcache.api.version>
<jdk.version>17</jdk.version>
- <jetty.version>12.1.5</jetty.version>
+ <jetty.version>12.1.6</jetty.version>
<owasp.java.encoder.version>1.4.0</owasp.java.encoder.version>
<!-- Don't change this version without also changing the shiro-quartz
and shiro-features
modules' OSGi metadata: -->
@@ -549,27 +550,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.commonjava.maven.plugins</groupId>
- <artifactId>directory-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>directories</id>
- <goals>
- <goal>directory-of</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <property>root.dir</property>
- <project>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
- </project>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
