[resolves #2272] Upgrade to wildfly-12.0.0 - WIP

Blocked by [#2400] Upgrade to wildfly-build-tools 1.2.6 breaks the ability to include a war in a feature pack
wildfly-extras · Jan 30, 2018 · 297e656 · 297e656
1 parent b48de06
commit 297e656
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 113 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_50 = Namespace.getNamespace("urn:jboss:domain:5.0");
+    public static final Namespace NS_DOMAIN_60 = Namespace.getNamespace("urn:jboss:domain:6.0");
 
-    public static final Namespace[] NS_DOMAINS = new Namespace[] { NS_DOMAIN_50 };
+    public static final Namespace[] NS_DOMAINS = new Namespace[] { NS_DOMAIN_60 };
 
     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_50;
+import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAIN_60;
 import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_SECURITY;
 
 import java.io.File;
@@ -81,7 +81,7 @@ public void testUnsupportedNamespaceVersion() throws Exception {
         SAXBuilder jdom = new SAXBuilder();
         Document doc = jdom.build(resurl);
 
-        doc.getRootElement().getChild("extensions", NS_DOMAIN_50).setNamespace(Namespace.getNamespace("urn:jboss:domain:99.99"));
+        doc.getRootElement().getChild("extensions", NS_DOMAIN_60).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/common/etc/smartics/wildfly-modules.xml b/feature/common/etc/smartics/wildfly-modules.xml
@@ -302,6 +302,10 @@
         <include artifact=":neethi" />
     </module>
 
+    <module name="org.apache.qpid.proton" skip="true">
+        <include artifact="org.apache.qpid:proton-j" />
+    </module>
+
     <module name="org.apache.santuario.xmlsec" skip="true">
         <include artifact="org.apache.santuario:xmlsec" />
     </module>

diff --git a/feature/extrasB/etc/wildfly-feature-pack.xml b/feature/extrasB/etc/wildfly-feature-pack.xml
@@ -6,10 +6,10 @@
     </dependencies>
     <artifact-versions>
         <artifact groupId="com.carrotsearch" artifactId="hppc" version="0.7.1"/>
-        <artifact groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.8.9"/>
-        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-cbor" version="2.8.9"/>
-        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-smile" version="2.8.9"/>
-        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-yaml" version="2.8.9"/>
+        <artifact groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.8.11"/>
+        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-cbor" version="2.8.11"/>
+        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-smile" version="2.8.11"/>
+        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-yaml" version="2.8.11"/>
         <artifact groupId="com.google.guava" artifactId="guava" version="18.0"/>
         <artifact groupId="com.ning" artifactId="compress-lzf" version="1.0.2"/>
         <artifact groupId="com.spatial4j" artifactId="spatial4j" version="0.5"/>

diff --git a/feature/modules/etc/smartics/other-modules.xml b/feature/modules/etc/smartics/other-modules.xml
@@ -1319,13 +1319,6 @@
         </dependencies>
     </module>
 
-    <module name="org.apache.qpid.proton" slot="0.16">
-        <properties>
-            <property name="jboss.api" value="private"/>
-        </properties>
-        <include artifact="org.apache.qpid:proton-(.*)" />
-    </module>
-
     <module name="org.apache.sshd">
         <properties>
             <property name="jboss.api" value="private"/>

diff --git a/feature/modules/etc/wildfly-feature-pack.xml b/feature/modules/etc/wildfly-feature-pack.xml
diff --git a/...main/resources/modules/system/layers/fuse/org/apache/camel/component/amqp/main/module.xml b/...main/resources/modules/system/layers/fuse/org/apache/camel/component/amqp/main/module.xml
@@ -12,6 +12,6 @@
     <module name="javax.xml.bind.api" />
     <module name="org.apache.camel.component.jms" />
     <module name="org.apache.qpid" />
-    <module name="org.apache.qpid.proton" slot="0.16" />
+    <module name="org.apache.qpid.proton" />
   </dependencies>
 </module>
diff --git a/...ure/modules/src/main/resources/modules/system/layers/fuse/org/apache/qpid/main/module.xml b/...ure/modules/src/main/resources/modules/system/layers/fuse/org/apache/qpid/main/module.xml
@@ -11,7 +11,7 @@
     <module name="javax.api" />
     <module name="javax.xml.bind.api" />
     <module name="javax.jms.api" />
-    <module name="org.apache.qpid.proton" slot="0.16" />
+    <module name="org.apache.qpid.proton" />
     <module name="org.slf4j" />
   </dependencies>
 </module>
diff --git a/...ules/src/main/resources/modules/system/layers/fuse/org/apache/qpid/proton/0.16/module.xml b/...ules/src/main/resources/modules/system/layers/fuse/org/apache/qpid/proton/0.16/module.xml
diff --git a/patch/etc/baseline/module-list.txt b/patch/etc/baseline/module-list.txt
@@ -20,14 +20,14 @@
 /com/damnhandy/main/handy-uri-templates-2.1.6.jar
 /com/eclipsesource/minimal/json/main/minimal-json-0.9.1.jar
 /com/fasterxml/aalto/main/aalto-xml-0.9.10.jar
-/com/fasterxml/jackson/dataformat/cbor/main/jackson-dataformat-cbor-2.8.9.jar
-/com/fasterxml/jackson/dataformat/smile/main/jackson-dataformat-smile-2.8.9.jar
-/com/fasterxml/jackson/dataformat/xml/main/jackson-dataformat-xml-2.8.9.jar
-/com/fasterxml/jackson/dataformat/yaml/main/jackson-dataformat-yaml-2.8.9.jar
-/com/fasterxml/jackson/datatype/jackson-datatype-guava/main/jackson-datatype-guava-2.8.9.jar
-/com/fasterxml/jackson/datatype/joda/main/jackson-datatype-joda-2.8.9.jar
-/com/fasterxml/jackson/module/afterburner/main/jackson-module-afterburner-2.8.9.jar
-/com/fasterxml/jackson/module/jsonSchema/main/jackson-module-jsonSchema-2.8.9.jar
+/com/fasterxml/jackson/dataformat/cbor/main/jackson-dataformat-cbor-2.8.11.jar
+/com/fasterxml/jackson/dataformat/smile/main/jackson-dataformat-smile-2.8.11.jar
+/com/fasterxml/jackson/dataformat/xml/main/jackson-dataformat-xml-2.8.11.jar
+/com/fasterxml/jackson/dataformat/yaml/main/jackson-dataformat-yaml-2.8.11.jar
+/com/fasterxml/jackson/datatype/jackson-datatype-guava/main/jackson-datatype-guava-2.8.11.jar
+/com/fasterxml/jackson/datatype/joda/main/jackson-datatype-joda-2.8.11.jar
+/com/fasterxml/jackson/module/afterburner/main/jackson-module-afterburner-2.8.11.jar
+/com/fasterxml/jackson/module/jsonSchema/main/jackson-module-jsonSchema-2.8.11.jar
 /com/github/docker/java/main/docker-java-3.0.13.jar
 /com/github/generex/main/generex-1.0.1.jar
 /com/google/api-client/google-api-client/main/google-api-client-1.22.0.jar
@@ -582,7 +582,6 @@
 /org/apache/pdfbox/main/jempbox-1.8.13.jar
 /org/apache/pdfbox/main/pdfbox-1.8.13.jar
 /org/apache/qpid/main/qpid-jms-client-0.11.1.jar
-/org/apache/qpid/proton/0.16/proton-j-0.16.0.jar
 /org/apache/sshd/main/sshd-core-1.6.0.jar
 /org/apache/thrift/main/libthrift-0.10.0.jar
 /org/apache/tika/main/tika-core-1.7.jar
@@ -751,8 +750,8 @@
 /org/springframework/ws/main/spring-xml-2.3.0.RELEASE.jar
 /org/w3c/css/sac/main/sac-1.3.jar
 /org/wildfly/extension/camel/main/gravia-container-wildfly-extension-1.3.1.jar
-/org/wildfly/extras/config/main/fuse-patch-config-3.0.0.jar
-/org/wildfly/extras/patch/main/fuse-patch-core-3.0.0.jar
+/org/wildfly/extras/config/main/fuse-patch-config-4.0.0-SNAPSHOT.jar
+/org/wildfly/extras/patch/main/fuse-patch-core-4.0.0-SNAPSHOT.jar
 /org/xerial/snappy/main/snappy-java-1.1.1.3.jar
 /xmlenc/main/xmlenc-0.52.jar
 /xmlpull/main/xmlpull-1.1.3.1.jar

diff --git a/pom.xml b/pom.xml
@@ -58,10 +58,10 @@
         <version.camel.qpid.proton>0.16.0</version.camel.qpid.proton>
 
         <!-- WildFly versions -->
-        <version.wildfly>11.0.0.Final</version.wildfly>
+        <version.wildfly>12.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <version.wildfly.arquillian>2.1.0.Final</version.wildfly.arquillian>
         <version.wildfly.cxf>3.1.12</version.wildfly.cxf>
-        <version.wildfly.fasterxml.jackson>2.8.9</version.wildfly.fasterxml.jackson>
+        <version.wildfly.fasterxml.jackson>2.8.11</version.wildfly.fasterxml.jackson>
         <version.wildfly.infinispan>8.2.8.Final</version.wildfly.infinispan>
 
         <!-- Other versions -->
@@ -77,7 +77,7 @@
         <version.arquillian.cube>1.6.0</version.arquillian.cube>
         <version.eclipse.egit.github>2.1.5</version.eclipse.egit.github>
         <version.flapdoodle.embed.mongo>1.50.1</version.flapdoodle.embed.mongo>
-        <version.fusepatch>3.0.0</version.fusepatch>
+        <version.fusepatch>4.0.0-SNAPSHOT</version.fusepatch>
         <version.greenmail>1.4.0</version.greenmail>
         <version.hawtio>1.5.7</version.hawtio>
         <version.javax.cache.api>1.0.0</version.javax.cache.api>
@@ -121,7 +121,7 @@
         <version-properties-maven-plugin>1.0.0</version-properties-maven-plugin>
         <version-shrinkwrap-resolver-maven-plugin>2.2.6</version-shrinkwrap-resolver-maven-plugin>
         <version-smartics-maven-plugin>2.1.4</version-smartics-maven-plugin>
-        <version-wildfly-build-tools>1.1.6.Final</version-wildfly-build-tools>
+        <version-wildfly-build-tools>1.2.6.Final</version-wildfly-build-tools>
         <version-wildfly-maven-plugin>1.2.0.Final</version-wildfly-maven-plugin>
 
         <!-- GitHub -->

diff --git a/subsystem/core/src/main/java/org/wildfly/extension/camel/parser/CamelSubsystemAdd.java b/subsystem/core/src/main/java/org/wildfly/extension/camel/parser/CamelSubsystemAdd.java
@@ -58,9 +58,9 @@ public final class CamelSubsystemAdd extends AbstractBoottimeAddStepHandler {
     public static final int DEPENDENCIES_CAMEL_INTEGRATION = Phase.DEPENDENCIES_LOGGING + 0x01;
     public static final int DEPENDENCIES_CAMEL_WIRINGS = DEPENDENCIES_CAMEL_INTEGRATION + 0x01;
 
-    public static final int INSTALL_PACKAGE_SCAN_RESOLVER = Phase.INSTALL_BUNDLE_ACTIVATE + 0x01;
+    public static final int INSTALL_PACKAGE_SCAN_RESOLVER = Phase.INSTALL_PERSISTENCE_SERVICES + 0x01;
     public static final int INSTALL_CDI_BEAN_ARCHIVE_PROCESSOR = INSTALL_PACKAGE_SCAN_RESOLVER + 0x01;
-    public static final int INSTALL_CAMEL_CONTEXT_CREATE = INSTALL_CDI_BEAN_ARCHIVE_PROCESSOR +0x01;
+    public static final int INSTALL_CAMEL_CONTEXT_CREATE = INSTALL_CDI_BEAN_ARCHIVE_PROCESSOR + 0x01;
     public static final int INSTALL_CONTEXT_ACTIVATION = INSTALL_CAMEL_CONTEXT_CREATE + 0x01;
 
     private final SubsystemState subsystemState;
@@ -113,9 +113,4 @@ public void accept(CamelSubsytemExtension plugin) {
             }
         }, OperationContext.Stage.RUNTIME);
     }
-
-    @Override
-    protected boolean requiresRuntimeVerification() {
-        return false;
-    }
 }