[RESTEASY-2590] Update dependencies to match WildFly 20 (#2413)

resteasy-cache/resteasy-cache-core/src/main/java/org/jboss/resteasy/plugins/cache/server/ServerCacheInterceptor.java

@@ -1,5 +1,6 @@
 package org.jboss.resteasy.plugins.cache.server;
 
+import org.infinispan.marshall.core.ExternallyMarshallable;
 import org.jboss.resteasy.resteasy_jaxrs.i18n.LogMessages;
 import org.jboss.resteasy.spi.HttpRequest;
 import org.jboss.resteasy.spi.NoLogWebApplicationException;
@@ -28,6 +29,11 @@
 @ConstrainedTo(RuntimeType.SERVER)
 public class ServerCacheInterceptor implements WriterInterceptor
 {
+   static
+   {
+      ExternallyMarshallable.addToWhiteList(InfinispanCache.CacheEntry.class.getName());
+   }
+
    protected ServerCache cache;
 
    public ServerCacheInterceptor(final ServerCache cache)

resteasy-cache/resteasy-cache-core/src/test/resources/infinispan.xml

@@ -1,7 +1,7 @@
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:infinispan:config:8.1 http://www.infinispan.org/schemas/infinispan-config-8.1.xsd"
-      xmlns="urn:infinispan:config:8.1">
+      xsi:schemaLocation="urn:infinispan:config:8.1 http://www.infinispan.org/schemas/infinispan-config-9.4.xsd"
+      xmlns="urn:infinispan:config:9.4">
 
    <cache-container default-cache="TestCache">
       <jmx duplicate-domains="true"/>

resteasy-dependencies-bom/pom.xml

@@ -23,7 +23,7 @@
         <version.com.google.guava>28.1-jre</version.com.google.guava>
         <version.com.google.inject.guice>4.2.2</version.com.google.inject.guice>
         <version.com.io7m.xom>1.2.10</version.com.io7m.xom>
-        <version.jakarta.mail>1.6.4</version.jakarta.mail>
+        <version.jakarta.mail>1.6.5</version.jakarta.mail>
         <version.org.glassfish.jaxb.jaxb>2.3.3-b02</version.org.glassfish.jaxb.jaxb>
         <version.com.sun.xml.fastinfoset>1.2.17</version.com.sun.xml.fastinfoset>
         <version.commons-io.commons-io>2.5</version.commons-io.commons-io>
@@ -55,12 +55,12 @@
         <version.org.eclipse.jetty>9.4.24.v20191120</version.org.eclipse.jetty>
         <version.org.eclipse.yasson>1.0.5</version.org.eclipse.yasson>
         <version.com.github.tomakehurst.wiremock>2.20.0</version.com.github.tomakehurst.wiremock>
-        <version.org.glassfish.jakarta.el>3.0.2</version.org.glassfish.jakarta.el>
+        <version.org.glassfish.jakarta.el>3.0.3.jbossorg-2</version.org.glassfish.jakarta.el>
         <version.org.glassfish.jakarta.json>1.1.6</version.org.glassfish.jakarta.json>
         <version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>1.0.0.Final</version.org.hibernate.javax.persistence.hibernate-jpa-2.1-api>
-        <version.org.infinispan>8.2.11.Final</version.org.infinispan>
-        <version.org.jacoco>0.7.9</version.org.jacoco>
-        <version.org.javassist>3.20.0-GA</version.org.javassist>
+        <version.org.infinispan>9.4.19.Final</version.org.infinispan>
+        <version.org.jacoco>0.8.2</version.org.jacoco>
+        <version.org.javassist>3.23.2-GA</version.org.javassist>
         <version.org.jboss.arquillian.container.arquillian-weld-embedded>2.0.0.Final</version.org.jboss.arquillian.container.arquillian-weld-embedded>
         <version.org.jboss.logging.jboss-logging>3.3.2.Final</version.org.jboss.logging.jboss-logging>
         <version.org.jboss.logging.jboss-logging-annotations>2.1.0.Final</version.org.jboss.logging.jboss-logging-annotations>
@@ -70,7 +70,7 @@
         <version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec>2.0.0.Final</version.org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec>
         <version.org.jboss.spec.javax.interceptor.jboss-interceptors-api_1.2_spec>2.0.0.Final</version.org.jboss.spec.javax.interceptor.jboss-interceptors-api_1.2_spec>
         <version.org.jboss.spec.javax.jms.jboss-jms-api_2.0_spec>2.0.0.Final</version.org.jboss.spec.javax.jms.jboss-jms-api_2.0_spec>
-        <version.org.jboss.spec.javax.xml.bind-api_2.3_spec>1.0.1.Final</version.org.jboss.spec.javax.xml.bind-api_2.3_spec>
+        <version.org.jboss.spec.javax.xml.bind-api_2.3_spec>2.0.0.Final</version.org.jboss.spec.javax.xml.bind-api_2.3_spec>
         <version.org.jboss.spec.javax.servlet.jboss-servlet-api_4.0_spec>2.0.0.Final</version.org.jboss.spec.javax.servlet.jboss-servlet-api_4.0_spec>
         <version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.3_spec>2.0.0.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.3_spec>
         <version.org.jboss.shrinkwrap.resolver>2.2.4</version.org.jboss.shrinkwrap.resolver>
@@ -79,19 +79,19 @@
         <version.org.slf4j>1.7.29</version.org.slf4j>
         <version.org.wildfly.core.wildfly-cli>7.0.0.Final</version.org.wildfly.core.wildfly-cli>
         <version.org.wildfly.extras.creaper>1.6.1</version.org.wildfly.extras.creaper>
-        <version.org.wildfly.wildfly-arquillian-container-managed>2.1.1.Final</version.org.wildfly.wildfly-arquillian-container-managed>
+        <version.org.wildfly.wildfly-arquillian-container-managed>2.2.0.Final</version.org.wildfly.wildfly-arquillian-container-managed>
         <version.org.wildfly.wildfly-arquillian-container-remote>2.1.1.Final</version.org.wildfly.wildfly-arquillian-container-remote>
         <version.org.wildfly.security.wildfly-elytron>1.7.0.Final</version.org.wildfly.security.wildfly-elytron>
         <version.org.yaml.snakeyaml>1.26</version.org.yaml.snakeyaml>
-        <version.weld.api>3.0.SP4</version.weld.api>
-        <version.weld>3.0.5.Final</version.weld>
+        <version.weld.api>3.1.SP2 </version.weld.api>
+        <version.weld>3.1.4.Final</version.weld>
         <version.json.patch>1.9</version.json.patch>
         <version.io.reactivex.rxjava>1.3.8</version.io.reactivex.rxjava>
         <version.io.reactivex.rxjava-reactive-streams>1.2.1</version.io.reactivex.rxjava-reactive-streams>
         <version.io.reactivex.rxjava2-rxjava>2.2.14</version.io.reactivex.rxjava2-rxjava>
         <version.io.smallrye.smallrye-config>1.6.1</version.io.smallrye.smallrye-config>
         <version.org.reactivestreams>1.0.3</version.org.reactivestreams>
-        <version.org.hibernate.validator>6.0.18.Final</version.org.hibernate.validator>
+        <version.org.hibernate.validator>6.0.20.Final</version.org.hibernate.validator>
         <version.org.jboss.marshalling.jboss-marshalling>2.0.6.Final</version.org.jboss.marshalling.jboss-marshalling>
         <version.org.springframework>5.2.0.RELEASE</version.org.springframework>
     </properties>

security-legacy/keystone/keystone-core/src/main/java/org/jboss/resteasy/keystone/model/Access.java

@@ -10,9 +10,16 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.infinispan.marshall.core.ExternallyMarshallable;
+
 @JsonRootName("access")
 public class Access implements Serializable {
 
+   static
+   {
+      ExternallyMarshallable.addToWhiteList(Access.class.getName());
+   }
+
    @JsonIgnoreProperties(ignoreUnknown = true)
    public static final class Token implements Serializable {
 

security-legacy/keystone/keystone-core/src/main/java/org/jboss/resteasy/keystone/model/Role.java

@@ -4,9 +4,16 @@
 
 import java.io.Serializable;
 
+import org.infinispan.marshall.core.ExternallyMarshallable;
+
 @JsonRootName("role")
 public class Role implements Serializable {
 
+   static
+   {
+      ExternallyMarshallable.addToWhiteList(Role.class.getName());
+   }
+
    private String id;
 
    private String name;

security-legacy/keystone/keystone-core/src/main/java/org/jboss/resteasy/keystone/model/StoredProject.java

@@ -6,12 +6,19 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.infinispan.marshall.core.ExternallyMarshallable;
+
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
 public class StoredProject implements Serializable
 {
+   static
+   {
+      ExternallyMarshallable.addToWhiteList(StoredProject.class.getName());
+   }
+
    private Project project;
    private Map<String, Set<String>> userRoles = new HashMap<String, Set<String>>();
    private Map<String, String> userNameIds = new HashMap<String, String>();

security-legacy/keystone/keystone-core/src/main/java/org/jboss/resteasy/keystone/model/StoredUser.java

@@ -4,9 +4,15 @@
 
 import java.util.Map;
 
+import org.infinispan.marshall.core.ExternallyMarshallable;
+
 @JsonRootName("user")
 public class StoredUser extends User
 {
+   static
+   {
+      ExternallyMarshallable.addToWhiteList(StoredUser.class.getName());
+   }
 
    private Map<String, String> credentials;
 

security-legacy/keystone/keystone-core/src/test/resources/cache.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <infinispan
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="urn:infinispan:config:8.1 http://www.infinispan.org/schemas/infinispan-config-8.1.xsd"
-    xmlns="urn:infinispan:config:8.1">
+    xsi:schemaLocation="urn:infinispan:config:8.1 http://www.infinispan.org/schemas/infinispan-config-9.4.xsd"
+    xmlns="urn:infinispan:config:9.4">
     <cache-container default-cache="idp-store">
         <jmx duplicate-domains="true"/>
         <local-cache name="idp-store">