You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2022/01/19 09:29:32 UTC

[camel-quarkus] branch 2.2.x updated (2e2331c -> 3b6859b)

This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a change to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.


    from 2e2331c  [maven-release-plugin] Set next development version 2.2.2-SNAPSHOT
     new 33717d6  Ban netty-all #3464
     new 3b6859b  Commit the auto-generated change in qute.json

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-jvm/hdfs/deployment/pom.xml                         |  4 ++++
 extensions-jvm/hdfs/runtime/pom.xml                            | 10 ++++++++++
 extensions-jvm/spark/runtime/pom.xml                           |  4 ++++
 extensions/nsq/deployment/pom.xml                              |  4 ++++
 extensions/nsq/runtime/pom.xml                                 |  8 ++++++++
 .../resources/org/apache/camel/component/qute/qute.json        |  2 +-
 pom.xml                                                        |  1 +
 7 files changed, 32 insertions(+), 1 deletion(-)

[camel-quarkus] 02/02: Commit the auto-generated change in qute.json

Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 3b6859b7b74deecfb84e47f678cc8e3fee7136cd
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jan 18 15:55:45 2022 +0100

    Commit the auto-generated change in qute.json
---
 .../src/generated/resources/org/apache/camel/component/qute/qute.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
index db5d20b..124863e 100644
--- a/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
+++ b/extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel.quarkus",
     "artifactId": "camel-quarkus-qute-component",
-    "version": "2.2.1-SNAPSHOT",
+    "version": "2.2.2-SNAPSHOT",
     "scheme": "qute",
     "extendsScheme": "",
     "syntax": "qute:resourceUri",

[camel-quarkus] 01/02: Ban netty-all #3464

Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 33717d687a1baa5a8b664800f266a8a1185fe50d
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Mon Jan 17 23:21:22 2022 +0100

    Ban netty-all #3464
---
 extensions-jvm/hdfs/deployment/pom.xml |  4 ++++
 extensions-jvm/hdfs/runtime/pom.xml    | 10 ++++++++++
 extensions-jvm/spark/runtime/pom.xml   |  4 ++++
 extensions/nsq/deployment/pom.xml      |  4 ++++
 extensions/nsq/runtime/pom.xml         |  8 ++++++++
 pom.xml                                |  1 +
 6 files changed, 31 insertions(+)

diff --git a/extensions-jvm/hdfs/deployment/pom.xml b/extensions-jvm/hdfs/deployment/pom.xml
index 9514d64..4f05c41 100644
--- a/extensions-jvm/hdfs/deployment/pom.xml
+++ b/extensions-jvm/hdfs/deployment/pom.xml
@@ -39,6 +39,10 @@
             <artifactId>camel-quarkus-support-commons-logging-deployment</artifactId>
         </dependency>
         <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-netty-deployment</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-hdfs</artifactId>
         </dependency>
diff --git a/extensions-jvm/hdfs/runtime/pom.xml b/extensions-jvm/hdfs/runtime/pom.xml
index 68358f6..e3429ff 100644
--- a/extensions-jvm/hdfs/runtime/pom.xml
+++ b/extensions-jvm/hdfs/runtime/pom.xml
@@ -58,6 +58,16 @@
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-hdfs</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-all</artifactId>
+                </exclusion>
+             </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-netty</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/extensions-jvm/spark/runtime/pom.xml b/extensions-jvm/spark/runtime/pom.xml
index 8ae43f0..8ce510e 100644
--- a/extensions-jvm/spark/runtime/pom.xml
+++ b/extensions-jvm/spark/runtime/pom.xml
@@ -81,6 +81,10 @@
             <artifactId>camel-spark</artifactId>
             <exclusions>
                 <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-all</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>javax.activation</groupId>
                     <artifactId>activation</artifactId>
                 </exclusion>
diff --git a/extensions/nsq/deployment/pom.xml b/extensions/nsq/deployment/pom.xml
index 013fae8..87da9da 100644
--- a/extensions/nsq/deployment/pom.xml
+++ b/extensions/nsq/deployment/pom.xml
@@ -35,6 +35,10 @@
             <artifactId>camel-quarkus-core-deployment</artifactId>
         </dependency>
         <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-netty-deployment</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-nsq</artifactId>
         </dependency>
diff --git a/extensions/nsq/runtime/pom.xml b/extensions/nsq/runtime/pom.xml
index 18afe10..4b17af4 100644
--- a/extensions/nsq/runtime/pom.xml
+++ b/extensions/nsq/runtime/pom.xml
@@ -61,6 +61,10 @@
             <artifactId>camel-nsq</artifactId>
             <exclusions>
                 <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-all</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>org.apache.logging.log4j</groupId>
                     <artifactId>log4j-api</artifactId>
                 </exclusion>
@@ -70,6 +74,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-netty</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index a49d011..e6f34db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -654,6 +654,7 @@
                                                 <exclude>com.sun.activation:javax.activation</exclude><!-- use com.sun.activation:jakarta.activation instead -->
                                                 <exclude>commons-logging:commons-logging</exclude><!-- use org.jboss.logging:commons-logging-jboss-logging instead of commons-logging and commons-logging-api -->
                                                 <exclude>commons-logging:commons-logging-api</exclude><!-- use org.jboss.logging:commons-logging-jboss-logging instead of commons-logging and commons-logging-api -->
+                                                <exclude>io.netty:netty-all</exclude><!-- Use more fine grained netty artifacts or even io.quarkus:quarkus-netty instead -->
                                                 <exclude>javax.activation:activation</exclude><!-- use com.sun.activation:jakarta.activation instead -->
                                                 <exclude>javax.enterprise:cdi-api</exclude><!-- use jakarta.enterprise:jakarta.enterprise.cdi-api instead -->
                                                 <exclude>log4j:log4j</exclude><!-- use org.jboss.logmanager:log4j-jboss-logmanager instead -->