Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use azure-sdk-bom instead of individual azure artifact versions #2297

Merged
merged 1 commit into from
Mar 1, 2021
Merged

Use azure-sdk-bom instead of individual azure artifact versions #2297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions ...g/apache/camel/quarkus/support/reactor/netty/deployment/ReactorNettySupportProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,14 @@ FeatureBuildItem feature() {
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",
Expand Down
7 changes: 1 addition & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->

Expand Down
38 changes: 7 additions & 31 deletions poms/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->

Expand Down Expand Up @@ -5570,37 +5577,6 @@
</exclusion>
</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>
Expand Down