You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by mc...@apache.org on 2026/07/27 18:18:13 UTC
(hop) branch main updated: fix azure pom for the marketplace plugin, fixes #7636 (#7649)
This is an automated email from the ASF dual-hosted git repository.
mattcasters pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 996f30a251 fix azure pom for the marketplace plugin, fixes #7636 (#7649)
996f30a251 is described below
commit 996f30a2512f4a41bbdc9dc93dadecb68601d9c8
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Mon Jul 27 20:18:08 2026 +0200
fix azure pom for the marketplace plugin, fixes #7636 (#7649)
---
plugins/tech/azure/pom.xml | 257 ++++++++++++++++++++++-----
plugins/tech/azure/src/assembly/assembly.xml | 91 +---------
2 files changed, 212 insertions(+), 136 deletions(-)
diff --git a/plugins/tech/azure/pom.xml b/plugins/tech/azure/pom.xml
index 50abe19e19..67d7083116 100755
--- a/plugins/tech/azure/pom.xml
+++ b/plugins/tech/azure/pom.xml
@@ -35,25 +35,12 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-bom</artifactId>
- <version>${netty.version}</version>
- <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>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hop</groupId>
@@ -68,38 +55,7 @@
<dependencies>
<dependency>
<groupId>com.azure</groupId>
- <artifactId>azure-core-http-netty</artifactId>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-identity</artifactId>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-security-keyvault-secrets</artifactId>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-storage-blob</artifactId>
+ <artifactId>azure-storage-file-datalake</artifactId>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -119,10 +75,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-storage-file-datalake</artifactId>
- </dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-eventhubs</artifactId>
@@ -132,6 +84,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.google.code.gson</groupId>
<artifactId>*</artifactId>
@@ -140,6 +96,12 @@
<groupId>com.google.guava</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <!-- adal4j drags in an older oauth2-oidc-sdk; the shared, newer one
+ comes in below through msal4j and is routed to lib/core. -->
+ <exclusion>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>*</artifactId>
@@ -193,5 +155,202 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-core</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-core-http-netty</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-identity</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-json</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-security-keyvault-secrets</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-blob</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-common</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-internal-avro</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-xml</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>msal4j</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>msal4j-persistence-extension</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio-jvm</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.projectreactor</groupId>
+ <artifactId>reactor-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jspecify</groupId>
+ <artifactId>jspecify</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.reactivestreams</groupId>
+ <artifactId>reactive-streams</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/plugins/tech/azure/src/assembly/assembly.xml b/plugins/tech/azure/src/assembly/assembly.xml
index a964f593e8..843a591856 100644
--- a/plugins/tech/azure/src/assembly/assembly.xml
+++ b/plugins/tech/azure/src/assembly/assembly.xml
@@ -26,7 +26,7 @@
<files>
<file>
<source>${project.basedir}/src/main/resources/version.xml</source>
- <outputDirectory>plugins/tech/azure</outputDirectory>
+ <outputDirectory>${hop.plugin.libdir}</outputDirectory>
<filtered>true</filtered>
</file>
</files>
@@ -38,90 +38,7 @@
</fileSet>
</fileSets>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.apache.hop:hop-tech-azure:jar</include>
- </includes>
- <outputDirectory>plugins/tech/azure</outputDirectory>
- </dependencySet>
- <dependencySet>
- <scope>runtime</scope>
- <excludes>
- <exclude>org.apache.hop:hop-tech-azure:jar</exclude>
- <exclude>org.jetbrains:annotations:jar</exclude>
- <exclude>org.jetbrains.kotlin::jar</exclude>
- <exclude>io.netty::jar</exclude>
- <exclude>io.projectreactor.netty::jar</exclude>
- <exclude>com.github.stephenc.jcip:jcip-annotations:jar</exclude>
- <exclude>joda-time:joda-time:jar</exclude>
- <exclude>com.squareup.okhttp3:okhttp:jar</exclude>
- <exclude>com.squareup.okio::jar</exclude>
- <exclude>io.projectreactor:reactor-core:jar</exclude>
- <exclude>org.reactivestreams:reactive-streams:jar</exclude>
- <exclude>com.fasterxml.jackson.core:*</exclude>
- <exclude>com.fasterxml.jackson.datatype:*</exclude>
- <exclude>com.fasterxml.jackson.dataformat:*</exclude>
- <exclude>com.fasterxml.jackson.module:*</exclude>
- <exclude>org.slf4j:*</exclude>
- <exclude>net.java.dev.jna::jar</exclude>
- <exclude>com.microsoft.azure:msal4j-persistence-extension:jar</exclude>
- <exclude>com.microsoft.azure:msal4j:jar</exclude>
- <exclude>com.nimbusds:oauth2-oidc-sdk:jar</exclude>
- <exclude>com.azure:azure-core:jar</exclude>
- <exclude>com.azure:azure-identity:jar</exclude>
- <exclude>com.azure:azure-core-http-netty:jar</exclude>
- <exclude>com.azure:azure-json:jar</exclude>
- <exclude>com.microsoft.azure:azure-keyvault-core:jar</exclude>
- <exclude>com.azure:azure-security-keyvault-secrets:jar</exclude>
- <exclude>com.azure:azure-storage-blob:jar</exclude>
- <exclude>com.azure:azure-storage-common:jar</exclude>
- <exclude>com.azure:azure-storage-internal-avro:jar</exclude>
- <exclude>com.azure:azure-xml:jar</exclude>
- <exclude>com.nimbusds:nimbus-jose-jwt:jar</exclude>
- <exclude>net.minidev:*:jar</exclude>
- <exclude>org.ow2.asm:asm:jar</exclude>
- <exclude>org.jctools:jctools-core:jar</exclude>
- <exclude>org.jspecify:jspecify:jar</exclude>
- <exclude>com.nimbusds:lang-tag:jar</exclude>
- </excludes>
- <outputDirectory>plugins/tech/azure/lib</outputDirectory>
- </dependencySet>
- <dependencySet>
- <scope>runtime</scope>
- <includes>
- <include>org.jetbrains:annotations:jar</include>
- <include>org.jetbrains.kotlin::jar</include>
- <include>io.netty::jar</include>
- <include>io.projectreactor.netty::jar</include>
- <include>io.projectreactor:reactor-core:jar</include>
- <include>com.github.stephenc.jcip:jcip-annotations:jar</include>
- <include>joda-time:joda-time:jar</include>
- <include>com.squareup.okhttp3:okhttp:jar</include>
- <include>com.squareup.okio::jar</include>
- <include>org.reactivestreams:reactive-streams:jar</include>
- <include>net.java.dev.jna::jar</include>
- <include>com.microsoft.azure:msal4j-persistence-extension:jar</include>
- <include>com.microsoft.azure:msal4j:jar</include>
- <include>com.nimbusds:oauth2-oidc-sdk:jar</include>
- <include>com.azure:azure-core:jar</include>
- <include>com.azure:azure-identity:jar</include>
- <include>com.azure:azure-core-http-netty:jar</include>
- <include>com.azure:azure-json:jar</include>
- <include>com.microsoft.azure:azure-keyvault-core:jar</include>
- <include>com.azure:azure-security-keyvault-secrets:jar</include>
- <include>com.azure:azure-storage-blob:jar</include>
- <include>com.azure:azure-storage-common:jar</include>
- <include>com.azure:azure-storage-internal-avro:jar</include>
- <include>com.azure:azure-xml:jar</include>
- <include>com.nimbusds:nimbus-jose-jwt:jar</include>
- <include>net.minidev:*:jar</include>
- <include>org.ow2.asm:asm:jar</include>
- <include>org.jctools:jctools-core:jar</include>
- <include>org.jspecify:jspecify:jar</include>
- <include>com.nimbusds:lang-tag:jar</include>
- </includes>
- <outputDirectory>lib/core</outputDirectory>
- </dependencySet>
- </dependencySets>
+ <componentDescriptors>
+ <componentDescriptor>${maven.multiModuleProjectDirectory}/assemblies/shared/hop-plugin-libs.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>