You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/12/13 12:30:29 UTC
[camel-quarkus] branch master updated (b13e1fc -> cac308c)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from b13e1fc examples: add timer-log kotlin example
new 1e785f9 Fix commons-logging setup
new cac308c Fix cherry-pick leftovers
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
extensions/aws-ecs/runtime/pom.xml | 4 ----
extensions/aws-eks/runtime/pom.xml | 4 ----
extensions/aws-iam/runtime/pom.xml | 4 ----
extensions/aws-kms/runtime/pom.xml | 4 ----
extensions/aws-s3/runtime/pom.xml | 4 ----
extensions/aws-sns/runtime/pom.xml | 4 ----
extensions/aws-sqs/runtime/pom.xml | 4 ----
extensions/fhir/runtime/pom.xml | 4 ----
extensions/slack/deployment/pom.xml | 4 ++++
extensions/slack/runtime/pom.xml | 8 ++++----
extensions/sql/deployment/pom.xml | 4 ++++
extensions/sql/runtime/pom.xml | 14 ++++----------
extensions/support/commons-logging/runtime/pom.xml | 4 ++++
poms/bom/pom.xml | 10 ++++++++++
14 files changed, 30 insertions(+), 46 deletions(-)
[camel-quarkus] 02/02: Fix cherry-pick leftovers
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit cac308cd51d242f9c082517f87a174d08bd5eee2
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Fri Dec 13 08:36:20 2019 +0100
Fix cherry-pick leftovers
---
integration-tests/bean/pom.xml | 9 ++-------
integration-tests/salesforce/pom.xml | 9 ++-------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/integration-tests/bean/pom.xml b/integration-tests/bean/pom.xml
index 747f501..b6acdbb 100644
--- a/integration-tests/bean/pom.xml
+++ b/integration-tests/bean/pom.xml
@@ -86,15 +86,10 @@
<profiles>
<profile>
- <!--
- Required because of:
- - https://github.com/apache/camel-quarkus/issues/540
- - https://github.com/oracle/graal/issues/1971
- -->
- <id>bean-native</id>
+ <id>native</id>
<activation>
<property>
- <name>bean-native</name>
+ <name>native</name>
</property>
</activation>
<build>
diff --git a/integration-tests/salesforce/pom.xml b/integration-tests/salesforce/pom.xml
index d00bfba..0a4a514 100644
--- a/integration-tests/salesforce/pom.xml
+++ b/integration-tests/salesforce/pom.xml
@@ -78,15 +78,10 @@
<profiles>
<profile>
- <!--
- Required because of:
- - https://github.com/apache/camel-quarkus/issues/541
- - https://github.com/oracle/graal/issues/1975
- -->
- <id>salesforce-native</id>
+ <id>native</id>
<activation>
<property>
- <name>salesforce-native</name>
+ <name>native</name>
</property>
</activation>
<build>
[camel-quarkus] 01/02: Fix commons-logging setup
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1e785f99b476d8d6bff5815c50790944f9c693b6
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Dec 11 16:33:27 2019 +0100
Fix commons-logging setup
---
extensions/aws-ecs/runtime/pom.xml | 4 ----
extensions/aws-eks/runtime/pom.xml | 4 ----
extensions/aws-iam/runtime/pom.xml | 4 ----
extensions/aws-kms/runtime/pom.xml | 4 ----
extensions/aws-s3/runtime/pom.xml | 4 ----
extensions/aws-sns/runtime/pom.xml | 4 ----
extensions/aws-sqs/runtime/pom.xml | 4 ----
extensions/fhir/runtime/pom.xml | 4 ----
extensions/slack/deployment/pom.xml | 4 ++++
extensions/slack/runtime/pom.xml | 8 ++++----
extensions/sql/deployment/pom.xml | 4 ++++
extensions/sql/runtime/pom.xml | 14 ++++----------
extensions/support/commons-logging/runtime/pom.xml | 4 ++++
integration-tests/bean/pom.xml | 9 +++++++--
integration-tests/salesforce/pom.xml | 9 +++++++--
poms/bom/pom.xml | 10 ++++++++++
16 files changed, 44 insertions(+), 50 deletions(-)
diff --git a/extensions/aws-ecs/runtime/pom.xml b/extensions/aws-ecs/runtime/pom.xml
index 1ad1fe1..42360f4 100644
--- a/extensions/aws-ecs/runtime/pom.xml
+++ b/extensions/aws-ecs/runtime/pom.xml
@@ -84,10 +84,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>commons-logging-jboss-logging</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/aws-eks/runtime/pom.xml b/extensions/aws-eks/runtime/pom.xml
index be98222..cb52d35 100644
--- a/extensions/aws-eks/runtime/pom.xml
+++ b/extensions/aws-eks/runtime/pom.xml
@@ -83,10 +83,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>commons-logging-jboss-logging</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/aws-iam/runtime/pom.xml b/extensions/aws-iam/runtime/pom.xml
index 4bcbf9f..3d07736 100644
--- a/extensions/aws-iam/runtime/pom.xml
+++ b/extensions/aws-iam/runtime/pom.xml
@@ -86,10 +86,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>commons-logging-jboss-logging</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/aws-kms/runtime/pom.xml b/extensions/aws-kms/runtime/pom.xml
index 2080fc9..e5432fe 100644
--- a/extensions/aws-kms/runtime/pom.xml
+++ b/extensions/aws-kms/runtime/pom.xml
@@ -84,10 +84,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>commons-logging-jboss-logging</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/aws-s3/runtime/pom.xml b/extensions/aws-s3/runtime/pom.xml
index cfd878e..2bc5e65 100644
--- a/extensions/aws-s3/runtime/pom.xml
+++ b/extensions/aws-s3/runtime/pom.xml
@@ -83,10 +83,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>commons-logging-jboss-logging</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/aws-sns/runtime/pom.xml b/extensions/aws-sns/runtime/pom.xml
index 9940b76..00ffe58 100644
--- a/extensions/aws-sns/runtime/pom.xml
+++ b/extensions/aws-sns/runtime/pom.xml
@@ -83,10 +83,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>commons-logging-jboss-logging</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/aws-sqs/runtime/pom.xml b/extensions/aws-sqs/runtime/pom.xml
index f9576b6..efd5609 100644
--- a/extensions/aws-sqs/runtime/pom.xml
+++ b/extensions/aws-sqs/runtime/pom.xml
@@ -83,10 +83,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>commons-logging-jboss-logging</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/fhir/runtime/pom.xml b/extensions/fhir/runtime/pom.xml
index c956fbf..d93c32f 100644
--- a/extensions/fhir/runtime/pom.xml
+++ b/extensions/fhir/runtime/pom.xml
@@ -67,10 +67,6 @@
<artifactId>jboss-jaxb-api_2.3_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>commons-logging-jboss-logging</artifactId>
- </dependency>
- <dependency>
<groupId>com.oracle.substratevm</groupId>
<artifactId>svm</artifactId>
</dependency>
diff --git a/extensions/slack/deployment/pom.xml b/extensions/slack/deployment/pom.xml
index 333d179..7d3ff2e 100644
--- a/extensions/slack/deployment/pom.xml
+++ b/extensions/slack/deployment/pom.xml
@@ -48,6 +48,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-commons-logging-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-slack</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/slack/runtime/pom.xml b/extensions/slack/runtime/pom.xml
index 9bab48e..e7f0ffd 100644
--- a/extensions/slack/runtime/pom.xml
+++ b/extensions/slack/runtime/pom.xml
@@ -51,6 +51,10 @@
<artifactId>camel-quarkus-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-commons-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-slack</artifactId>
<exclusions>
@@ -60,10 +64,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>commons-logging-jboss-logging</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/sql/deployment/pom.xml b/extensions/sql/deployment/pom.xml
index 9349ac6..d52a1ae 100644
--- a/extensions/sql/deployment/pom.xml
+++ b/extensions/sql/deployment/pom.xml
@@ -59,6 +59,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-commons-logging-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-sql</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/sql/runtime/pom.xml b/extensions/sql/runtime/pom.xml
index fe01ab2..6b1aff5 100644
--- a/extensions/sql/runtime/pom.xml
+++ b/extensions/sql/runtime/pom.xml
@@ -53,14 +53,12 @@
<artifactId>camel-quarkus-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-support-commons-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-sql</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
@@ -75,10 +73,6 @@
<artifactId>jakarta.security.jacc-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>commons-logging-jboss-logging</artifactId>
- </dependency>
- <dependency>
<groupId>com.oracle.substratevm</groupId>
<artifactId>svm</artifactId>
</dependency>
diff --git a/extensions/support/commons-logging/runtime/pom.xml b/extensions/support/commons-logging/runtime/pom.xml
index 3875927..516dc9f 100644
--- a/extensions/support/commons-logging/runtime/pom.xml
+++ b/extensions/support/commons-logging/runtime/pom.xml
@@ -45,6 +45,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>commons-logging-jboss-logging</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/integration-tests/bean/pom.xml b/integration-tests/bean/pom.xml
index b6acdbb..747f501 100644
--- a/integration-tests/bean/pom.xml
+++ b/integration-tests/bean/pom.xml
@@ -86,10 +86,15 @@
<profiles>
<profile>
- <id>native</id>
+ <!--
+ Required because of:
+ - https://github.com/apache/camel-quarkus/issues/540
+ - https://github.com/oracle/graal/issues/1971
+ -->
+ <id>bean-native</id>
<activation>
<property>
- <name>native</name>
+ <name>bean-native</name>
</property>
</activation>
<build>
diff --git a/integration-tests/salesforce/pom.xml b/integration-tests/salesforce/pom.xml
index 0a4a514..d00bfba 100644
--- a/integration-tests/salesforce/pom.xml
+++ b/integration-tests/salesforce/pom.xml
@@ -78,10 +78,15 @@
<profiles>
<profile>
- <id>native</id>
+ <!--
+ Required because of:
+ - https://github.com/apache/camel-quarkus/issues/541
+ - https://github.com/oracle/graal/issues/1975
+ -->
+ <id>salesforce-native</id>
<activation>
<property>
- <name>native</name>
+ <name>salesforce-native</name>
</property>
</activation>
<build>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 8aae2a5..3206d08 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -364,6 +364,16 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-sql</artifactId>
<version>${camel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jcl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>