This is an automated email from the ASF dual-hosted git repository.
hansva 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 aaa919ece8 some dependency fixes (#7661)
aaa919ece8 is described below
commit aaa919ece89329b92c0fb1c9c4b38e314b0e38ca
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Tue Jul 28 12:08:11 2026 +0200
some dependency fixes (#7661)
---
assemblies/client/pom.xml | 11 ++
assemblies/plugins/pom.xml | 191 +++++++++++++++++++++++++++++
plugins/tech/aws/pom.xml | 22 ++--
plugins/tech/aws/src/assembly/assembly.xml | 72 +----------
plugins/tech/azure/pom.xml | 6 +
pom.xml | 31 -----
6 files changed, 223 insertions(+), 110 deletions(-)
diff --git a/assemblies/client/pom.xml b/assemblies/client/pom.xml
index 155ae1ef27..b99efff000 100644
--- a/assemblies/client/pom.xml
+++ b/assemblies/client/pom.xml
@@ -162,6 +162,17 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>full</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-engines-beam</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/assemblies/plugins/pom.xml b/assemblies/plugins/pom.xml
index 36486762b9..a30482a610 100644
--- a/assemblies/plugins/pom.xml
+++ b/assemblies/plugins/pom.xml
@@ -1559,4 +1559,195 @@
</dependency>
</dependencies>
+
+ <!--
+ The default build ships the "lean" client: heavy plugins are published
to the
+ marketplace instead (see
plugins/misc/marketplace/.../optional-plugins.yaml) so the
+ release artifacts stay under the ASF 850MB package limit.
+
+ The "full" profile adds every marketplace-optional plugin back in,
producing a
+ distribution that contains all plugins. Use it to validate library
routing, i.e.
+ which jars are shared through lib/core versus which stay
plugin-private, since
+ that can only be judged against a tree where every plugin is present:
+
+ ./mvnw -pl assemblies/client -am package -Pfull
+
+ This profile is a development and verification aid; it is not a
release artifact
+ and it deliberately exceeds the size limit enforced by
tools/check-assembly-size.sh.
+ -->
+ <profiles>
+ <profile>
+ <id>full</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-engines-spark</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-misc-documentation</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-misc-import</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-misc-mail</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-misc-py4j</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-misc-rest</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-arrow</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-avro</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-aws</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-azure</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-cassandra</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-databricks</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-dropbox</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-elastic</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-google</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-minio</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-mongodb</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-neo4j</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-opensearch</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-parquet</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-tech-salesforce</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-transform-drools</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-transform-edi2xml</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-transform-fake</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-transform-script</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-transform-stanfordnlp</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-transform-tika</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hop</groupId>
+ <artifactId>hop-transform-vcard</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/plugins/tech/aws/pom.xml b/plugins/tech/aws/pom.xml
index 3e188fbdd7..114b792695 100644
--- a/plugins/tech/aws/pom.xml
+++ b/plugins/tech/aws/pom.xml
@@ -30,6 +30,7 @@
<properties>
<aws-java-sdk.version>2.20.162</aws-java-sdk.version>
+
<hop.jdbc.driver1>com.amazon.redshift:redshift-jdbc42</hop.jdbc.driver1>
</properties>
<dependencyManagement>
@@ -52,12 +53,10 @@
</dependencyManagement>
<dependencies>
- <!-- AWS SDK v2: S3, SNS, SQS (aligned with Beam 2.71.0) -->
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>s3</artifactId>
- <version>${aws-java-sdk.version}</version>
- <scope>compile</scope>
+ <groupId>com.amazon.redshift</groupId>
+ <artifactId>redshift-jdbc42</artifactId>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
@@ -67,9 +66,9 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
- <artifactId>sns</artifactId>
+ <artifactId>s3</artifactId>
<version>${aws-java-sdk.version}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
@@ -79,9 +78,9 @@
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
- <artifactId>sqs</artifactId>
+ <artifactId>sns</artifactId>
<version>${aws-java-sdk.version}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
@@ -90,8 +89,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.amazon.redshift</groupId>
- <artifactId>redshift-jdbc42</artifactId>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>sqs</artifactId>
+ <version>${aws-java-sdk.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
diff --git a/plugins/tech/aws/src/assembly/assembly.xml
b/plugins/tech/aws/src/assembly/assembly.xml
index f82aef822d..b1fb574d20 100644
--- a/plugins/tech/aws/src/assembly/assembly.xml
+++ b/plugins/tech/aws/src/assembly/assembly.xml
@@ -26,76 +26,12 @@
<files>
<file>
<source>${project.basedir}/src/main/resources/version.xml</source>
- <outputDirectory>plugins/tech/aws</outputDirectory>
+ <outputDirectory>${hop.plugin.libdir}</outputDirectory>
<filtered>true</filtered>
</file>
</files>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/src/main/samples</directory>
- <outputDirectory>config/projects/samples/</outputDirectory>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.apache.hop:hop-tech-aws:jar</include>
- </includes>
- <outputDirectory>plugins/tech/aws</outputDirectory>
- </dependencySet>
- <dependencySet>
- <scope>runtime</scope>
- <excludes>
- <exclude>org.apache.hop:hop-tech-aws:jar</exclude>
- <exclude>joda-time:joda-time:jar</exclude>
- <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>
- <exclude>com.amazonaws:aws-java-sdk-kms:jar</exclude>
- <exclude>com.amazonaws:aws-java-sdk-s3:jar</exclude>
-
<exclude>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</exclude>
- <exclude>software.amazon.awssdk:s3:jar</exclude>
- <exclude>software.amazon.awssdk:sns:jar</exclude>
- <exclude>io.netty::jar</exclude>
- <exclude>org.apache.httpcomponents::jar</exclude>
- <exclude>software.amazon.awssdk:json-utils:jar</exclude>
-
<exclude>com.fasterxml.jackson.core:jackson-annotations:jar</exclude>
- <exclude>software.amazon.awssdk:*:jar</exclude>
- <exclude>commons-codec:commons-codec:jar</exclude>
- <exclude>software.amazon.eventstream:eventstream:jar</exclude>
- <exclude>org.reactivestreams:reactive-streams:jar</exclude>
- <exclude>org.slf4j:slf4j-api:jar</exclude>
- </excludes>
- <outputDirectory>plugins/tech/aws/lib</outputDirectory>
- </dependencySet>
- <dependencySet>
- <scope>runtime</scope>
- <includes>
- <include>joda-time:joda-time:jar</include>
- <include>com.amazonaws:aws-java-sdk-core:jar</include>
- <include>com.amazonaws:aws-java-sdk-kms:jar</include>
- <include>com.amazonaws:aws-java-sdk-s3:jar</include>
-
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar</include>
- <include>software.amazon.awssdk:s3:jar</include>
- <include>software.amazon.awssdk:sns:jar</include>
- <include>io.netty::jar</include>
- <include>org.apache.httpcomponents::jar</include>
- <include>software.amazon.awssdk:json-utils:jar</include>
-
<include>com.fasterxml.jackson.core:jackson-annotations:jar</include>
- <include>software.amazon.awssdk:*:jar</include>
- <include>commons-codec:commons-codec:jar</include>
- <include>software.amazon.eventstream:eventstream:jar</include>
- <include>org.reactivestreams:reactive-streams:jar</include>
- <include>org.slf4j:slf4j-api:jar</include>
- </includes>
- <outputDirectory>lib/core</outputDirectory>
- </dependencySet>
- <dependencySet>
- <scope>provided</scope>
- <includes>
- <include>com.amazon.redshift:redshift-jdbc42:jar</include>
- </includes>
- <outputDirectory>lib/jdbc</outputDirectory>
- </dependencySet>
- </dependencySets>
+ <componentDescriptors>
+
<componentDescriptor>${maven.multiModuleProjectDirectory}/assemblies/shared/hop-plugin-libs.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
diff --git a/plugins/tech/azure/pom.xml b/plugins/tech/azure/pom.xml
index 67d7083116..4307324434 100755
--- a/plugins/tech/azure/pom.xml
+++ b/plugins/tech/azure/pom.xml
@@ -266,6 +266,12 @@
<artifactId>azure-xml</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>azure-keyvault-core</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
diff --git a/pom.xml b/pom.xml
index 12b06da74c..c608a24967 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,6 @@
<java-hamcrest.version>2.0.0.0</java-hamcrest.version>
<javaVersion>${target.jdk.version}</javaVersion>
<javadoc.failOnWarnings>false</javadoc.failOnWarnings>
- <jetty.version>12.1.7</jetty.version>
<json-path.version>2.10.0</json-path.version>
<junit.version>6.0.3</junit.version>
<license.bundleLicenseFile>META-INF/LICENSE.txt</license.bundleLicenseFile>
@@ -176,36 +175,6 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-alpn-client</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.compression</groupId>
- <artifactId>jetty-compression-common</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.compression</groupId>
- <artifactId>jetty-compression-gzip</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>${jetty.version}</version>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
