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 42892de73b9b9bddb836bf5b50f7b28d523215a6 Author: lprimak <[email protected]> AuthorDate: Tue Jan 27 23:16:39 2026 -0600 chore: remove BOM module and added web-jakarta --- bom/pom.xml | 120 --------------------- pom.xml | 1 - samples/pom.xml | 3 +- samples/web-jakarta/pom.xml | 10 -- .../shiro/test/web/jakarta/WebContainerIT.java | 5 +- 5 files changed, 4 insertions(+), 135 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml deleted file mode 100644 index a63c2c7b4..000000000 --- a/bom/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>shiro-root</artifactId> - <groupId>org.apache.shiro</groupId> - <version>999-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>shiro-bom</artifactId> - <name>Apache Shiro :: BOM</name> - <packaging>pom</packaging> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.shiro</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-jakarta-ee</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.shiro</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-cdi</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.shiro</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-jaxrs</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.shiro</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-spring</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.shiro</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-spring-boot-web-starter</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.shiro</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-spring-boot-starter</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.shiro</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </dependencyManagement> -</project> diff --git a/pom.xml b/pom.xml index 3ee1b9bd8..2a50df367 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,6 @@ <module>web</module> <module>support</module> <module>tools</module> - <module>bom</module> <module>integration-tests</module> <module>samples</module> <!-- <module>test-coverage</module> --> diff --git a/samples/pom.xml b/samples/pom.xml index 01da4d6a5..7c32b1aae 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -42,6 +42,7 @@ <module>aspectj</module> <module>quickstart</module> <module>quickstart-guice</module> + <module>web-jakarta</module> </modules> <profiles> @@ -54,10 +55,8 @@ <module>spring-mvc</module> <module>spring-hibernate</module> <module>spring-boot-web</module> - <module>web</module> <module>guice</module> <module>servlet-plugin</module> - <module>web-jakarta</module> </modules> </profile> </profiles> diff --git a/samples/web-jakarta/pom.xml b/samples/web-jakarta/pom.xml index 266ed9595..24e9ad036 100644 --- a/samples/web-jakarta/pom.xml +++ b/samples/web-jakarta/pom.xml @@ -39,13 +39,6 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-bom</artifactId> @@ -121,13 +114,11 @@ <dependency> <groupId>jakarta.servlet.jsp</groupId> <artifactId>jakarta.servlet.jsp-api</artifactId> - <version>4.0.0</version> <scope>test</scope> </dependency> <dependency> <groupId>jakarta.servlet.jsp.jstl</groupId> <artifactId>jakarta.servlet.jsp.jstl-api</artifactId> - <version>3.0.2</version> <scope>test</scope> <exclusions> <exclusion> @@ -170,7 +161,6 @@ <dependency> <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-core</artifactId> - <classifier>jakarta</classifier> <version>${meecrowave.version}</version> <scope>test</scope> </dependency> diff --git a/samples/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java b/samples/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java index 4074d10e6..bf28f8552 100644 --- a/samples/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java +++ b/samples/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java @@ -44,8 +44,9 @@ public class WebContainerIT extends JakartaAbstractContainerIT { .path("/login.jsp") .request(TEXT_HTML_TYPE) .get()) { - jsessionid = new Cookie("JSESSIONID", - loginPage.getMetadata().get("Set-Cookie").get(0).toString().split(";")[0].split("=")[1]); + jsessionid = new Cookie.Builder("JSESSIONID") + .value(loginPage.getMetadata().get("Set-Cookie") + .get(0).toString().split(";")[0].split("=")[1]).build(); assertThat(loginPage.readEntity(String.class)).contains("loginform"); }
