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 1fa44b5721bf1c2060a16a266971082b4e6c791c Author: lprimak <[email protected]> AuthorDate: Thu Jan 22 02:24:26 2026 -0600 wip: fixing up jakarta ee tests --- integration-tests/jakarta-ee/pom.xml | 146 +++------------------ .../src/main/resources/META-INF/beans.xml | 24 ++++ .../shiro/testing/jakarta/ee/Deployments.java | 2 +- .../jakarta-ee/src/test/resources/arquillian.xml | 2 + 4 files changed, 43 insertions(+), 131 deletions(-) diff --git a/integration-tests/jakarta-ee/pom.xml b/integration-tests/jakarta-ee/pom.xml index 82cfa07ff..a38c23c53 100644 --- a/integration-tests/jakarta-ee/pom.xml +++ b/integration-tests/jakarta-ee/pom.xml @@ -38,12 +38,11 @@ <maven.compiler.source>${maven.compiler.release}</maven.compiler.source> <maven.compiler.target>${maven.compiler.release}</maven.compiler.target> <arquillian.core.version>1.10.0.Final</arquillian.core.version> - <arquillian.payara5.version>3.1</arquillian.payara5.version> <arquillian.graphene.version>3.0.0-20250814</arquillian.graphene.version> <shrinkwrap.resolver.version>3.3.4</shrinkwrap.resolver.version> <drone.browser>firefox</drone.browser> - <payara.version>5.2022.5.jdk21</payara.version> + <payara.version>7.2026.1</payara.version> <payara.start.skip>${skipITs}</payara.start.skip> <asadmin.cmd>asadmin</asadmin.cmd> <unix-sed-skip>${payara.start.skip}</unix-sed-skip> @@ -81,15 +80,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</artifactId> - <version>2.1.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - <version>4.0.4</version> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + <version>2.0.1</version> <scope>provided</scope> </dependency> @@ -110,33 +103,12 @@ <!-- test dependencies --> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-params</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-junit-jupiter</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.github.artsok</groupId> - <artifactId>rerunner-jupiter</artifactId> - <version>2.1.6</version> + <groupId>com.flowlogix.depchain</groupId> + <artifactId>integration-test</artifactId> + <version>106</version> <scope>test</scope> </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> @@ -148,101 +120,27 @@ <artifactId>flowlogix-jee</artifactId> <version>11.1</version> </dependency> - <dependency> - <groupId>jakarta.ws.rs</groupId> - <artifactId>jakarta.ws.rs-api</artifactId> - <version>4.0.0</version> - </dependency> - <!-- Arquillian test dependencies --> - <dependency> - <groupId>org.jboss.arquillian.junit5</groupId> - <artifactId>arquillian-junit5-container</artifactId> - <version>${arquillian.core.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>fish.payara.arquillian</groupId> <artifactId>arquillian-payara-server-remote</artifactId> - <version>${arquillian.payara5.version}</version> + <version>3.1</version> <scope>test</scope> <exclusions> <exclusion> - <groupId>org.jboss.arquillian.testenricher</groupId> + <groupId>org.jboss.arquillian.container</groupId> <artifactId>*</artifactId> </exclusion> <exclusion> - <groupId>org.jboss.arquillian.protocol</groupId> + <groupId>org.jboss.arquillian.testenricher</groupId> <artifactId>*</artifactId> </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-container-spi</artifactId> - <version>${arquillian.core.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.protocol</groupId> - <artifactId>arquillian-protocol-servlet</artifactId> - <version>${arquillian.core.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.testenricher</groupId> - <artifactId>arquillian-testenricher-cdi</artifactId> - <version>${arquillian.core.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.testenricher</groupId> - <artifactId>arquillian-testenricher-ejb</artifactId> - <version>${arquillian.core.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.testenricher</groupId> - <artifactId>arquillian-testenricher-resource</artifactId> - <version>${arquillian.core.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.testenricher</groupId> - <artifactId>arquillian-testenricher-initialcontext</artifactId> - <version>${arquillian.core.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-depchain</artifactId> - <type>pom</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>7.0.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eu.ingwar.tools</groupId> - <artifactId>arquillian-suite-extension</artifactId> - <version>1.2.2</version> - <scope>test</scope> - <exclusions> <exclusion> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.30.2-GA</version> - <scope>test</scope> - </dependency> <!-- Selenium test dependencies --> <dependency> @@ -254,18 +152,6 @@ </dependency> </dependencies> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-bom</artifactId> - <version>${shrinkwrap.resolver.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <build> <plugins> <plugin> @@ -351,7 +237,7 @@ <overWriteIfNewer>false</overWriteIfNewer> <artifactItems> <artifactItem> - <groupId>com.flowlogix.payara</groupId> + <groupId>fish.payara.distributions</groupId> <artifactId>payara</artifactId> <version>${payara.version}</version> <type>zip</type> @@ -391,7 +277,7 @@ <artifactId>exec-maven-plugin</artifactId> <version>3.6.3</version> <configuration> - <executable>${project.build.directory}/dependency/payara5/bin/${asadmin.cmd}</executable> + <executable>${project.build.directory}/dependency/payara7/bin/${asadmin.cmd}</executable> <skip>${payara.start.skip}</skip> </configuration> <executions> @@ -416,7 +302,7 @@ <commandlineArgs>-i ${mac-backup-file} -e 's/jvm-options>\[17|/jvm-options>\[16|/g' -e 's/property name="HZ_LISTENER_PORT" value="5900/property name="HZ_LISTENER_PORT" value="5920/g' -e 's/hazelcast-runtime-configuration start-port="5900/hazelcast-runtime-configuration start-port="5920/g' - ${project.build.directory}/dependency/payara5/glassfish/domains/${domain.name}/config/domain.xml + ${project.build.directory}/dependency/payara7/glassfish/domains/${domain.name}/config/domain.xml </commandlineArgs> <skip>${unix-sed-skip}</skip> </configuration> diff --git a/integration-tests/jakarta-ee/src/main/resources/META-INF/beans.xml b/integration-tests/jakarta-ee/src/main/resources/META-INF/beans.xml new file mode 100644 index 000000000..596f8f1e6 --- /dev/null +++ b/integration-tests/jakarta-ee/src/main/resources/META-INF/beans.xml @@ -0,0 +1,24 @@ +<?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. + --> +<beans version="4.0" xmlns="https://jakarta.ee/xml/ns/jakartaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"; + bean-discovery-mode="annotated"> +</beans> diff --git a/integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/Deployments.java b/integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/Deployments.java index e48253ad5..ddb69fb2d 100644 --- a/integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/Deployments.java +++ b/integration-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/jakarta/ee/Deployments.java @@ -67,7 +67,7 @@ public class Deployments { private static List<Action> initializeStandardActions() { switch (System.getProperty(INTEGRATION_TEST_MODE_PROPERTY, "none")) { case CLIENT_STATE_SAVING: - return List.of(new Action(getContextParamValue(jakartify("jakarta.faces.STATE_SAVING_METHOD")), + return List.of(new Action(getContextParamValue("jakarta.faces.STATE_SAVING_METHOD"), node -> node.setTextContent("client"))); case SHIRO_NATIVE_SESSIONS: return List.of(new Action(getContextParamValue("shiroConfigLocations"), diff --git a/integration-tests/jakarta-ee/src/test/resources/arquillian.xml b/integration-tests/jakarta-ee/src/test/resources/arquillian.xml index 6604ce3c4..36a212dbf 100644 --- a/integration-tests/jakarta-ee/src/test/resources/arquillian.xml +++ b/integration-tests/jakarta-ee/src/test/resources/arquillian.xml @@ -22,6 +22,8 @@ <property name="firefoxArguments">-headless</property> <property name="chromeBinary">${webdriver.chrome.binary}</property> <property name="chromeArguments">--ignore-certificate-errors</property> + <property name="enableBidi">true</property> + <property name="unhandledPromptBehaviour">ignore</property> <property name="githubUsername">${gh_user}</property> <property name="githubToken">${gh_token}</property> </extension>
