[resolves wildfly-extras#2430] Upgrade to wildfly-13.0.0

ppalaga · Jun 5, 2018 · b6cdf50 · b6cdf50
1 parent 895d4b2
commit b6cdf50
Show file tree

Hide file tree

Showing 19 changed files with 198 additions and 152 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -67,6 +67,13 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.wildfly.arquillian</groupId>
+                <artifactId>wildfly-arquillian-parent</artifactId>
+                <version>${version.wildfly.arquillian}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
 
             <dependency>
                 <groupId>org.wildfly.camel</groupId>

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_60 = Namespace.getNamespace("urn:jboss:domain:6.0");
+    public static final Namespace NS_DOMAIN_70 = Namespace.getNamespace("urn:jboss:domain:7.0");
 
-    public static final Namespace[] NS_DOMAINS = new Namespace[] { NS_DOMAIN_60 };
+    public static final Namespace[] NS_DOMAINS = new Namespace[] { NS_DOMAIN_70 };
 
     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_60;
+import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAIN_70;
 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_60).setNamespace(Namespace.getNamespace("urn:jboss:domain:99.99"));
+        doc.getRootElement().getChild("extensions", NS_DOMAIN_70).setNamespace(Namespace.getNamespace("urn:jboss:domain:99.99"));
 
         File modifiedConfig = new File("target/standalone-modified.xml");
         outputDocumentContent(doc, new FileOutputStream(modifiedConfig));

diff --git a/docker/pom.xml b/docker/pom.xml
@@ -37,7 +37,7 @@
     <!-- Properties -->
     <properties>
         <docker.image.name>wildflyext/wildfly-camel</docker.image.name>
-        <docker.image.from>openshift/wildfly-120-centos7:latest</docker.image.from>
+        <docker.image.from>openshift/wildfly-130-centos7:latest</docker.image.from>
         <docker.image.maintainer>Thomas Diesler tdiesler@redhat.com</docker.image.maintainer>
         <docker.image.version>latest</docker.image.version>
         <docker.removeAll>true</docker.removeAll>

diff --git a/feature/extrasA/etc/wildfly-feature-pack.xml b/feature/extrasA/etc/wildfly-feature-pack.xml
@@ -88,7 +88,7 @@
         <artifact groupId="org.kie.remote.ws" artifactId="kie-remote-ws-common" version="6.5.0.Final"/>
         <artifact groupId="org.slf4j" artifactId="slf4j-api" version="1.7.10"/>
         <artifact groupId="org.tukaani" artifactId="xz" version="1.0"/>
-        <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-feature-modules" version="6.1.0-SNAPSHOT" extension="zip"/>
+        <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-feature-modules" version="6.2.0-SNAPSHOT" extension="zip"/>
         <artifact groupId="org.xerial.snappy" artifactId="snappy-java" version="1.0.4.1"/>
         <artifact groupId="rome" artifactId="rome" version="1.0"/>
         <artifact groupId="wsdl4j" artifactId="wsdl4j" version="1.6.3"/>

diff --git a/feature/extrasB/etc/wildfly-feature-pack.xml b/feature/extrasB/etc/wildfly-feature-pack.xml
@@ -6,11 +6,11 @@
     </dependencies>
     <artifact-versions>
         <artifact groupId="com.carrotsearch" artifactId="hppc" version="0.7.1"/>
-        <artifact groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.9.4"/>
-        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-cbor" version="2.9.4"/>
-        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-smile" version="2.9.4"/>
-        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-yaml" version="2.9.4"/>
-        <artifact groupId="com.fasterxml.jackson.jr" artifactId="jackson-jr-objects" version="2.9.4"/>
+        <artifact groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.9.5"/>
+        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-cbor" version="2.9.5"/>
+        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-smile" version="2.9.5"/>
+        <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-yaml" version="2.9.5"/>
+        <artifact groupId="com.fasterxml.jackson.jr" artifactId="jackson-jr-objects" version="2.9.5"/>
         <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"/>
@@ -39,7 +39,7 @@
         <artifact groupId="org.elasticsearch" artifactId="securesm" version="1.0"/>
         <artifact groupId="org.hdrhistogram" artifactId="HdrHistogram" version="2.1.6"/>
         <artifact groupId="org.slf4j" artifactId="slf4j-api" version="1.7.25"/>
-        <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-feature-extrasA" version="6.1.0-SNAPSHOT" extension="zip"/>
+        <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-feature-extrasA" version="6.2.0-SNAPSHOT" extension="zip"/>
         <artifact groupId="org.yaml" artifactId="snakeyaml" version="1.18"/>
     </artifact-versions>
 </feature-pack>
diff --git a/feature/extrasC/etc/wildfly-feature-pack.xml b/feature/extrasC/etc/wildfly-feature-pack.xml
@@ -18,6 +18,6 @@
         <artifact groupId="org.apache.jclouds" artifactId="jclouds-core" version="2.1.0"/>
         <artifact groupId="org.apache.jclouds" artifactId="jclouds-scriptbuilder" version="2.1.0"/>
         <artifact groupId="org.slf4j" artifactId="slf4j-api" version="1.7.25"/>
-        <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-feature-extrasB" version="6.1.0-SNAPSHOT" extension="zip"/>
+        <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-feature-extrasB" version="6.2.0-SNAPSHOT" extension="zip"/>
     </artifact-versions>
 </feature-pack>
diff --git a/feature/modules/etc/smartics/other-modules.xml b/feature/modules/etc/smartics/other-modules.xml
@@ -1669,7 +1669,7 @@
         <include artifact="org.apache.xmlgraphics:fop" />
         <include artifact="org.apache.xmlgraphics:xmlgraphics-commons" />
         <dependencies>
-            <module name="javax.api" />
+            <module name="jdk.xml.dom" />
             <module name="org.apache.avalon.framework" />
         </dependencies>
     </module>