From 94e81f5a0ace1177defc5c2530dff4be7f79c703 Mon Sep 17 00:00:00 2001 From: Jim Halfpenny Date: Fri, 22 Nov 2024 10:46:14 +0000 Subject: [PATCH 1/6] Add dependencies for ABFS and ADLS to NiFi https://github.com/stackabletech/docker-images/issues/942 --- nifi/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi/Dockerfile b/nifi/Dockerfile index fb94a9554..9fdfe6ea6 100644 --- a/nifi/Dockerfile +++ b/nifi/Dockerfile @@ -45,7 +45,7 @@ RUN curl 'https://repo.stackable.tech/repository/m2/tech/stackable/nifi/stackabl patches/apply_patches.sh ${PRODUCT} && \ # Build NiFi cd /stackable/nifi-${PRODUCT}-src/ && \ - mvn clean install -Dmaven.javadoc.skip=true -DskipTests --activate-profiles include-iceberg,include-hadoop-aws && \ + mvn clean install -Dmaven.javadoc.skip=true -DskipTests --activate-profiles include-iceberg,include-hadoop-aws,include-hadoop-azure && \ # Copy the binaries to the /stackable folder mv /stackable/nifi-${PRODUCT}-src/nifi-assembly/target/nifi-${PRODUCT}-bin/nifi-${PRODUCT} /stackable/nifi-${PRODUCT} && \ # Copy the SBOM as well From 52f65ae7998824ae4d52330440d48bdd561c73e6 Mon Sep 17 00:00:00 2001 From: Jim Halfpenny Date: Fri, 22 Nov 2024 10:58:19 +0000 Subject: [PATCH 2/6] Add dependencies for ADLS and GCP to NiFi https://github.com/stackabletech/docker-images/issues/942 --- nifi/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi/Dockerfile b/nifi/Dockerfile index 9fdfe6ea6..b513a2400 100644 --- a/nifi/Dockerfile +++ b/nifi/Dockerfile @@ -45,7 +45,7 @@ RUN curl 'https://repo.stackable.tech/repository/m2/tech/stackable/nifi/stackabl patches/apply_patches.sh ${PRODUCT} && \ # Build NiFi cd /stackable/nifi-${PRODUCT}-src/ && \ - mvn clean install -Dmaven.javadoc.skip=true -DskipTests --activate-profiles include-iceberg,include-hadoop-aws,include-hadoop-azure && \ + mvn clean install -Dmaven.javadoc.skip=true -DskipTests --activate-profiles include-iceberg,include-hadoop-aws,include-hadoop-azure,include-hadoop-gcp && \ # Copy the binaries to the /stackable folder mv /stackable/nifi-${PRODUCT}-src/nifi-assembly/target/nifi-${PRODUCT}-bin/nifi-${PRODUCT} /stackable/nifi-${PRODUCT} && \ # Copy the SBOM as well From 23915bac07594d8dc14443634c2711c07b47baee Mon Sep 17 00:00:00 2001 From: Jim Halfpenny Date: Fri, 22 Nov 2024 11:29:29 +0000 Subject: [PATCH 3/6] Updated CHANGELOG.md for PR #943 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b311356d2..2d90df747 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ All notable changes to this project will be documented in this file. - hbase: hbase-entrypoint.sh script to start and gracefully stop services ([#898]). - tools: install yq command line tool for YAML manipulation ([#912]). - nifi: Add version 2.0.0 ([#917]). +- nifi: Add NiFi hadoop Azure and GCP libraries ([#943]) ### Changed From 3ed69dbf39d3d2f77d8879ad87955857bd1dc8a0 Mon Sep 17 00:00:00 2001 From: Jim Halfpenny <1987407+Jimvin@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:33:22 +0000 Subject: [PATCH 4/6] Update CHANGELOG.md Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d90df747..6d782e58b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ All notable changes to this project will be documented in this file. - hbase: hbase-entrypoint.sh script to start and gracefully stop services ([#898]). - tools: install yq command line tool for YAML manipulation ([#912]). - nifi: Add version 2.0.0 ([#917]). -- nifi: Add NiFi hadoop Azure and GCP libraries ([#943]) +- nifi: Add NiFi hadoop Azure and GCP libraries ([#943]). ### Changed From 75326c23d24b3cd5c41e84db612cf8a42a130a32 Mon Sep 17 00:00:00 2001 From: Jim Halfpenny Date: Fri, 22 Nov 2024 11:34:17 +0000 Subject: [PATCH 5/6] Updated CHANGELOG.md for PR #943 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d90df747..64577a1c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -122,6 +122,7 @@ All notable changes to this project will be documented in this file. [#924]: https://github.com/stackabletech/docker-images/pull/924 [#925]: https://github.com/stackabletech/docker-images/pull/925 [#926]: https://github.com/stackabletech/docker-images/pull/926 +[#943]: https://github.com/stackabletech/docker-images/pull/943 ## [24.7.0] - 2024-07-24 From f4ee39d63329e2a8503de0fbb85c0246983ceda7 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Fri, 22 Nov 2024 14:43:17 +0100 Subject: [PATCH 6/6] chore: update changelog to move this into Unreleased --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40ece4e77..f4a58413c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Added + +- nifi: Add NiFi hadoop Azure and GCP libraries ([#943]). + +[#943]: https://github.com/stackabletech/docker-images/pull/943 + ## [24.11.0] - 2024-11-18 ### Added @@ -27,7 +33,6 @@ All notable changes to this project will be documented in this file. - hbase: hbase-entrypoint.sh script to start and gracefully stop services ([#898]). - tools: install yq command line tool for YAML manipulation ([#912]). - nifi: Add version 2.0.0 ([#917]). -- nifi: Add NiFi hadoop Azure and GCP libraries ([#943]). ### Changed @@ -122,7 +127,6 @@ All notable changes to this project will be documented in this file. [#924]: https://github.com/stackabletech/docker-images/pull/924 [#925]: https://github.com/stackabletech/docker-images/pull/925 [#926]: https://github.com/stackabletech/docker-images/pull/926 -[#943]: https://github.com/stackabletech/docker-images/pull/943 ## [24.7.0] - 2024-07-24