[resolves #2634] Upgrade to WildFly 15.0.0.Final - WIP

Signed-off-by: Thomas Diesler <tdiesler@redhat.com>
wildfly-extras · Oct 2, 2018 · e48b930 · e48b930
1 parent 80b2486
commit e48b930
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 54 deletions.
diff --git a/config/src/main/java/org/wildfly/extension/camel/config/WildFlyCamelConfigPlugin.java b/config/src/main/java/org/wildfly/extension/camel/config/WildFlyCamelConfigPlugin.java
@@ -30,9 +30,9 @@
 
 public final class WildFlyCamelConfigPlugin implements ConfigPlugin {
 
-    public static final Namespace NS_DOMAIN_80 = Namespace.getNamespace("urn:jboss:domain:8.0");
+    public static final Namespace NS_DOMAIN_90 = Namespace.getNamespace("urn:jboss:domain:9.0");
 
-    public static final Namespace[] NS_DOMAINS = new Namespace[] { NS_DOMAIN_80 };
+    public static final Namespace[] NS_DOMAINS = new Namespace[] { NS_DOMAIN_90 };
 
     public static final Namespace NS_CAMEL = Namespace.getNamespace("urn:jboss:domain:camel:1.0");
     public static final Namespace NS_SECURITY = Namespace.getNamespace("urn:jboss:domain:security:2.0");

diff --git a/config/src/test/java/org/wildfly/camel/test/config/StandaloneConfigTest.java b/config/src/test/java/org/wildfly/camel/test/config/StandaloneConfigTest.java
@@ -17,7 +17,7 @@
 
 import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_CAMEL;
 import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAINS;
-import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAIN_80;
+import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAIN_90;
 import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_SECURITY;
 
 import java.io.File;
@@ -82,7 +82,7 @@ public void testUnsupportedNamespaceVersion() throws Exception {
         SAXBuilder jdom = new SAXBuilder();
         Document doc = jdom.build(resurl);
 
-        doc.getRootElement().getChild("extensions", NS_DOMAIN_80).setNamespace(Namespace.getNamespace("urn:jboss:domain:99.99"));
+        doc.getRootElement().getChild("extensions", NS_DOMAIN_90).setNamespace(Namespace.getNamespace("urn:jboss:domain:99.99"));
 
         File modifiedConfig = new File("target/standalone-modified.xml");
         outputDocumentContent(doc, new FileOutputStream(modifiedConfig));

diff --git a/feature/modules/etc/wildfly-feature-pack.xml b/feature/modules/etc/wildfly-feature-pack.xml
@@ -232,7 +232,7 @@
         <artifact groupId="io.undertow" artifactId="undertow-core" version="2.0.13.Final"/>
         <artifact groupId="io.undertow" artifactId="undertow-servlet" version="2.0.13.Final"/>
         <artifact groupId="io.undertow" artifactId="undertow-websockets-jsr" version="2.0.13.Final"/>
-        <artifact groupId="io.undertow.jastow" artifactId="jastow" version="2.0.5.Final"/>
+        <artifact groupId="io.undertow.jastow" artifactId="jastow" version="2.0.6.Final"/>
         <artifact groupId="io.vertx" artifactId="vertx-core" version="3.5.2"/>
         <artifact groupId="io.zipkin.brave" artifactId="brave" version="5.1.2"/>
         <artifact groupId="io.zipkin.reporter2" artifactId="zipkin-reporter" version="2.7.6"/>
@@ -724,11 +724,11 @@
         <artifact groupId="org.igniterealtime.smack" artifactId="smack-resolver-javax" version="4.2.4"/>
         <artifact groupId="org.igniterealtime.smack" artifactId="smack-sasl-javax" version="4.2.4"/>
         <artifact groupId="org.igniterealtime.smack" artifactId="smack-tcp" version="4.2.4"/>
-        <artifact groupId="org.infinispan" artifactId="infinispan-client-hotrod" version="9.3.1.Final"/>
-        <artifact groupId="org.infinispan" artifactId="infinispan-commons" version="9.3.1.Final"/>
-        <artifact groupId="org.infinispan" artifactId="infinispan-core" version="9.3.1.Final"/>
-        <artifact groupId="org.infinispan" artifactId="infinispan-jcache" version="9.3.1.Final"/>
-        <artifact groupId="org.infinispan" artifactId="infinispan-jcache-commons" version="9.3.1.Final"/>
+        <artifact groupId="org.infinispan" artifactId="infinispan-client-hotrod" version="9.3.3.Final"/>
+        <artifact groupId="org.infinispan" artifactId="infinispan-commons" version="9.3.3.Final"/>
+        <artifact groupId="org.infinispan" artifactId="infinispan-core" version="9.3.3.Final"/>
+        <artifact groupId="org.infinispan" artifactId="infinispan-jcache" version="9.3.3.Final"/>
+        <artifact groupId="org.infinispan" artifactId="infinispan-jcache-commons" version="9.3.3.Final"/>
         <artifact groupId="org.infinispan" artifactId="infinispan-query-dsl" version="9.1.7.Final"/>
         <artifact groupId="org.influxdb" artifactId="influxdb-java" version="2.10"/>
         <artifact groupId="org.iq80.leveldb" artifactId="leveldb" version="0.10"/>
@@ -747,12 +747,12 @@
         <artifact groupId="org.jboss.logmanager" artifactId="jboss-logmanager" version="2.1.4.Final"/>
         <artifact groupId="org.jboss.marshalling" artifactId="jboss-marshalling" version="2.0.6.Final"/>
         <artifact groupId="org.jboss.marshalling" artifactId="jboss-marshalling-river" version="2.0.6.Final"/>
-        <artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-common" version="11.0.0.Final"/>
-        <artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-ear" version="11.0.0.Final"/>
-        <artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-ejb" version="11.0.0.Final"/>
-        <artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-web" version="11.0.0.Final"/>
+        <artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-common" version="12.0.0.Final"/>
+        <artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-ear" version="12.0.0.Final"/>
+        <artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-ejb" version="12.0.0.Final"/>
+        <artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-web" version="12.0.0.Final"/>
         <artifact groupId="org.jboss.modules" artifactId="jboss-modules" version="1.8.6.Final"/>
-        <artifact groupId="org.jboss.msc" artifactId="jboss-msc" version="1.4.3.Final"/>
+        <artifact groupId="org.jboss.msc" artifactId="jboss-msc" version="1.4.5.Final"/>
         <artifact groupId="org.jboss.narayana.compensations" artifactId="compensations" version="5.9.0.Final"/>
         <artifact groupId="org.jboss.narayana.jts" artifactId="narayana-jts-idlj" version="5.9.0.Final"/>
         <artifact groupId="org.jboss.narayana.jts" artifactId="narayana-jts-integration" version="5.9.0.Final"/>
@@ -855,20 +855,20 @@
         <artifact groupId="org.twitter4j" artifactId="twitter4j-stream" version="4.0.6"/>
         <artifact groupId="org.uberfire" artifactId="uberfire-maven-support" version="1.3.0.Final"/>
         <artifact groupId="org.w3c.css" artifactId="sac" version="1.3"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-clustering-common" version="14.0.1.Final"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-clustering-infinispan-spi" version="14.0.1.Final"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-clustering-marshalling-api" version="14.0.1.Final"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-clustering-marshalling-spi" version="14.0.1.Final"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-clustering-service" version="14.0.1.Final"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-ee" version="14.0.1.Final"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-feature-pack" version="14.0.1.Final" extension="zip"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-iiop-openjdk" version="14.0.1.Final"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-naming" version="14.0.1.Final"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-clustering-common" version="15.0.0.Alpha1-SNAPSHOT"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-clustering-infinispan-spi" version="15.0.0.Alpha1-SNAPSHOT"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-clustering-marshalling-api" version="15.0.0.Alpha1-SNAPSHOT"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-clustering-marshalling-spi" version="15.0.0.Alpha1-SNAPSHOT"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-clustering-service" version="15.0.0.Alpha1-SNAPSHOT"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-ee" version="15.0.0.Alpha1-SNAPSHOT"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-feature-pack" version="15.0.0.Alpha1-SNAPSHOT" extension="zip"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-iiop-openjdk" version="15.0.0.Alpha1-SNAPSHOT"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-naming" version="15.0.0.Alpha1-SNAPSHOT"/>
         <artifact groupId="org.wildfly" artifactId="wildfly-naming-client" version="1.0.9.Final"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-security" version="14.0.1.Final"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-transactions" version="14.0.1.Final"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-undertow" version="14.0.1.Final"/>
-        <artifact groupId="org.wildfly" artifactId="wildfly-web-common" version="14.0.1.Final"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-security" version="15.0.0.Alpha1-SNAPSHOT"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-transactions" version="15.0.0.Alpha1-SNAPSHOT"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-undertow" version="15.0.0.Alpha1-SNAPSHOT"/>
+        <artifact groupId="org.wildfly" artifactId="wildfly-web-common" version="15.0.0.Alpha1-SNAPSHOT"/>
         <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-common" version="8.0.0-SNAPSHOT"/>
         <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-config" version="8.0.0-SNAPSHOT"/>
         <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-cxf-undertow" version="8.0.0-SNAPSHOT"/>
@@ -878,24 +878,24 @@
         <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-subsystem-undertow" version="8.0.0-SNAPSHOT"/>
         <artifact groupId="org.wildfly.client" artifactId="wildfly-client-config" version="1.0.1.Final"/>
         <artifact groupId="org.wildfly.common" artifactId="wildfly-common" version="1.4.0.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-controller" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-controller-client" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-core-management-client" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-core-security" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-core-security-api" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-deployment-repository" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-domain-http-interface" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-domain-management" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-io" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-network" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-platform-mbean" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-process-controller" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-protocol" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-remoting" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-request-controller" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-server" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.core" artifactId="wildfly-version" version="6.0.2.Final"/>
-        <artifact groupId="org.wildfly.security" artifactId="wildfly-elytron" version="1.6.0.Final"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-controller" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-controller-client" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-core-management-client" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-core-security" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-core-security-api" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-deployment-repository" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-domain-http-interface" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-domain-management" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-io" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-network" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-platform-mbean" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-process-controller" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-protocol" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-remoting" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-request-controller" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-server" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.core" artifactId="wildfly-version" version="7.0.0.Alpha1"/>
+        <artifact groupId="org.wildfly.security" artifactId="wildfly-elytron" version="1.6.1.Final"/>
         <artifact groupId="org.wildfly.security.elytron-web" artifactId="undertow-server" version="1.2.3.Final"/>
         <artifact groupId="org.wildfly.security.elytron-web" artifactId="undertow-server-servlet" version="1.2.3.Final"/>
         <artifact groupId="org.wildfly.transaction" artifactId="wildfly-transaction-client" version="1.1.2.Final"/>

diff --git a/itests/standalone/basic/src/test/java/org/wildfly/camel/test/cdi/CDIContextCreationTest.java b/itests/standalone/basic/src/test/java/org/wildfly/camel/test/cdi/CDIContextCreationTest.java
@@ -101,8 +101,7 @@ public void testManualComponentConfig() throws InterruptedException {
             Assert.assertEquals(ServiceStatus.Started, camelctx.getStatus());
 
             MockEndpoint mock = camelctx.getEndpoint(RouteBuilderF.MOCK_RESULT_URI, MockEndpoint.class);
-            Assert.assertTrue("All messages received", mock.await(500, TimeUnit.MILLISECONDS));
-            Assert.assertEquals(3, mock.getExpectedCount());
+            Assert.assertTrue("All messages received", mock.await(5, TimeUnit.SECONDS));
         } finally {
             deployer.undeploy(CDI_CONTEXT_C);
         }

diff --git a/itests/standalone/basic/src/test/java/org/wildfly/camel/test/cdi/subA/RouteBuilderF.java b/itests/standalone/basic/src/test/java/org/wildfly/camel/test/cdi/subA/RouteBuilderF.java
@@ -35,11 +35,13 @@
 @ContextName("contextF")
 public class RouteBuilderF extends RouteBuilder {
 
-    public static final String MOCK_RESULT_URI = "mock:result?expectedCount=3";
+    public static final String MOCK_RESULT_URI = "mock:result?expectedMinimumCount=1";
 
     @Override
     public void configure() throws Exception {
 
+        log.info("Configure: {}", getClass().getName());
+
         final CountDownLatch startLatch = new CountDownLatch(1);
 
         // verify that a component can be added manually
@@ -51,10 +53,11 @@ public void onCamelContextStarted(CamelContext context, boolean alreadyStarted)
             }
         });
 
-        from("quartz2://mytimer?trigger.repeatCount=3&trigger.repeatInterval=100")
+        from("quartz2://mytimer?trigger.repeatCount=3&trigger.repeatInterval=100&fireNow=true")
         .process(new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
+                log.info("Process: {}", exchange);
                 if (startLatch.getCount() > 0)
                     throw new IllegalStateException("onCamelContextStarted not called");
             }

diff --git a/patch/etc/baseline/module-list.txt b/patch/etc/baseline/module-list.txt
@@ -724,8 +724,8 @@
 /org/igniterealtime/main/smack-resolver-javax-4.2.4.jar
 /org/igniterealtime/main/smack-sasl-javax-4.2.4.jar
 /org/igniterealtime/main/smack-tcp-4.2.4.jar
-/org/infinispan/jcache/main/infinispan-jcache-9.3.1.Final.jar
-/org/infinispan/jcache/main/infinispan-jcache-commons-9.3.1.Final.jar
+/org/infinispan/jcache/main/infinispan-jcache-9.3.3.Final.jar
+/org/infinispan/jcache/main/infinispan-jcache-commons-9.3.3.Final.jar
 /org/infinispan/query/dsl/main/infinispan-query-dsl-9.1.7.Final.jar
 /org/iq80/leveldb/main/leveldb-0.10.jar
 /org/iq80/leveldb/main/leveldb-api-0.10.jar

diff --git a/pom.xml b/pom.xml
@@ -63,11 +63,11 @@
         <version.camel.rxjava2>2.1.16</version.camel.rxjava2>
 
         <!-- WildFly versions -->
-        <version.wildfly>14.0.1.Final</version.wildfly>
+        <version.wildfly>15.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <version.wildfly.arquillian>2.1.1.Final</version.wildfly.arquillian>
         <version.wildfly.cxf>3.2.5-jbossorg-1</version.wildfly.cxf>
         <version.wildfly.fasterxml.jackson>2.9.5</version.wildfly.fasterxml.jackson>
-        <version.wildfly.infinispan>9.3.1.Final</version.wildfly.infinispan>
+        <version.wildfly.infinispan>9.3.3.Final</version.wildfly.infinispan>
         <version.wildfly.okhttp3>3.9.0</version.wildfly.okhttp3>
 
         <!-- Other versions -->