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/18 08:48:00 UTC

[camel-quarkus] branch main updated: Ban netty-all #3464

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 6cad4cc  Ban netty-all #3464
6cad4cc is described below

commit 6cad4cc7c9d0c46ac0d6ef92af1c4cb7f3557e3f
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 d39609d..df35fe7 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 f59af8d..4bee0ab 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 72ce49b..168bb1f 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 eec1bcd..3c7f6e9 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 d37f46c..90cf456 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 605174b..bc06312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -668,6 +668,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 -->