diff --git a/distribution/adapters/wildfly-adapter/pom.xml b/distribution/adapters/wildfly-adapter/pom.xml index 2995c78302..52fb873a0d 100644 --- a/distribution/adapters/wildfly-adapter/pom.xml +++ b/distribution/adapters/wildfly-adapter/pom.xml @@ -24,6 +24,13 @@ 16.0.0-SNAPSHOT + + 23.0.2.Final + 1.2.13.Final + 15.0.1.Final + 5.1.3.Final + + keycloak-wildfly-adapter-dist pom Keycloak Adapter Overlay Distribution diff --git a/distribution/feature-packs/adapter-feature-pack/pom.xml b/distribution/feature-packs/adapter-feature-pack/pom.xml index f29e264b21..675a0bc2dd 100755 --- a/distribution/feature-packs/adapter-feature-pack/pom.xml +++ b/distribution/feature-packs/adapter-feature-pack/pom.xml @@ -22,6 +22,13 @@ 16.0.0-SNAPSHOT + + 23.0.2.Final + 1.2.13.Final + 15.0.1.Final + 5.1.3.Final + + 4.0.0 org.keycloak @@ -218,6 +225,7 @@ org.wildfly wildfly-feature-pack + ${wildfly.version} zip diff --git a/distribution/feature-packs/server-feature-pack/feature-pack-build.xml b/distribution/feature-packs/server-feature-pack/feature-pack-build.xml index 2cb52d6bd4..9f2fc92114 100644 --- a/distribution/feature-packs/server-feature-pack/feature-pack-build.xml +++ b/distribution/feature-packs/server-feature-pack/feature-pack-build.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - + diff --git a/distribution/feature-packs/server-feature-pack/pom.xml b/distribution/feature-packs/server-feature-pack/pom.xml index afeddf128e..2b36de0fe0 100644 --- a/distribution/feature-packs/server-feature-pack/pom.xml +++ b/distribution/feature-packs/server-feature-pack/pom.xml @@ -79,25 +79,20 @@ - - org.wildfly.build - wildfly-feature-pack-build-maven-plugin - ${wildfly.build-tools.version} + org.apache.maven.plugins + maven-resources-plugin + - feature-pack-build + copy-resources + none - build + copy-resources - compile - - feature-pack-build.xml - - org.apache.maven.plugins maven-assembly-plugin @@ -113,77 +108,17 @@ assembly.xml true + ${project.build.finalName} false - target/ - target/assembly/work + ${project.build.directory} + ${project.build.directory}/assembly/work + ${assembly.tarLongFileMode} - - - org.keycloak - keycloak-distribution-licenses-maven-plugin - - - - community - - - !product - - - - - org.wildfly:wildfly-feature-pack - - - - - org.wildfly - wildfly-feature-pack - zip - - - * - * - - - - - - - - product - - - product - - - - - org.jboss.eap:wildfly-feature-pack - - - - - org.jboss.eap - wildfly-feature-pack - ${eap.version} - zip - - - * - * - - - - - - - diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml index 0ff1fac167..e30f9babd6 100644 --- a/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml +++ b/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml @@ -31,6 +31,11 @@ pom + 23.0.2.Final + 1.2.13.Final + 15.0.1.Final + 5.1.3.Final + ${basedir}/../../feature-packs/adapter-feature-pack/src/main/resources 5.1.3.Final ${feature-pack.resources.directory}/licenses/${product.slot}/licenses.xml diff --git a/distribution/galleon-feature-packs/server-galleon-pack/pom.xml b/distribution/galleon-feature-packs/server-galleon-pack/pom.xml index dd79509dc1..5e90ec0db7 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/pom.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/pom.xml @@ -64,13 +64,6 @@ provided - - org.wildfly.core - wildfly-core-feature-pack-galleon-pruned - pom - provided - - org.wildfly.core wildfly-core-galleon-pack @@ -391,10 +384,6 @@ - - org.wildfly:wildfly-galleon-pack - - org.wildfly @@ -418,10 +407,6 @@ - - ${ee.maven.groupId}:wildfly-ee-galleon-pack - - ${ee.maven.groupId} @@ -467,7 +452,6 @@ transitives. Those poms ban transitives at their level --> org.wildfly.core:wildfly-core-feature-pack-common org.wildfly.core:wildfly-core-feature-pack-ee-8-api - org.wildfly.core:wildfly-core-feature-pack-galleon-pruned org.wildfly.core:wildfly-core-feature-pack-galleon-common ${ee.maven.groupId}:wildfly-servlet-feature-pack-common ${ee.maven.groupId}:wildfly-servlet-feature-pack-ee-8-api diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-ejb.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-ejb.xml index 2cb9495d65..71dd839f51 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-ejb.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-ejb.xml @@ -6,6 +6,7 @@ + diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-hibernate.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-hibernate.xml index 7393106cda..2b8073b1b8 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-hibernate.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-hibernate.xml @@ -5,6 +5,7 @@ + diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-keycloak.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-keycloak.xml index f799bba994..d0433a4642 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-keycloak.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-keycloak.xml @@ -4,6 +4,7 @@ + diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-server.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-server.xml index ae020a87ba..396a1e7ea9 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-server.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-server.xml @@ -5,6 +5,7 @@ + diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-web.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-web.xml index 57a1d53888..1cb2473372 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-web.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-web.xml @@ -5,6 +5,7 @@ + diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-ejb.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-ejb.xml index 542512c762..929643ca11 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-ejb.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-ejb.xml @@ -6,6 +6,7 @@ + diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-hibernate.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-hibernate.xml index a0b44bb299..0df787064e 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-hibernate.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-hibernate.xml @@ -4,6 +4,7 @@ + diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-keycloak.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-keycloak.xml index b0d91c53f8..be83abcd1e 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-keycloak.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-keycloak.xml @@ -4,6 +4,7 @@ + diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-server.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-server.xml index a72d3551ee..3ea87b8974 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-server.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-server.xml @@ -6,6 +6,7 @@ + diff --git a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-web.xml b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-web.xml index 4bd54f4e4b..7cd129fc36 100644 --- a/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-web.xml +++ b/distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-web.xml @@ -5,6 +5,7 @@ + @@ -34,4 +35,4 @@ - \ No newline at end of file + diff --git a/distribution/pom.xml b/distribution/pom.xml index 6057937ceb..4a5ce0cab1 100755 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -43,7 +43,7 @@ licenses-common maven-plugins server-dist - server-overlay + diff --git a/pom.xml b/pom.xml index 0816f52e3b..668b215edd 100644 --- a/pom.xml +++ b/pom.xml @@ -53,10 +53,10 @@ 7.5.0.GA ${timestamp} - 23.0.2.Final + 25.0.1.Final 1.2.13.Final 7.4.0.GA-redhat-00005 - 15.0.1.Final + 17.0.3.Final 7.2.0.Final 7.5.22.Final-redhat-1 @@ -199,7 +199,7 @@ 2.0.0 - 5.1.3.Final + 5.2.2.Final 4.2.8.Final @@ -752,12 +752,6 @@ wildfly-ee ${wildfly.version} - - org.wildfly - wildfly-feature-pack - ${wildfly.version} - zip - org.wildfly wildfly-galleon-pack diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/pom.xml index 5043ee0097..be0b770493 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/pom.xml @@ -30,6 +30,7 @@ App Server - Wildfly + 23.0.2.Final wildfly org.wildfly diff --git a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/keycloak-server-subsystem.cli b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/keycloak-server-subsystem.cli index f20101d324..7add38129b 100644 --- a/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/keycloak-server-subsystem.cli +++ b/testsuite/integration-arquillian/servers/auth-server/jboss/common/jboss-cli/keycloak-server-subsystem.cli @@ -20,8 +20,8 @@ echo ** Adding max-detail-length to eventsStore spi ** echo ** Adding spi=userProfile with default provider and legacy-user-profile configuration of read-only attributes ** /subsystem=keycloak-server/spi=userProfile/:add(default-provider="declarative-user-profile") /subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:add(properties={},enabled=true) -/subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:map-put(name=properties,key=read-only-attributes,value=[deniedFoo,deniedBar*,deniedSome/thing,deniedsome*thing]) -/subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:map-put(name=properties,key=admin-read-only-attributes,value=[deniedSomeAdmin]) +/subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:map-put(name=properties,key=read-only-attributes,value="[\"deniedFoo\",\"deniedBar*\",\"deniedSome/thing\",\"deniedsome*thing\"]") +/subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:map-put(name=properties,key=admin-read-only-attributes,value="[\"deniedSomeAdmin\"]") echo ** Do not reuse connections for HttpClientProvider within testsuite ** /subsystem=keycloak-server/spi=connectionsHttpClient/provider=default/:map-put(name=properties,key=reuse-connections,value=false) diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java index d08bea17d3..d2839b304c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java @@ -823,10 +823,12 @@ public class AuthServerTestEnricher { Administration administration = new Administration(client); Operations operations = new Operations(client); - if(!operations.exists(Address.coreService("management").and("security-realm", "UndertowRealm"))) { - client.execute("/core-service=management/security-realm=UndertowRealm:add()"); - client.execute("/core-service=management/security-realm=UndertowRealm/server-identity=ssl:add(keystore-relative-to=jboss.server.config.dir,keystore-password=secret,keystore-path=keycloak.jks"); - client.execute("/core-service=management/security-realm=UndertowRealm/authentication=truststore:add(keystore-relative-to=jboss.server.config.dir,keystore-password=secret,keystore-path=keycloak.truststore"); + if(!operations.exists(Address.subsystem("elytron").and("server-ssl-context", "httpsSSC"))) { + client.execute("/subsystem=elytron/key-store=httpsKS:add(relative-to=jboss.server.config.dir,path=keycloak.jks,credential-reference={clear-text=secret},type=JKS)"); + client.execute("/subsystem=elytron/key-manager=httpsKM:add(key-store=httpsKS,credential-reference={clear-text=secret})"); + client.execute("/subsystem=elytron/key-store=twoWayTS:add(relative-to=jboss.server.config.dir,path=keycloak.truststore,credential-reference={clear-text=secret},type=JKS)"); + client.execute("/subsystem=elytron/trust-manager=twoWayTM:add(key-store=twoWayTS)"); + client.execute("/subsystem=elytron/server-ssl-context=httpsSSC:add(key-manager=httpsKM,protocols=[\"TLSv1.2\"],trust-manager=twoWayTM,want-client-auth=true)"); removeHttpsListener(client, administration); addHttpsListener(client); diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ServerTestEnricherUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ServerTestEnricherUtil.java index d1671dc56e..e0d24cac5c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ServerTestEnricherUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ServerTestEnricherUtil.java @@ -18,9 +18,7 @@ package org.keycloak.testsuite.arquillian; import org.jboss.logging.Logger; -import org.wildfly.extras.creaper.commands.undertow.AddUndertowListener; import org.wildfly.extras.creaper.commands.undertow.RemoveUndertowListener; -import org.wildfly.extras.creaper.commands.undertow.SslVerifyClient; import org.wildfly.extras.creaper.commands.undertow.UndertowListenerType; import org.wildfly.extras.creaper.core.CommandFailedException; import org.wildfly.extras.creaper.core.online.OnlineManagementClient; @@ -54,12 +52,9 @@ public class ServerTestEnricherUtil { public static boolean addHttpsListener(OnlineManagementClient client) { try { LOG.debug("Add Undertow HTTPS listener 'https'"); - client.apply(new AddUndertowListener.HttpsBuilder("https", "default-server", "https") - .securityRealm("UndertowRealm") - .verifyClient(SslVerifyClient.REQUESTED) - .build()); + client.execute("/subsystem=undertow/server=default-server/https-listener=https:add(ssl-context=httpsSSC, socket-binding=https)"); return true; - } catch (CommandFailedException e) { + } catch (Exception e) { LOG.warn("Cannot add HTTPS listener 'https'"); return false; } diff --git a/wildfly/extensions/pom.xml b/wildfly/extensions/pom.xml index aeeb908723..fc780af9ef 100755 --- a/wildfly/extensions/pom.xml +++ b/wildfly/extensions/pom.xml @@ -50,6 +50,24 @@ keycloak-server-spi-private provided + + org.jboss.resteasy + resteasy-core-spi + provided + 4.7.2.Final + + + org.jboss.resteasy + resteasy-client + provided + 4.7.2.Final + + + org.jboss.resteasy + resteasy-client-api + provided + 4.7.2.Final + org.keycloak keycloak-services diff --git a/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/DMRConfigProviderFactory.java b/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/DMRConfigProviderFactory.java index 38c5438136..c2ee6c7076 100644 --- a/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/DMRConfigProviderFactory.java +++ b/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/DMRConfigProviderFactory.java @@ -26,7 +26,7 @@ import java.util.Properties; import javax.servlet.ServletContext; import org.jboss.dmr.ModelNode; import org.jboss.logging.Logger; -import org.jboss.resteasy.spi.ResteasyProviderFactory; +import org.jboss.resteasy.core.ResteasyContext; import org.keycloak.Config; import org.keycloak.common.util.Resteasy; import org.keycloak.common.util.SystemEnvProperties; @@ -88,7 +88,7 @@ public class DMRConfigProviderFactory extends JsonConfigProviderFactory { private Map getPropertyOverrides() { - ServletContext context = ResteasyProviderFactory.getContextData(ServletContext.class); + ServletContext context = ResteasyContext.getContextData(ServletContext.class); Map propertyOverridesMap = new HashMap<>(); String propertyOverrides = context.getInitParameter(SERVER_CONTEXT_CONFIG_PROPERTY_OVERRIDES); diff --git a/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/Resteasy3Provider.java b/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/Resteasy3Provider.java index 590477fc97..acf35aaf8a 100644 --- a/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/Resteasy3Provider.java +++ b/wildfly/extensions/src/main/java/org/keycloak/provider/wildfly/Resteasy3Provider.java @@ -1,30 +1,29 @@ package org.keycloak.provider.wildfly; -import org.jboss.resteasy.core.Dispatcher; -import org.jboss.resteasy.spi.ResteasyProviderFactory; +import org.jboss.resteasy.core.ResteasyContext; import org.keycloak.common.util.ResteasyProvider; public class Resteasy3Provider implements ResteasyProvider { @Override public R getContextData(Class type) { - return ResteasyProviderFactory.getInstance().getContextData(type); + return ResteasyContext.getContextData(type); } @Override public void pushDefaultContextObject(Class type, Object instance) { - ResteasyProviderFactory.getInstance().getContextData(Dispatcher.class).getDefaultContextObjects() + ResteasyContext.getContextData(org.jboss.resteasy.spi.Dispatcher.class).getDefaultContextObjects() .put(type, instance); } @Override public void pushContext(Class type, Object instance) { - ResteasyProviderFactory.getInstance().pushContext(type, instance); + ResteasyContext.pushContext(type, instance); } @Override public void clearContextData() { - ResteasyProviderFactory.getInstance().clearContextData(); + ResteasyContext.clearContextData(); } } diff --git a/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/attributes/ProvidersListAttributeBuilder.java b/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/attributes/ProvidersListAttributeBuilder.java index cc1db14eae..8cd85aa887 100644 --- a/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/attributes/ProvidersListAttributeBuilder.java +++ b/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/attributes/ProvidersListAttributeBuilder.java @@ -29,7 +29,7 @@ public class ProvidersListAttributeBuilder extends StringListAttributeDefinition super("providers"); ModelNode provider = new ModelNode(); provider.add("classpath:${jboss.home.dir}/providers/*"); - this.defaultValue = provider; + setDefaultValue(provider); setAllowExpression(true); setRequired(false); } diff --git a/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/ProviderResourceDefinition.java b/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/ProviderResourceDefinition.java index 7b08868e49..626dc683c8 100644 --- a/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/ProviderResourceDefinition.java +++ b/wildfly/server-subsystem/src/main/java/org/keycloak/subsystem/server/extension/ProviderResourceDefinition.java @@ -49,7 +49,7 @@ public class ProviderResourceDefinition extends SimpleResourceDefinition { .setAllowExpression(true) .build(); - protected static final ReloadRequiredWriteAttributeHandler WRITE_ATTR_HANDLER = new ReloadRequiredWriteAttributeHandler(ENABLED); + protected static final ReloadRequiredWriteAttributeHandler WRITE_ATTR_HANDLER = new ReloadRequiredWriteAttributeHandler(ENABLED, PROPERTIES); protected ProviderResourceDefinition() { super(PathElement.pathElement(TAG_NAME), diff --git a/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-infinispan.xml b/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-infinispan.xml index 8348f71a48..71707c5baa 100755 --- a/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-infinispan.xml +++ b/wildfly/server-subsystem/src/main/resources/subsystem-templates/keycloak-infinispan.xml @@ -18,7 +18,7 @@ org.jboss.as.clustering.infinispan - +