[resolves #2923] Upgrade to camel-3.1.0 - WIP

wildfly-extras · Jan 14, 2020 · 4bbb120 · 4bbb120
1 parent 0d06a26
commit 4bbb120
Show file tree

Hide file tree

Showing 32 changed files with 221 additions and 179 deletions.
diff --git a/catalog/src/main/java/org/wildfly/camel/catalog/CatalogCreator.java b/catalog/src/main/java/org/wildfly/camel/catalog/CatalogCreator.java
@@ -154,14 +154,16 @@ public List<RoadMap> getRoadmaps() {
 
     private void collectAvailable() throws IOException {
 
+        ObjectMapper mapper = new ObjectMapper();
+
         // Walk the available camel catalog items
         Files.walkFileTree(srcdir, new SimpleFileVisitor<Path>() {
             public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IOException {
                 if (path.toString().endsWith(".json")) {
                     Path relpath = srcdir.relativize(path);
-                    ObjectMapper mapper = new ObjectMapper();
                     JsonNode treeNode = mapper.readTree(path.toFile());
                     JsonNode valnode = treeNode.findValue("kind");
+                    if (valnode == null) return FileVisitResult.CONTINUE;
                     String kind = valnode != null ? valnode.textValue() : null;
                     valnode = treeNode.findValue("artifactId");
                     String artifactId = valnode != null ? valnode.textValue() : null;

diff --git a/catalog/src/main/resources/component.roadmap b/catalog/src/main/resources/component.roadmap
@@ -51,7 +51,7 @@ couchbase
 couchdb
 cql
 crypto
-crypto-cms
+crypto-cms                                          #deprecated
 cxf
 cxfrs
 dataformat
@@ -278,10 +278,12 @@ aws-msk
 aws-translate
 chatscript
 corda
+cron
 debezium-mongodb
 debezium-mysql
 debezium-postgres
 debezium-sqlserver
+elytron
 file-watch
 google-sheets
 google-sheets-stream
@@ -294,6 +296,7 @@ nitrite
 pg-replication-slot
 platform-http
 pulsar
+rest-openapi
 robotframework
 service
 soroush

diff --git a/catalog/src/main/resources/other.roadmap b/catalog/src/main/resources/other.roadmap
@@ -23,18 +23,15 @@ zipkin
 aws-xray
 kura
 microprofile-config
+openapi-java
+osgi-activator
 reactive-executor-vertx
 resilience4j
 testcontainers-junit5
 testcontainers-spring-junit5
 
 [rejected]
 blueprint
-spring-boot
-spring-cloud
-spring-cloud-consul
-spring-cloud-netflix
-spring-cloud-zookeeper
 test                                #2052 Testing utility
 test-blueprint
 test-cdi

diff --git a/feature/common/etc/smartics/skipped-modules.xml b/feature/common/etc/smartics/skipped-modules.xml
@@ -432,6 +432,10 @@
         <include artifact="org.drools:kie-pmml" />
     </module>
 
+    <module name="org.eclipse.californium.skipped" skip="true">
+        <include artifact="org.eclipse.californium:californium-legal" />
+    </module>
+
     <module name="org.eclipse.microprofile" skip="true">
         <include artifact="org.eclipse.microprofile.config:microprofile-config-api" />
         <include artifact="org.eclipse.microprofile.health:microprofile-health-api" />

diff --git a/feature/modules/etc/smartics/camel-modules.xml b/feature/modules/etc/smartics/camel-modules.xml
@@ -126,6 +126,7 @@
             <include module="org.springframework.boot" />
         </apply-to-dependencies>
         <dependencies>
+            <module name="javax.servlet.api"/>
             <module name="org.asynchttpclient" export="true"/>
             <module name="io.netty" slot="fuse" />
             <module name="org.slf4j" />
@@ -1299,12 +1300,15 @@
 
     <module name="org.apache.camel.component.http.common">
         <include artifact="org.apache.camel:camel-http-common" />
+        <include artifact="org.apache.camel:camel-http-base" />
         <apply-to-dependencies skip="true">
             <include module="org.apache.camel.apt" />
             <include module="org.springframework.boot" />
         </apply-to-dependencies>
         <dependencies>
             <module name="javax.activation.api"/>
+            <module name="javax.servlet.api"/>
+            <module name="org.apache.camel.core"/>
             <module name="org.slf4j"/>
         </dependencies>
     </module>
@@ -2102,11 +2106,13 @@
     <module name="org.apache.camel.component.netty">
         <include artifact="org.apache.camel:camel-netty" />
         <apply-to-dependencies skip="true">
+            <include module="io.netty.skipped" />
             <include module="org.apache.camel.apt" />
             <include module="org.springframework.boot" />
         </apply-to-dependencies>
         <dependencies>
             <module name="javax.api"/>
+            <module name="io.netty" slot="fuse"/>
             <module name="org.slf4j" />
         </dependencies>
     </module>
@@ -2173,8 +2179,11 @@
             <include module="org.springframework.boot" />
         </apply-to-dependencies>
         <dependencies>
-            <module name="org.apache.olingo4" export="true"/>
             <module name="org.apache.commons.lang3" slot="fuse"/>
+            <module name="org.apache.commons.io" slot="fuse" />
+            <module name="org.apache.httpcomponents" slot="fuse" />
+            <module name="org.apache.olingo4" export="true"/>
+            <module name="org.apache.olingo4.server" />
             <module name="org.slf4j"/>
         </dependencies>
         <exports>
@@ -3043,6 +3052,7 @@
             </module>
             <module name="javax.api"/>
             <module name="javax.activation.api"/>
+            <module name="javax.servlet.api"/>
             <module name="org.apache.httpcomponents" slot="fuse" />
             <module name="org.jboss.xnio" />
             <module name="org.slf4j" />
@@ -3108,6 +3118,7 @@
             <include module="org.apache.camel.apt" />
         </apply-to-dependencies>
         <dependencies>
+            <module name="org.apache.camel.core" />
             <module name="org.slf4j" />
         </dependencies>
     </module>

diff --git a/feature/modules/etc/smartics/other-modules.xml b/feature/modules/etc/smartics/other-modules.xml
@@ -1900,9 +1900,11 @@
     </module>
 
     <module name="org.drools">
+        <include artifact="org.drools:drools-canonical-model" />
         <include artifact="org.drools:drools-compiler" />
         <include artifact="org.drools:drools-core" />
-        <include artifact="org.drools:drools-canonical-model" />
+        <include artifact="org.drools:drools-core-dynamic" />
+        <include artifact="org.drools:drools-core-reflective" />
         <include artifact="org.drools:drools-model-compiler" />
         <include artifact="org.drools:drools-mvel-compiler" />
         <include artifact="org.drools:drools-mvel-parser" />
@@ -1921,11 +1923,11 @@
         </properties>
         <apply-to-dependencies skip="true">
             <include module="io.netty.skipped" />
+            <include module="org.eclipse.californium.skipped" />
         </apply-to-dependencies>
         <include artifact="org.eclipse.californium:californium-core" />
-        <include artifact="org.eclipse.californium:californium-legal" />
         <include artifact="org.eclipse.californium:element-connector" />
-        <include artifact="org.eclipse.californium:element-connector-tcp" />
+        <include artifact="org.eclipse.californium:element-connector-tcp-netty" />
         <include artifact="org.eclipse.californium:scandium" />
     </module>
 

diff --git a/feature/modules/src/main/resources/modules/system/layers/fuse/edu/ucar/cdm/main/module.xml b/feature/modules/src/main/resources/modules/system/layers/fuse/edu/ucar/cdm/main/module.xml
@@ -13,7 +13,6 @@
     <module name="net.sf.ehcache.ehcache-core" />
     <module name="org.itadaki.bzip2" />
     <module name="org.joda.time" slot="fuse" />
-    <module name="org.quartz" />
     <module name="org.slf4j" />
   </dependencies>
 </module>
diff --git a/.../main/resources/modules/system/layers/fuse/org/apache/camel/component/ahc/main/module.xml b/.../main/resources/modules/system/layers/fuse/org/apache/camel/component/ahc/main/module.xml
@@ -4,10 +4,10 @@
     <artifact name="${org.apache.camel:camel-ahc}" />
   </resources>
   <dependencies>
+    <module name="javax.servlet.api" />
     <module name="org.asynchttpclient" export="true" />
     <module name="io.netty" slot="fuse" />
     <module name="org.slf4j" />
-    <module name="javax.servlet.api" />
     <module name="org.apache.camel.component.http.common" />
     <module name="org.apache.camel.core" />
   </dependencies>

diff --git a/...sources/modules/system/layers/fuse/org/apache/camel/component/http/common/main/module.xml b/...sources/modules/system/layers/fuse/org/apache/camel/component/http/common/main/module.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.http.common">
   <resources>
+    <artifact name="${org.apache.camel:camel-http-base}" />
     <artifact name="${org.apache.camel:camel-http-common}" />
   </resources>
   <dependencies>
     <module name="javax.activation.api" />
-    <module name="org.slf4j" />
     <module name="javax.servlet.api" />
     <module name="org.apache.camel.core" />
+    <module name="org.slf4j" />
   </dependencies>
 </module>
diff --git a/.../resources/modules/system/layers/fuse/org/apache/camel/component/influxdb/main/module.xml b/.../resources/modules/system/layers/fuse/org/apache/camel/component/influxdb/main/module.xml
@@ -10,6 +10,7 @@
     <module name="com.squareup.retrofit2" slot="fuse" />
     <module name="com.squareup.moshi" />
     <module name="org.slf4j" />
+    <module name="com.squareup.okio" />
     <module name="org.apache.camel.core" />
   </dependencies>
   <exports>

diff --git a/...ain/resources/modules/system/layers/fuse/org/apache/camel/component/netty/main/module.xml b/...ain/resources/modules/system/layers/fuse/org/apache/camel/component/netty/main/module.xml
@@ -5,8 +5,8 @@
   </resources>
   <dependencies>
     <module name="javax.api" />
-    <module name="org.slf4j" />
     <module name="io.netty" slot="fuse" />
+    <module name="org.slf4j" />
     <module name="org.apache.camel.core" />
     <module name="org.apache.commons.pool" />
   </dependencies>

diff --git a/...n/resources/modules/system/layers/fuse/org/apache/camel/component/olingo4/main/module.xml b/...n/resources/modules/system/layers/fuse/org/apache/camel/component/olingo4/main/module.xml
@@ -6,13 +6,13 @@
     <artifact name="${org.apache.camel:camel-olingo4-api}" />
   </resources>
   <dependencies>
-    <module name="org.apache.olingo4" export="true" />
     <module name="org.apache.commons.lang3" slot="fuse" />
-    <module name="org.slf4j" />
-    <module name="org.apache.camel.core" />
     <module name="org.apache.commons.io" slot="fuse" />
     <module name="org.apache.httpcomponents" slot="fuse" />
+    <module name="org.apache.olingo4" export="true" />
     <module name="org.apache.olingo4.server" />
+    <module name="org.slf4j" />
+    <module name="org.apache.camel.core" />
   </dependencies>
   <exports>
     <exclude path="org/apache/camel/component/olingo4/internal" />

diff --git a/...ources/modules/system/layers/fuse/org/apache/camel/component/rest/swagger/main/module.xml b/...ources/modules/system/layers/fuse/org/apache/camel/component/rest/swagger/main/module.xml
@@ -8,6 +8,7 @@
     <module name="com.fasterxml.jackson.core.jackson-core" />
     <module name="com.fasterxml.jackson.core.jackson-databind" />
     <module name="org.slf4j" />
+    <module name="org.apache.camel.component.http" />
     <module name="org.apache.camel.component.swagger" />
     <module name="org.apache.camel.core" />
   </dependencies>

diff --git a/.../resources/modules/system/layers/fuse/org/apache/camel/component/telegram/main/module.xml b/.../resources/modules/system/layers/fuse/org/apache/camel/component/telegram/main/module.xml
@@ -10,9 +10,9 @@
     <module name="org.apache.cxf.impl" />
     <module name="org.slf4j" />
     <module name="com.fasterxml.jackson.core.jackson-annotations" />
-    <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" slot="fuse" />
+    <module name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" slot="fuse" />
     <module name="org.apache.camel.component.webhook" />
     <module name="org.apache.camel.core" />
-    <module name="org.apache.cxf.ext" />
+    <module name="org.asynchttpclient" />
   </dependencies>
 </module>
diff --git a/.../resources/modules/system/layers/fuse/org/apache/camel/component/undertow/main/module.xml b/.../resources/modules/system/layers/fuse/org/apache/camel/component/undertow/main/module.xml
@@ -13,10 +13,10 @@
     </module>
     <module name="javax.api" />
     <module name="javax.activation.api" />
+    <module name="javax.servlet.api" />
     <module name="org.apache.httpcomponents" slot="fuse" />
     <module name="org.jboss.xnio" />
     <module name="org.slf4j" />
-    <module name="javax.servlet.api" />
     <module name="org.apache.camel.component.http.common" />
     <module name="org.apache.camel.core" />
   </dependencies>

diff --git a/...n/resources/modules/system/layers/fuse/org/apache/camel/component/webhook/main/module.xml b/...n/resources/modules/system/layers/fuse/org/apache/camel/component/webhook/main/module.xml
@@ -4,7 +4,7 @@
     <artifact name="${org.apache.camel:camel-webhook}" />
   </resources>
   <dependencies>
-    <module name="org.slf4j" />
     <module name="org.apache.camel.core" />
+    <module name="org.slf4j" />
   </dependencies>
 </module>
diff --git a/...dules/src/main/resources/modules/system/layers/fuse/org/apache/camel/core/main/module.xml b/...dules/src/main/resources/modules/system/layers/fuse/org/apache/camel/core/main/module.xml
@@ -44,7 +44,6 @@
     <module name="org.apache.camel.component.caffeine" services="import" />
     <module name="org.slf4j" />
     <module name="sun.jdk" />
-    <module name="com.sun.javax.activation" />
   </dependencies>
   <exports>
     <exclude path="org/apache/camel/impl/osgi**" />

diff --git a/...modules/src/main/resources/modules/system/layers/fuse/org/apache/sis/core/main/module.xml b/...modules/src/main/resources/modules/system/layers/fuse/org/apache/sis/core/main/module.xml
@@ -12,6 +12,7 @@
   <dependencies>
     <module name="javax.enterprise.api" />
     <module name="javax.measure.api" />
+    <module name="javax.xml.bind.api" />
     <module name="org.opengis.geoapi" />
   </dependencies>
 </module>
diff --git a/feature/modules/src/main/resources/modules/system/layers/fuse/org/drools/main/module.xml b/feature/modules/src/main/resources/modules/system/layers/fuse/org/drools/main/module.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.drools">
   <resources>
+    <artifact name="${org.drools:drools-canonical-model}" />
     <artifact name="${org.drools:drools-compiler}" />
     <artifact name="${org.drools:drools-core}" />
+    <artifact name="${org.drools:drools-core-dynamic}" />
+    <artifact name="${org.drools:drools-core-reflective}" />
+    <artifact name="${org.drools:drools-model-compiler}" />
+    <artifact name="${org.drools:drools-mvel-compiler}" />
+    <artifact name="${org.drools:drools-mvel-parser}" />
   </resources>
   <dependencies>
     <module name="com.google.protobuf" />
     <module name="com.thoughtworks.xstream" />
     <module name="javax.activation.api" />
+    <module name="javax.annotation.api" />
     <module name="javax.inject.api" />
     <module name="javax.xml.bind.api" />
     <module name="javax.xml.stream.api" />

diff --git a/...les/src/main/resources/modules/system/layers/fuse/org/eclipse/californium/main/module.xml b/...les/src/main/resources/modules/system/layers/fuse/org/eclipse/californium/main/module.xml
@@ -5,10 +5,8 @@
   </properties>
   <resources>
     <artifact name="${org.eclipse.californium:californium-core}" />
-    <artifact name="${org.eclipse.californium:californium-legal}" />
     <artifact name="${org.eclipse.californium:element-connector}" />
-    <artifact name="${org.eclipse.californium:element-connector}" />
-    <artifact name="${org.eclipse.californium:element-connector-tcp}" />
+    <artifact name="${org.eclipse.californium:element-connector-tcp-netty}" />
     <artifact name="${org.eclipse.californium:scandium}" />
   </resources>
   <dependencies>

diff --git a/feature/pack/scripts/module-checker.groovy b/feature/pack/scripts/module-checker.groovy
@@ -214,7 +214,8 @@ def allowedDuplicateArtifacts = [
     "org.yaml:snakeyaml"
 ] as Set
 def allowedOrphanArtifacts = [
-	"org.fusesource.camel.component.sap",
+    "org.apache.olingo4.server",
+    "org.fusesource.camel.component.sap",
 	"com.sap.conn.jco"
 ] as Set