Merge branch 'main' into checkstyle_test_1

apache · Oct 5, 2023 · 8e71cad · 8e71cad
2 parents 572c9f3 + 566353c
commit 8e71cad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...ion-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/cdi/ComponentInjectionIT.java b/...ion-tests/jakarta-ee/src/test/java/org/apache/shiro/testing/cdi/ComponentInjectionIT.java
@@ -124,6 +124,10 @@ public static WebArchive createDeployment(String archive) {
                 .addAsResource("META-INF/beans.xml")
                 .addAsResource(new StringAsset("org.apache.shiro.cdi.ShiroSecurityExtension"),
                         jakartify("META-INF/services/javax.enterprise.inject.spi.Extension"))
+                .addAsResource("META-INF/services/org.slf4j.spi.SLF4JServiceProvider")
+                .addAsWebInfResource(new StringAsset(
+                        "<payara-web-app><class-loader delegate=\"false\"/></payara-web-app>"),
+                        "payara-web.xml")
                 .addPackages(true, "org.apache.shiro")
                 .addPackages(true, "org.apache.commons")
                 .deletePackages(true, "org.apache.shiro.testing")

diff --git a/pom.xml b/pom.xml
@@ -114,7 +114,7 @@
         <spring-boot.version>2.7.16</spring-boot.version>
         <guice.version>4.2.3</guice.version>
         <jaxrs.api.version>2.1.6</jaxrs.api.version>
-        <htmlunit.version>3.5.0</htmlunit.version>
+        <htmlunit.version>3.6.0</htmlunit.version>
         <bouncycastle.version>1.76</bouncycastle.version>
 
         <!-- Test 3rd-party dependencies: -->
@@ -447,6 +447,8 @@
                         <target>${maven.compiler.release}</target>
                         <complianceLevel>${maven.compiler.release}</complianceLevel>
                         <showWeaveInfo>true</showWeaveInfo>
+                        <!-- Fix for https://github.com/apache/shiro/issues/1100 -->
+                        <forceAjcCompile>true</forceAjcCompile>
                     </configuration>
                     <executions>
                         <execution>