diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e89c391..ff2a586 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -26,8 +26,8 @@ jobs: distribution: 'temurin' cache: maven - name: Build with Maven - run: mvn -P hadoop-3.4.0 -B verify + run: mvn -P hadoop-3.4.1 -B verify - name: Update dependency graph uses: advanced-security/maven-dependency-submission-action@bb3f7338b5bd0e3b225d8082e26b7b6289e17ef3 # v4.1.0 with: - maven-args: -P hadoop-3.4.0 + maven-args: -P hadoop-3.4.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index f806239..99f8246 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [0.4.1] - 2025-03-11 + +### Added + +- Add build profile for `3.4.1` ([#54]). + +### Changed + +- Update registry references to oci ([#53]). + +[#53]: https://github.com/stackabletech/hdfs-utils/pull/53 +[#54]: https://github.com/stackabletech/hdfs-utils/pull/54 + ## [0.4.0] - 2024-11-05 ### Changed diff --git a/Dockerfile b/Dockerfile index f63366e..59b7f1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.stackable.tech/stackable/hadoop:3.4.0-stackable0.0.0-dev +FROM oci.stackable.tech/sdp/hadoop:3.4.0-stackable0.0.0-dev # Remove existing hdfs-utils jars, so we can ship our custom one RUN rm -f /stackable/hadoop/share/hadoop/common/lib/hdfs-utils-*.jar diff --git a/README.md b/README.md index aeb0a9c..d21336d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ This project contains multiple plugins for Apache Hadoop, which are intended to ## Installation -Currently you can compile hdfs-utils against Hadoop 3.3.4, 3.3.6 or 3.4.0. You need to specify the version by activating either the `hadoop-3.3.4`, `hadoop-3.3.6` or the `hadoop-3.4.0` profile below. +Currently you can compile hdfs-utils against Hadoop 3.3.4, 3.3.6, 3.4.0 or 3.4.1. You need to specify the version by activating either the `hadoop-3.3.4`, `hadoop-3.3.6`, `hadoop-3.4.0` or the `hadoop-3.4.1` profile below. Run `mvn clean package -P hadoop-3.4.0` and put the resulting `target/hdfs-utils-*.jar` file on your HDFS classpath. The easiest way to achieve this is to put it in the directory `/stackable/hadoop/share/hadoop/tools/lib/`. diff --git a/pom.xml b/pom.xml index a52ae8b..2126b63 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ tech.stackable hdfs-utils - 0.4.0 + 0.4.1 Apache Hadoop HDFS utils https://github.com/stackabletech/hdfs-utils/ @@ -317,5 +317,20 @@ 2.12.7.1 + + hadoop-3.4.1 + + + 3.4.1 + + 1.7.36 + 2.12.7.1 + + diff --git a/test/stack/01-install-krb5-kdc.yaml b/test/stack/01-install-krb5-kdc.yaml index 49f5ec8..d1447cf 100644 --- a/test/stack/01-install-krb5-kdc.yaml +++ b/test/stack/01-install-krb5-kdc.yaml @@ -31,7 +31,7 @@ spec: spec: initContainers: - name: init - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - sh - -euo @@ -52,7 +52,7 @@ spec: name: data containers: - name: kdc - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - krb5kdc - -n @@ -65,7 +65,7 @@ spec: - mountPath: /var/kerberos/krb5kdc name: data - name: kadmind - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - kadmind - -nofork @@ -78,7 +78,7 @@ spec: - mountPath: /var/kerberos/krb5kdc name: data - name: client - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev tty: true stdin: true env: diff --git a/test/stack/30-test-hdfs-permissions.yaml b/test/stack/30-test-hdfs-permissions.yaml index a72cbe1..2948f35 100644 --- a/test/stack/30-test-hdfs-permissions.yaml +++ b/test/stack/30-test-hdfs-permissions.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: test-hdfs-permissions - image: docker.stackable.tech/stackable/hadoop:3.4.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/hadoop:3.4.0-stackable0.0.0-dev env: - name: HADOOP_CONF_DIR value: /stackable/conf/hdfs diff --git a/test/stack/31-benchmark-shell.yaml b/test/stack/31-benchmark-shell.yaml index 3af110d..8a8ae94 100644 --- a/test/stack/31-benchmark-shell.yaml +++ b/test/stack/31-benchmark-shell.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: benchmark-shell - image: docker.stackable.tech/stackable/hadoop:3.4.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/hadoop:3.4.0-stackable0.0.0-dev env: - name: HADOOP_CONF_DIR value: /stackable/conf/hdfs diff --git a/test/topology-provider/stack/01-install-krb5-kdc.yaml b/test/topology-provider/stack/01-install-krb5-kdc.yaml index 49f5ec8..d1447cf 100644 --- a/test/topology-provider/stack/01-install-krb5-kdc.yaml +++ b/test/topology-provider/stack/01-install-krb5-kdc.yaml @@ -31,7 +31,7 @@ spec: spec: initContainers: - name: init - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - sh - -euo @@ -52,7 +52,7 @@ spec: name: data containers: - name: kdc - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - krb5kdc - -n @@ -65,7 +65,7 @@ spec: - mountPath: /var/kerberos/krb5kdc name: data - name: kadmind - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev args: - kadmind - -nofork @@ -78,7 +78,7 @@ spec: - mountPath: /var/kerberos/krb5kdc name: data - name: client - image: docker.stackable.tech/stackable/krb5:1.18.2-stackable0.0.0-dev + image: oci.stackable.tech/sdp/krb5:1.18.2-stackable0.0.0-dev tty: true stdin: true env: diff --git a/test/topology-provider/teragen/Dockerfile b/test/topology-provider/teragen/Dockerfile index e176b70..ee44bae 100644 --- a/test/topology-provider/teragen/Dockerfile +++ b/test/topology-provider/teragen/Dockerfile @@ -3,7 +3,7 @@ # docker build . -t docker.stackable.tech/stackable/spark-k8s-with-teragen:3.5.0-stackable0.0.0-dev # -FROM docker.stackable.tech/stackable/spark-k8s:3.5.1-stackable0.0.0-dev +FROM oci.stackable.tech/sdp/spark-k8s:3.5.1-stackable0.0.0-dev # this .jar is compiled from the code here: https://github.com/ehiggs/spark-terasort COPY --chown=stackable:stackable ./spark-terasort-1.2-SNAPSHOT.jar /tmp/ \ No newline at end of file