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 f358d6dbdeefc72a04be807c6e785822053828fb Author: lprimak <[email protected]> AuthorDate: Tue Jan 27 23:19:39 2026 -0600 web-jakarta removal odds and dends --- samples/pom.xml | 2 +- samples/web/{web-jakarta => }/pom.xml | 5 ++--- samples/web/{web-jakarta => }/src/main/resources/META-INF/NOTICE | 0 samples/web/{web-jakarta => }/src/main/resources/log4j2.xml | 0 samples/web/{web-jakarta => }/src/main/webapp/WEB-INF/shiro.ini | 0 samples/web/{web-jakarta => }/src/main/webapp/WEB-INF/web.xml | 0 samples/web/{web-jakarta => }/src/main/webapp/account/index.jsp | 0 samples/web/{web-jakarta => }/src/main/webapp/home.jsp | 0 samples/web/{web-jakarta => }/src/main/webapp/include.jsp | 0 samples/web/{web-jakarta => }/src/main/webapp/index.jsp | 0 samples/web/{web-jakarta => }/src/main/webapp/login.jsp | 0 samples/web/{web-jakarta => }/src/main/webapp/logout.jsp | 0 samples/web/{web-jakarta => }/src/main/webapp/style.css | 0 .../apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java | 0 .../test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java | 0 samples/web/{web-jakarta => }/src/test/resources/log4j2.xml | 0 16 files changed, 3 insertions(+), 4 deletions(-) diff --git a/samples/pom.xml b/samples/pom.xml index 7c32b1aae..cf337e683 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -42,7 +42,7 @@ <module>aspectj</module> <module>quickstart</module> <module>quickstart-guice</module> - <module>web-jakarta</module> + <module>web</module> </modules> <profiles> diff --git a/samples/web/web-jakarta/pom.xml b/samples/web/pom.xml similarity index 97% rename from samples/web/web-jakarta/pom.xml rename to samples/web/pom.xml index 24e9ad036..6bd732acd 100644 --- a/samples/web/web-jakarta/pom.xml +++ b/samples/web/pom.xml @@ -27,8 +27,8 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>samples-web-jakarta</artifactId> - <name>Apache Shiro :: Samples :: Web Jakarta</name> + <artifactId>samples-web</artifactId> + <name>Apache Shiro :: Samples :: Web</name> <packaging>war</packaging> <properties> @@ -171,7 +171,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>3.4.0</version> <executions> <execution> <id>default-war</id> diff --git a/samples/web/web-jakarta/src/main/resources/META-INF/NOTICE b/samples/web/src/main/resources/META-INF/NOTICE similarity index 100% rename from samples/web/web-jakarta/src/main/resources/META-INF/NOTICE rename to samples/web/src/main/resources/META-INF/NOTICE diff --git a/samples/web/web-jakarta/src/main/resources/log4j2.xml b/samples/web/src/main/resources/log4j2.xml similarity index 100% rename from samples/web/web-jakarta/src/main/resources/log4j2.xml rename to samples/web/src/main/resources/log4j2.xml diff --git a/samples/web/web-jakarta/src/main/webapp/WEB-INF/shiro.ini b/samples/web/src/main/webapp/WEB-INF/shiro.ini similarity index 100% rename from samples/web/web-jakarta/src/main/webapp/WEB-INF/shiro.ini rename to samples/web/src/main/webapp/WEB-INF/shiro.ini diff --git a/samples/web/web-jakarta/src/main/webapp/WEB-INF/web.xml b/samples/web/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/web/web-jakarta/src/main/webapp/WEB-INF/web.xml rename to samples/web/src/main/webapp/WEB-INF/web.xml diff --git a/samples/web/web-jakarta/src/main/webapp/account/index.jsp b/samples/web/src/main/webapp/account/index.jsp similarity index 100% rename from samples/web/web-jakarta/src/main/webapp/account/index.jsp rename to samples/web/src/main/webapp/account/index.jsp diff --git a/samples/web/web-jakarta/src/main/webapp/home.jsp b/samples/web/src/main/webapp/home.jsp similarity index 100% rename from samples/web/web-jakarta/src/main/webapp/home.jsp rename to samples/web/src/main/webapp/home.jsp diff --git a/samples/web/web-jakarta/src/main/webapp/include.jsp b/samples/web/src/main/webapp/include.jsp similarity index 100% rename from samples/web/web-jakarta/src/main/webapp/include.jsp rename to samples/web/src/main/webapp/include.jsp diff --git a/samples/web/web-jakarta/src/main/webapp/index.jsp b/samples/web/src/main/webapp/index.jsp similarity index 100% rename from samples/web/web-jakarta/src/main/webapp/index.jsp rename to samples/web/src/main/webapp/index.jsp diff --git a/samples/web/web-jakarta/src/main/webapp/login.jsp b/samples/web/src/main/webapp/login.jsp similarity index 100% rename from samples/web/web-jakarta/src/main/webapp/login.jsp rename to samples/web/src/main/webapp/login.jsp diff --git a/samples/web/web-jakarta/src/main/webapp/logout.jsp b/samples/web/src/main/webapp/logout.jsp similarity index 100% rename from samples/web/web-jakarta/src/main/webapp/logout.jsp rename to samples/web/src/main/webapp/logout.jsp diff --git a/samples/web/web-jakarta/src/main/webapp/style.css b/samples/web/src/main/webapp/style.css similarity index 100% rename from samples/web/web-jakarta/src/main/webapp/style.css rename to samples/web/src/main/webapp/style.css diff --git a/samples/web/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java b/samples/web/src/test/java/org/apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java similarity index 100% rename from samples/web/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java rename to samples/web/src/test/java/org/apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java diff --git a/samples/web/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java b/samples/web/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java similarity index 100% rename from samples/web/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java rename to samples/web/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java diff --git a/samples/web/web-jakarta/src/test/resources/log4j2.xml b/samples/web/src/test/resources/log4j2.xml similarity index 100% rename from samples/web/web-jakarta/src/test/resources/log4j2.xml rename to samples/web/src/test/resources/log4j2.xml
