Skip to content

Commit

Permalink
[resolves #2923] Upgrade to camel-3.1.0 - WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
tdiesler committed Feb 5, 2020
1 parent c002c65 commit 9d125cd
Show file tree
Hide file tree
Showing 51 changed files with 874 additions and 925 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 13 additions & 1 deletion catalog/src/main/resources/component.roadmap
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ couchbase
couchdb
cql
crypto
crypto-cms
crypto-cms #deprecated
cxf
cxfrs
dataformat
Expand Down Expand Up @@ -276,29 +276,41 @@ aws-lambda
aws-mq
aws-msk
aws-translate
aws2-ecs
aws2-eks
aws2-kms
aws2-mq
aws2-msk
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
nitrite
pg-replication-slot
platform-http
pulsar
rest-openapi
robotframework
service
soroush
web3j
websocket-jsr356
weka
workday
xj

[rejected]
Expand Down
12 changes: 7 additions & 5 deletions catalog/src/main/resources/other.roadmap
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@
attachments
cdi
cxf-transport
fhir
hystrix
jasypt
leveldb
lra
microprofile-health
olingo2
olingo4
opentracing
reactor
ribbon
rxjava
salesforce
servicenow
shiro
spring-javaconfig
spring-security
Expand All @@ -23,18 +28,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
Expand Down
9 changes: 9 additions & 0 deletions feature/common/etc/smartics/skipped-modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,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>
Expand Down Expand Up @@ -432,6 +437,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" />
Expand Down
15 changes: 14 additions & 1 deletion feature/modules/etc/smartics/camel-modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@
<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-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>
Expand Down Expand Up @@ -126,6 +128,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" />
Expand Down Expand Up @@ -1299,12 +1302,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>
Expand Down Expand Up @@ -2102,11 +2108,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>
Expand Down Expand Up @@ -2173,8 +2181,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>
Expand Down Expand Up @@ -3043,6 +3054,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" />
Expand Down Expand Up @@ -3108,6 +3120,7 @@
<include module="org.apache.camel.apt" />
</apply-to-dependencies>
<dependencies>
<module name="org.apache.camel.core" />
<module name="org.slf4j" />
</dependencies>
</module>
Expand Down
21 changes: 18 additions & 3 deletions feature/modules/etc/smartics/other-modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -1900,9 +1913,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" />
Expand All @@ -1921,11 +1936,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>

Expand Down
7 changes: 0 additions & 7 deletions feature/modules/etc/smartics/wildfly-alternatives.xml
Original file line number Diff line number Diff line change
Expand Up @@ -336,13 +336,6 @@
<include artifact=":stax2-api" />
</module>

<module name="org.eclipse.jdt.ecj" inherit-slot="false" slot="fuse">
<properties>
<property name="jboss.api" value="private"/>
</properties>
<include artifact="org.eclipse.jdt.core.compiler:ecj" />
</module>

<module name="org.eclipse.jgit" inherit-slot="false" slot="fuse">
<properties>
<property name="jboss.api" value="private"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<artifact name="${com.google.auth:google-auth-library-oauth2-http}" />
</resources>
<dependencies>
<module name="com.google.auto.value" />
<module name="com.google.guava" slot="fuse" />
<module name="com.google.http-client.google-http-client" />
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.1" name="org.eclipse.jdt.ecj" slot="fuse">
<module xmlns="urn:jboss:module:1.1" name="com.google.auto.value">
<properties>
<property name="jboss.api" value="private" />
</properties>
<resources>
<artifact name="${org.eclipse.jdt.core.compiler:ecj}" />
<artifact name="${com.google.auto.value:auto-value-annotations}" />
</resources>
<dependencies />
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
<artifact name="${io.grpc:grpc-protobuf-lite}" />
<artifact name="${io.grpc:grpc-stub}" />
<artifact name="${com.auth0:java-jwt}" />
<artifact name="${io.opencensus:opencensus-api}" />
<artifact name="${io.opencensus:opencensus-contrib-grpc-metrics}" />
</resources>
<dependencies>
<module name="ibm.jdk.ext" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<module name="org.slf4j" />
<module name="org.apache.camel.core" />
<module name="org.apache.commons.codec" slot="fuse" />
<module name="org.apache.commons.io" slot="fuse" />
<module name="org.bouncycastle" slot="1.61" />
</dependencies>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@
<module name="org.slf4j" />
<module name="org.apache.camel.core" />
<module name="org.apache.commons.codec" slot="fuse" />
<module name="org.apache.commons.io" slot="fuse" />
</dependencies>
</module>
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading

0 comments on commit 9d125cd

Please sign in to comment.