This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 2a66767 Use azure-sdk-bom instead of individual azure artifact
versions
2a66767 is described below
commit 2a667675239b6b0052475da8d5a3d14a14a77de2
Author: Peter Palaga <[email protected]>
AuthorDate: Mon Mar 1 16:28:44 2021 +0100
Use azure-sdk-bom instead of individual azure artifact versions
---
.../deployment/ReactorNettySupportProcessor.java | 11 +++++--
pom.xml | 7 +---
poms/bom/pom.xml | 38 ++++------------------
3 files changed, 16 insertions(+), 40 deletions(-)
diff --git
a/extensions-support/reactor-netty/deployment/src/main/java/org/apache/camel/quarkus/support/reactor/netty/deployment/ReactorNettySupportProcessor.java
b/extensions-support/reactor-netty/deployment/src/main/java/org/apache/camel/quarkus/support/reactor/netty/deployment/ReactorNettySupportProcessor.java
index fdca2d1..6294832 100644
---
a/extensions-support/reactor-netty/deployment/src/main/java/org/apache/camel/quarkus/support/reactor/netty/deployment/ReactorNettySupportProcessor.java
+++
b/extensions-support/reactor-netty/deployment/src/main/java/org/apache/camel/quarkus/support/reactor/netty/deployment/ReactorNettySupportProcessor.java
@@ -36,9 +36,14 @@ public class ReactorNettySupportProcessor {
void
runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem>
runtimeInitializedClasses) {
Stream.of(
- "io.netty.util.NetUtil", // TODO: move this to quarkus-netty
https://github.com/apache/camel-quarkus/issues/2142
- "io.netty.channel.socket.InternetProtocolFamily", // TODO:
move this to quarkus-netty https://github.com/apache/camel-quarkus/issues/2142
- "io.netty.channel.socket.nio.ProtocolFamilyConverter$1", //
TODO: move this to quarkus-netty
https://github.com/apache/camel-quarkus/issues/2142
+ /* The following io.netty.util.* items were not accepted
+ * to quarkus via
https://github.com/quarkusio/quarkus/pull/14994
+ * Keeping them here for now */
+ "io.netty.util.NetUtil",
+ "io.netty.channel.socket.InternetProtocolFamily",
+ "io.netty.handler.ssl.OpenSsl",
+ "io.netty.channel.socket.nio.ProtocolFamilyConverter$1",
+ "io.netty.internal.tcnative.SSL",
"reactor.netty.http.client.HttpClient",
"reactor.netty.tcp.TcpClient",
diff --git a/pom.xml b/pom.xml
index 5a472b2..f53744e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,12 +45,7 @@
<aws-java-sdk.version>${aws-java-sdk-version}</aws-java-sdk.version>
<awssdk1-swf-libs.version>${aws-java-sdk-swf-libs}</awssdk1-swf-libs.version>
<!-- TODO: Use azure-sdk-bom once they start maintaining it properly
https://github.com/Azure/azure-sdk-for-java/issues/18759 -->
- <azure-core.version>1.12.0</azure-core.version><!-- keep compatible
with the azure artifacts below -->
- <azure-sdk-bom.version>1.0.1</azure-sdk-bom.version>
-
<azure-storage-blob-java-sdk12.version>${azure-storage-blob-java-sdk12-version}</azure-storage-blob-java-sdk12.version>
-
<azure-storage-queue-java-sdk12.version>${azure-storage-queue-java-sdk12-version}</azure-storage-queue-java-sdk12.version>
-
<azure-eventhubs-java.version>${azure-eventhubs-java-version}</azure-eventhubs-java.version>
-
<azure-eventhubs-checkpointstore-blob.version>${azure-eventhubs-checkpointstore-blob-version}</azure-eventhubs-checkpointstore-blob.version>
+ <azure-sdk-bom.version>1.0.2</azure-sdk-bom.version><!-- TODO inherit
from Camel https://issues.apache.org/jira/browse/CAMEL-16278 -->
<bouncycastle.version>${bouncycastle-version}</bouncycastle.version><!-- keep
in sync with Camel -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 8b0e2c9..0556c3f 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -68,6 +68,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-sdk-bom</artifactId>
+ <version>${azure-sdk-bom.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- Dependencies a..z; do not remove this comment, it is
important when sorting via mvn process-resources -Pformat -->
@@ -5571,37 +5578,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-core</artifactId>
- <version>${azure-core.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
-
<artifactId>netty-tcnative-boringssl-static</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-messaging-eventhubs</artifactId>
- <version>${azure-eventhubs-java.version}</version>
- </dependency>
- <dependency>
- <groupId>com.azure</groupId>
-
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
-
<version>${azure-eventhubs-checkpointstore-blob.version}</version>
- </dependency>
- <dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-storage-blob</artifactId>
- <version>${azure-storage-blob-java-sdk12.version}</version>
- </dependency>
- <dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-storage-queue</artifactId>
- <version>${azure-storage-queue-java-sdk12-version}</version>
- </dependency>
- <dependency>
<groupId>com.datastax.oss.quarkus</groupId>
<artifactId>cassandra-quarkus-client</artifactId>
<version>${cassandra-quarkus.version}</version>
