Skip to content

Commit

Permalink
[resolves #2272] Upgrade to wildfly-12.0.0 - WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@tdiesler
tdiesler committed Jan 4, 2018
1 parent 175ae7a commit 970d387
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 74 deletions.
4 changes: 2 additions & 2 deletions config/src/main/java/org/wildfly/extension/camel/config/WildFlyCamelConfigPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions config/src/test/java/org/wildfly/camel/test/config/StandaloneConfigTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
4 changes: 4 additions & 0 deletions feature/common/etc/smartics/wildfly-modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,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>
Expand Down
7 changes: 0 additions & 7 deletions feature/modules/etc/smartics/other-modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1308,13 +1308,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"/>
Expand Down
92 changes: 46 additions & 46 deletions feature/modules/etc/wildfly-feature-pack.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@
<artifact groupId="io.swagger" artifactId="swagger-jaxrs" version="1.5.16"/>
<artifact groupId="io.swagger" artifactId="swagger-models" version="1.5.16"/>
<artifact groupId="io.swagger" artifactId="swagger-parser" version="1.0.30"/>
<artifact groupId="io.undertow" artifactId="undertow-core" version="1.4.18.Final"/>
<artifact groupId="io.undertow" artifactId="undertow-servlet" version="1.4.18.Final"/>
<artifact groupId="io.undertow" artifactId="undertow-websockets-jsr" version="1.4.18.Final"/>
<artifact groupId="io.undertow" artifactId="undertow-core" version="1.4.21.Final"/>
<artifact groupId="io.undertow" artifactId="undertow-servlet" version="1.4.21.Final"/>
<artifact groupId="io.undertow" artifactId="undertow-websockets-jsr" version="1.4.21.Final"/>
<artifact groupId="io.undertow.jastow" artifactId="jastow" version="2.0.2.Final"/>
<artifact groupId="io.vertx" artifactId="vertx-core" version="3.4.2"/>
<artifact groupId="io.zipkin.brave" artifactId="brave-core" version="4.5.2"/>
Expand All @@ -210,7 +210,7 @@
<artifact groupId="io.zipkin.reporter" artifactId="zipkin-reporter" version="1.0.1"/>
<artifact groupId="javax.activation" artifactId="activation" version="1.1.1"/>
<artifact groupId="javax.cache" artifactId="cache-api" version="1.0.0"/>
<artifact groupId="javax.enterprise" artifactId="cdi-api" version="1.2"/>
<artifact groupId="javax.enterprise" artifactId="cdi-api" version="2.0"/>
<artifact groupId="javax.inject" artifactId="javax.inject" version="1"/>
<artifact groupId="javax.validation" artifactId="validation-api" version="1.1.0.Final"/>
<artifact groupId="jaxen" artifactId="jaxen" version="1.1.6"/>
Expand Down Expand Up @@ -665,7 +665,7 @@
<artifact groupId="org.iq80.leveldb" artifactId="leveldb-api" version="0.9"/>
<artifact groupId="org.jasypt" artifactId="jasypt" version="1.9.2"/>
<artifact groupId="org.javassist" artifactId="javassist" version="3.20.0-GA"/>
<artifact groupId="org.jboss" artifactId="jandex" version="2.0.3.Final"/>
<artifact groupId="org.jboss" artifactId="jandex" version="2.0.4.Final"/>
<artifact groupId="org.jboss" artifactId="jboss-dmr" version="1.4.1.Final"/>
<artifact groupId="org.jboss" artifactId="jboss-transaction-spi" version="7.6.0.Final"/>
<artifact groupId="org.jboss" artifactId="jboss-vfs" version="3.2.12.Final"/>
Expand All @@ -677,15 +677,15 @@
<artifact groupId="org.jboss.gravia" artifactId="gravia-runtime-embedded" version="1.3.1"/>
<artifact groupId="org.jboss.invocation" artifactId="jboss-invocation" version="1.5.0.Final"/>
<artifact groupId="org.jboss.logging" artifactId="jboss-logging" version="3.3.1.Final"/>
<artifact groupId="org.jboss.logmanager" artifactId="jboss-logmanager" version="2.0.7.Final"/>
<artifact groupId="org.jboss.logmanager" artifactId="jboss-logmanager" version="2.1.0.Alpha5"/>
<artifact groupId="org.jboss.marshalling" artifactId="jboss-marshalling" version="2.0.2.Final"/>
<artifact groupId="org.jboss.marshalling" artifactId="jboss-marshalling-river" version="2.0.2.Final"/>
<artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-common" version="10.0.2.Final"/>
<artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-ear" version="10.0.2.Final"/>
<artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-ejb" version="10.0.2.Final"/>
<artifact groupId="org.jboss.metadata" artifactId="jboss-metadata-web" version="10.0.2.Final"/>
<artifact groupId="org.jboss.modules" artifactId="jboss-modules" version="1.6.1.Final"/>
<artifact groupId="org.jboss.msc" artifactId="jboss-msc" version="1.2.7.SP1"/>
<artifact groupId="org.jboss.msc" artifactId="jboss-msc" version="1.2.8.Final"/>
<artifact groupId="org.jboss.narayana.compensations" artifactId="compensations" version="5.5.30.Final"/>
<artifact groupId="org.jboss.narayana.jts" artifactId="narayana-jts-idlj" version="5.5.30.Final"/>
<artifact groupId="org.jboss.narayana.jts" artifactId="narayana-jts-integration" version="5.5.30.Final"/>
Expand All @@ -694,18 +694,18 @@
<artifact groupId="org.jboss.security" artifactId="jboss-negotiation-common" version="3.0.4.Final"/>
<artifact groupId="org.jboss.security" artifactId="jboss-negotiation-extras" version="3.0.4.Final"/>
<artifact groupId="org.jboss.security" artifactId="jboss-negotiation-spnego" version="3.0.4.Final"/>
<artifact groupId="org.jboss.spec.javax.annotation" artifactId="jboss-annotations-api_1.2_spec" version="1.0.0.Final"/>
<artifact groupId="org.jboss.spec.javax.annotation" artifactId="jboss-annotations-api_1.2_spec" version="1.0.1.Final"/>
<artifact groupId="org.jboss.spec.javax.ejb" artifactId="jboss-ejb-api_3.2_spec" version="1.0.0.Final"/>
<artifact groupId="org.jboss.spec.javax.el" artifactId="jboss-el-api_3.0_spec" version="1.0.9.Final"/>
<artifact groupId="org.jboss.spec.javax.el" artifactId="jboss-el-api_3.0_spec" version="1.0.10.Final"/>
<artifact groupId="org.jboss.spec.javax.enterprise.concurrent" artifactId="jboss-concurrency-api_1.0_spec" version="1.0.0.Final"/>
<artifact groupId="org.jboss.spec.javax.interceptor" artifactId="jboss-interceptors-api_1.2_spec" version="1.0.0.Final"/>
<artifact groupId="org.jboss.spec.javax.resource" artifactId="jboss-connector-api_1.7_spec" version="1.0.0.Final"/>
<artifact groupId="org.jboss.spec.javax.security.auth.message" artifactId="jboss-jaspi-api_1.1_spec" version="1.0.0.Final"/>
<artifact groupId="org.jboss.spec.javax.security.auth.message" artifactId="jboss-jaspi-api_1.1_spec" version="1.0.1.Final"/>
<artifact groupId="org.jboss.spec.javax.security.jacc" artifactId="jboss-jacc-api_1.5_spec" version="1.0.1.Final"/>
<artifact groupId="org.jboss.spec.javax.servlet" artifactId="jboss-servlet-api_3.1_spec" version="1.0.0.Final"/>
<artifact groupId="org.jboss.spec.javax.servlet.jsp" artifactId="jboss-jsp-api_2.3_spec" version="1.0.1.Final"/>
<artifact groupId="org.jboss.spec.javax.servlet" artifactId="jboss-servlet-api_3.1_spec" version="1.0.1.Final"/>
<artifact groupId="org.jboss.spec.javax.servlet.jsp" artifactId="jboss-jsp-api_2.3_spec" version="1.0.2.Final"/>
<artifact groupId="org.jboss.spec.javax.transaction" artifactId="jboss-transaction-api_1.2_spec" version="1.0.1.Final"/>
<artifact groupId="org.jboss.spec.javax.websocket" artifactId="jboss-websocket-api_1.1_spec" version="1.1.1.Final"/>
<artifact groupId="org.jboss.spec.javax.websocket" artifactId="jboss-websocket-api_1.1_spec" version="1.1.2.Final"/>
<artifact groupId="org.jboss.stdio" artifactId="jboss-stdio" version="1.0.2.GA"/>
<artifact groupId="org.jboss.threads" artifactId="jboss-threads" version="2.2.1.Final"/>
<artifact groupId="org.jboss.xnio" artifactId="xnio-api" version="3.5.4.Final"/>
Expand Down Expand Up @@ -781,19 +781,19 @@
<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="11.0.0.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-clustering-infinispan-spi" version="11.0.0.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-clustering-marshalling-api" version="11.0.0.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-clustering-service" version="11.0.0.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-ee" version="11.0.0.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-feature-pack" version="11.0.0.Final" extension="zip"/>
<artifact groupId="org.wildfly" artifactId="wildfly-iiop-openjdk" version="11.0.0.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-naming" version="11.0.0.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-clustering-common" version="12.0.0.Alpha1-SNAPSHOT"/>
<artifact groupId="org.wildfly" artifactId="wildfly-clustering-infinispan-spi" version="12.0.0.Alpha1-SNAPSHOT"/>
<artifact groupId="org.wildfly" artifactId="wildfly-clustering-marshalling-api" version="12.0.0.Alpha1-SNAPSHOT"/>
<artifact groupId="org.wildfly" artifactId="wildfly-clustering-service" version="12.0.0.Alpha1-SNAPSHOT"/>
<artifact groupId="org.wildfly" artifactId="wildfly-ee" version="12.0.0.Alpha1-SNAPSHOT"/>
<artifact groupId="org.wildfly" artifactId="wildfly-feature-pack" version="12.0.0.Alpha1-SNAPSHOT" extension="zip"/>
<artifact groupId="org.wildfly" artifactId="wildfly-iiop-openjdk" version="12.0.0.Alpha1-SNAPSHOT"/>
<artifact groupId="org.wildfly" artifactId="wildfly-naming" version="12.0.0.Alpha1-SNAPSHOT"/>
<artifact groupId="org.wildfly" artifactId="wildfly-naming-client" version="1.0.7.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-security" version="11.0.0.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-transactions" version="11.0.0.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-undertow" version="11.0.0.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-web-common" version="11.0.0.Final"/>
<artifact groupId="org.wildfly" artifactId="wildfly-security" version="12.0.0.Alpha1-SNAPSHOT"/>
<artifact groupId="org.wildfly" artifactId="wildfly-transactions" version="12.0.0.Alpha1-SNAPSHOT"/>
<artifact groupId="org.wildfly" artifactId="wildfly-undertow" version="12.0.0.Alpha1-SNAPSHOT"/>
<artifact groupId="org.wildfly" artifactId="wildfly-web-common" version="12.0.0.Alpha1-SNAPSHOT"/>
<artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-config" version="5.1.0-SNAPSHOT"/>
<artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-cxf-undertow" version="5.1.0-SNAPSHOT"/>
<artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-subsystem-cdi" version="5.1.0-SNAPSHOT"/>
Expand All @@ -802,28 +802,28 @@
<artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-subsystem-undertow" version="5.1.0-SNAPSHOT"/>
<artifact groupId="org.wildfly.client" artifactId="wildfly-client-config" version="1.0.0.Final"/>
<artifact groupId="org.wildfly.common" artifactId="wildfly-common" version="1.2.0.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-controller" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-controller-client" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-core-management-client" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-core-security" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-core-security-api" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-deployment-repository" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-domain-http-interface" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-domain-management" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-io" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-network" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-platform-mbean" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-process-controller" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-protocol" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-remoting" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-request-controller" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-server" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-version" version="3.0.8.Final"/>
<artifact groupId="org.wildfly.extras.patch" artifactId="fuse-patch-config" version="3.0.0"/>
<artifact groupId="org.wildfly.extras.patch" artifactId="fuse-patch-feature-pack" version="3.0.0" extension="zip"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-controller" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-controller-client" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-core-management-client" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-core-security" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-core-security-api" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-deployment-repository" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-domain-http-interface" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-domain-management" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-io" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-network" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-platform-mbean" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-process-controller" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-protocol" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-remoting" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-request-controller" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-server" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.core" artifactId="wildfly-version" version="4.0.0.Alpha5"/>
<artifact groupId="org.wildfly.extras.patch" artifactId="fuse-patch-config" version="4.0.0-SNAPSHOT"/>
<artifact groupId="org.wildfly.extras.patch" artifactId="fuse-patch-feature-pack" version="4.0.0-SNAPSHOT" extension="zip"/>
<artifact groupId="org.wildfly.openssl" artifactId="wildfly-openssl-java" version="1.0.2.Final"/>
<artifact groupId="org.wildfly.security" artifactId="wildfly-elytron" version="1.1.6.Final"/>
<artifact groupId="org.wildfly.security.elytron-web" artifactId="undertow-server" version="1.0.1.Final"/>
<artifact groupId="org.wildfly.security" artifactId="wildfly-elytron" version="1.2.0.Beta10"/>
<artifact groupId="org.wildfly.security.elytron-web" artifactId="undertow-server" version="1.0.0.Final"/>
<artifact groupId="org.wildfly.transaction" artifactId="wildfly-transaction-client" version="1.0.2.Final"/>
<artifact groupId="org.wildfly.wildfly-http-client" artifactId="wildfly-http-client-common" version="1.0.8.Final"/>
<artifact groupId="org.wildfly.wildfly-http-client" artifactId="wildfly-http-naming-client" version="1.0.8.Final"/>
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/modules/system/layers/fuse/org/apache/camel/component/amqp/main/module.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion ...ure/modules/src/main/resources/modules/system/layers/fuse/org/apache/qpid/main/module.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
10 changes: 0 additions & 10 deletions ...ules/src/main/resources/modules/system/layers/fuse/org/apache/qpid/proton/0.16/module.xml
View file

This file was deleted.

5 changes: 2 additions & 3 deletions patch/etc/baseline/module-list.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,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
Expand Down Expand Up @@ -750,8 +749,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
Expand Down
Loading

0 comments on commit 970d387

Please sign in to comment.