[resolves #2923] Upgrade to camel-3.1.0

wildfly-extras · Mar 2, 2020 · 6a13b64 · 6a13b64
1 parent 5442fc3
commit 6a13b64
Show file tree

Hide file tree

Showing 76 changed files with 1,113 additions and 1,004 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
@@ -69,7 +69,9 @@ dropbox
 ehcache
 elasticsearch-rest
 elsql
-etcd
+etcd-keys
+etcd-stats
+etcd-watch
 exec
 facebook
 fhir
@@ -251,7 +253,8 @@ weather
 webhook
 wordpress
 xchange
-xmlsecurity
+xmlsecurity-sign
+xmlsecurity-verify
 xmpp
 xquery
 xslt
@@ -274,31 +277,51 @@ aws-lambda
 aws-mq
 aws-msk
 aws-translate
+aws2-cw
+aws2-ddb
+aws2-ddbstream
+aws2-ec2
+aws2-ecs
+aws2-eks
+aws2-iam
+aws2-kms
+aws2-mq
+aws2-msk
+aws2-ses
+aws2-sns
+aws2-sqs
+aws2-translate
 chatscript
 corda
+cron
 debezium-mongodb
 debezium-mysql
 debezium-postgres
 debezium-sqlserver
+elytron
 file-watch
 google-sheets
 google-sheets-stream
 graphql
 iota
 jgroups-raft
 jooq
+jslt
 kudu
 milo-client
 milo-server
 nitrite
 pg-replication-slot
 platform-http
 pulsar
+rest-openapi
 robotframework
 service
 soroush
 web3j
 websocket-jsr356
+weka
+workday
 xj
 
 [rejected]

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/config/src/test/java/org/wildfly/camel/test/config/VersionsValidatorTest.java b/config/src/test/java/org/wildfly/camel/test/config/VersionsValidatorTest.java
@@ -73,6 +73,7 @@ public void before() throws Exception {
         mapping.put("version.camel.qpid.proton", "qpid-proton-j-version");
         mapping.put("version.camel.rxjava2", "rxjava2-version");
         mapping.put("version.camel.sshd", "sshd-version");
+        mapping.put("version.camel.snakeyaml", "snakeyaml-version");
         mapping.put("version.camel.squareup.okhttp", "squareup-okhttp-version");
         mapping.put("version.camel.squareup.okio", "squareup-okio-version");
 

diff --git a/feature/common/etc/smartics/skipped-modules.xml b/feature/common/etc/smartics/skipped-modules.xml
@@ -69,6 +69,11 @@
         <include artifact="com.data-artisans:flakka-testkit_2.11" />
     </module>
 
+    <module name="com.digitalpetri.fsm" skip="true">
+        <include artifact="com.digitalpetri.fsm:strict-machine" />
+        <include artifact="com.digitalpetri.netty:netty-channel-fsm" />
+    </module>
+
     <module name="com.epam.parso" skip="true">
         <include artifact="com.epam:parso" />
     </module>
@@ -327,6 +332,10 @@
         <include artifact="org.apache.avro:avro-ipc-netty" />
     </module>
 
+    <module name="org.apache.camel.allcomponents" skip="true">
+        <include artifact="org.apache.camel:camel-allcomponents" />
+    </module>
+
     <module name="org.apache.camel.apt" skip="true">
         <include artifact="org.apache.camel:apt" />
     </module>
@@ -335,6 +344,11 @@
         <include artifact="org.apache.camel:camel-blueprint" />
     </module>
 
+    <module name="org.apache.camel.tooling" skip="true">
+        <include artifact="org.apache.camel:camel-tooling-model" />
+        <include artifact="org.apache.camel:camel-tooling-util" />
+    </module>
+
     <module name="org.apache.commons.daemon" skip="true">
         <include artifact=":commons-daemon"/>
     </module>
@@ -432,6 +446,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/extrasB/pom.xml b/feature/extrasB/pom.xml
@@ -47,14 +47,19 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.yaml</groupId>
+					<artifactId>snakeyaml</artifactId>
+				</exclusion>
+			</exclusions>
             <version>${version.wildfly.fasterxml.jackson}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jr</groupId>
             <artifactId>jackson-jr-objects</artifactId>
             <version>${version.wildfly.fasterxml.jackson}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-elasticsearch-rest</artifactId>

diff --git a/feature/extrasC/etc/smartics/skipped-modules.xml b/feature/extrasC/etc/smartics/skipped-modules.xml
@@ -35,6 +35,7 @@
         <include artifact="org.apache.camel:camel-management-api" />
         <include artifact="org.apache.camel:camel-support" />
         <include artifact="org.apache.camel:camel-util" />
+        <include artifact="org.apache.camel:camel-xml-jaxp" />
     </module>
 
 	<!-- =========================================================== -->

diff --git a/feature/modules/etc/smartics/camel-modules.xml b/feature/modules/etc/smartics/camel-modules.xml
@@ -22,6 +22,10 @@
 
     <module name="org.apache.camel.catalog">
         <include artifact="org.apache.camel:camel-catalog" />
+        <apply-to-dependencies skip="true">
+            <include module="org.apache.camel.allcomponents" />
+            <include module="org.apache.camel.tooling" />
+        </apply-to-dependencies>
         <dependencies>
             <module name="org.slf4j" />
         </dependencies>
@@ -36,6 +40,7 @@
         <include artifact="org.apache.camel:camel-cloud" />
         <include artifact="org.apache.camel:camel-controlbus" />
         <include artifact="org.apache.camel:camel-core" />
+        <include artifact="org.apache.camel:camel-core-catalog" />
         <include artifact="org.apache.camel:camel-core-engine" />
         <include artifact="org.apache.camel:camel-dataformat" />
         <include artifact="org.apache.camel:camel-dataset" />
@@ -60,11 +65,14 @@
         <include artifact="org.apache.camel:camel-util-json" />
         <include artifact="org.apache.camel:camel-validator" />
         <include artifact="org.apache.camel:camel-vm" />
+        <include artifact="org.apache.camel:camel-xml-jaxb" />
+        <include artifact="org.apache.camel:camel-xml-jaxp" />
         <include artifact="org.apache.camel:camel-xpath" />
         <include artifact="org.apache.camel:camel-xslt" />
         <include artifact="org.apache.camel:spi-annotations" />
         <apply-to-dependencies skip="true">
             <include module="org.apache.camel.apt" />
+            <include module="org.apache.camel.tooling" />
             <include module="org.springframework.boot" />
         </apply-to-dependencies>
         <dependencies>
@@ -126,6 +134,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 +1308,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>
@@ -2080,11 +2092,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>
@@ -2151,8 +2165,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>
@@ -2612,7 +2629,7 @@
         </apply-to-dependencies>
         <dependencies>
             <module name="org.slf4j"/>
-            <module name="org.yaml.snakeyaml" export="true"/>
+            <module name="org.yaml.snakeyaml" slot="fuse" export="true"/>
         </dependencies>
     </module>
 
@@ -3021,6 +3038,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" />
@@ -3086,6 +3104,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
@@ -567,6 +567,19 @@
         </properties>
         <include artifact="com.google.auth:google-auth-library-credentials" />
         <include artifact="com.google.auth:google-auth-library-oauth2-http" />
+        <apply-to-dependencies skip="true">
+            <include module="com.google.code.findbugs" />
+        </apply-to-dependencies>
+    </module>
+
+    <module name="com.google.auto.value">
+        <properties>
+            <property name="jboss.api" value="private"/>
+        </properties>
+        <include artifact="com.google.auto.value:auto-value-annotations" />
+        <apply-to-dependencies skip="true">
+            <include module="com.google.code.findbugs" />
+        </apply-to-dependencies>
     </module>
 
     <module name="com.google.http-client.google-http-client">
@@ -657,6 +670,13 @@
         <include artifact="com.healthmarketscience.jackcess:jackcess-encrypt"/>
     </module>
 
+    <module name="com.ibm.icu">
+        <properties>
+            <property name="jboss.api" value="private"/>
+        </properties>
+        <include artifact="com.ibm.icu:icu4j"/>
+    </module>
+
     <module name="com.impossibl.pgjdbc">
         <properties>
             <property name="jboss.api" value="private"/>
@@ -1882,12 +1902,14 @@
             </module>
         </dependencies>
         <exports>
+            <exclude path="groovy/cli/internal"/>
             <exclude path="groovy/json/internal"/>
             <exclude path="groovyjarjarantlr/**"/>
             <exclude path="groovyjarjarasm/**"/>
             <exclude path="groovyjarjarpicocli/**"/>
             <exclude path="groovyjarjarcommonscli/**"/>
             <exclude path="org/apache/groovy/internal**"/>
+            <exclude path="org/apache/groovy/parser/antlr4**"/>
             <exclude path="org/codehaus"/>
         </exports>
     </module>
@@ -1900,9 +1922,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 +1945,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/etc/smartics/spring-modules.xml b/feature/modules/etc/smartics/spring-modules.xml
@@ -151,6 +151,8 @@
             <include module="com.querydsl.skip" />
         </apply-to-dependencies>
         <dependencies>
+            <module name="org.springframework.context" />
+            <module name="org.springframework.expression" />
         </dependencies>
     </module>