Skip to content

Commit

Permalink
[resolves #2722] Upgrade to WildFly-16.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@tdiesler
tdiesler committed Mar 18, 2019
1 parent 53f98a0 commit 13d9be4
Show file tree
Hide file tree
Showing 42 changed files with 92 additions and 89 deletions.
2 changes: 1 addition & 1 deletion archetypes/archetype-cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.wildfly.camel.archetypes</groupId>
<artifactId>wildfly-camel-archetype</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Archetypes :: CDI</name>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/archetype-cdi/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.1_spec</artifactId>
<artifactId>jboss-servlet-api_4.0_spec</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion archetypes/archetype-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.wildfly.camel.archetypes</groupId>
<artifactId>wildfly-camel-archetype</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Archetypes :: Spring</name>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/archetype-spring/src/main/resources/archetype-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.1_spec</artifactId>
<artifactId>jboss-servlet-api_4.0_spec</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion archetypes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Archetypes</name>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: BOM</name>
Expand Down
2 changes: 1 addition & 1 deletion catalog/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Catalog</name>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Common</name>
Expand Down
2 changes: 1 addition & 1 deletion config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Config</name>
Expand Down
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_90 = Namespace.getNamespace("urn:jboss:domain:9.0");
public static final Namespace NS_DOMAIN_100 = Namespace.getNamespace("urn:jboss:domain:10.0");

public static final Namespace[] NS_DOMAINS = new Namespace[] { NS_DOMAIN_90 };
public static final Namespace[] NS_DOMAINS = new Namespace[] { NS_DOMAIN_100 };

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_90;
import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAIN_100;
import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_SECURITY;

import java.io.File;
Expand Down Expand Up @@ -82,7 +82,7 @@ public void testUnsupportedNamespaceVersion() throws Exception {
SAXBuilder jdom = new SAXBuilder();
Document doc = jdom.build(resurl);

doc.getRootElement().getChild("extensions", NS_DOMAIN_90).setNamespace(Namespace.getNamespace("urn:jboss:domain:99.99"));
doc.getRootElement().getChild("extensions", NS_DOMAIN_100).setNamespace(Namespace.getNamespace("urn:jboss:domain:99.99"));

File modifiedConfig = new File("target/standalone-modified.xml");
outputDocumentContent(doc, new FileOutputStream(modifiedConfig));
Expand Down
2 changes: 1 addition & 1 deletion cxfhttp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>WildFly Camel :: CXF Undertow</name>
Expand Down
2 changes: 1 addition & 1 deletion docker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Docker</name>
Expand Down
3 changes: 3 additions & 0 deletions docs/guide/start/compatibility.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ The {wildfly} compatibility matrix

[cols="2*",width="60%"]
|===
| **16.0.0.Final**
| 10.0

| **15.0.1.Final**
| 9.1

Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Docs</name>
Expand Down
2 changes: 1 addition & 1 deletion feature/common/etc/smartics/wildfly-modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
<module name="javax.servlet.api" skip="true">
<include artifact=":geronimo-servlet_3.0_spec" />
<include artifact=":javax.servlet-api" />
<include artifact=":jboss-servlet-api_3.1_spec" />
<include artifact=":jboss-servlet-api_4.0_spec" />
<include artifact=":servlet-api" />
</module>

Expand Down
2 changes: 1 addition & 1 deletion feature/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel-feature</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Feature :: Common</name>
Expand Down
2 changes: 1 addition & 1 deletion feature/extrasA/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel-feature</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Feature :: ExtrasA</name>
Expand Down
2 changes: 1 addition & 1 deletion feature/extrasB/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel-feature</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Feature :: ExtrasB</name>
Expand Down
2 changes: 1 addition & 1 deletion feature/extrasC/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel-feature</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Feature :: ExtrasC</name>
Expand Down
2 changes: 1 addition & 1 deletion feature/modules/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel-feature</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Feature :: Modules</name>
Expand Down
2 changes: 1 addition & 1 deletion feature/pack/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel-feature</artifactId>
<version>9.2.0-SNAPSHOT</version>
<version>10.0.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Feature :: Pack</name>
Expand Down
Loading

0 comments on commit 13d9be4

Please sign in to comment.