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

ppalaga · Apr 30, 2018 · 7071049 · 7071049
1 parent 1f19dcd
commit 7071049
Show file tree

Hide file tree

Showing 17 changed files with 180 additions and 140 deletions.
diff --git a/config/pom.xml b/config/pom.xml
@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-parent</artifactId>
+            <artifactId>component-matrix</artifactId>
             <version>${version.wildfly}</version>
             <scope>test</scope>
             <type>pom</type>
@@ -117,11 +117,11 @@
                     <tasks>
                         <echo>${basedir}/../pom.xml</echo>
                         <echo>${maven.dependency.org.apache.camel.camel-parent.pom.path}</echo>
-                        <echo>${maven.dependency.org.wildfly.wildfly-parent.pom.path}</echo>
+                        <echo>${maven.dependency.org.wildfly.component-matrix.pom.path}</echo>
                         <propertyfile file="target/pom-paths.txt">
                             <entry key="wildfly-camel" value="${basedir}/../pom.xml" />
                             <entry key="camel-parent" value="${maven.dependency.org.apache.camel.camel-parent.pom.path}" />
-                            <entry key="wildfly-parent" value="${maven.dependency.org.wildfly.wildfly-parent.pom.path}" />
+                            <entry key="wildfly-component-matrix" value="${maven.dependency.org.wildfly.component-matrix.pom.path}" />
                         </propertyfile>
                         <copy file="${project.build.directory}/${jboss.server.name}/standalone/configuration/standalone.xml" todir="${project.build.testOutputDirectory}" overwrite="true" />
                     </tasks>

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;
@@ -54,6 +54,7 @@ public void testStandaloneConfig() throws Exception {
 
         ConfigPlugin plugin = new WildFlyCamelConfigPlugin();
         ConfigContext context = ConfigSupport.createContext(null, Paths.get(resurl.toURI()), doc);
+        System.out.println("Paths.get(resurl.toURI()) = "+ Paths.get(resurl.toURI()));
         plugin.applyStandaloneConfigChange(context, true);
 
         // Verify extension
@@ -82,7 +83,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/config/src/test/java/org/wildfly/camel/test/config/VersionsValidatorTest.java b/config/src/test/java/org/wildfly/camel/test/config/VersionsValidatorTest.java
@@ -50,7 +50,7 @@ public class VersionsValidatorTest {
     public void before() throws Exception {
         camelRoot = getRootNode("camel-parent");
         wfcRoot = getRootNode("wildfly-camel");
-        wfRoot = getRootNode("wildfly-parent");
+        wfRoot = getRootNode("wildfly-component-matrix");
 
         mapping.put("version.camel.apns", "java-apns-version");
         mapping.put("version.camel.jgroups", "jgroups-version");

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"/>

diff --git a/feature/modules/etc/smartics/other-modules.xml b/feature/modules/etc/smartics/other-modules.xml
@@ -1617,7 +1617,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>