Update atom. Use atom-native + remove Java (#1789)

prabhu · web-flow · commit 65febef738be · 2025-05-12T23:42:55.000+01:00
* Remove Java and atom from a number of images

Signed-off-by: Prabhu Subramanian &lt;prabhu@appthreat.com&gt;

* Use atom native binary for node 20, Java 11 and 17

Signed-off-by: Prabhu Subramanian &lt;prabhu@appthreat.com&gt;

* Use atom native binary for node 20, Java 11 and 17

Signed-off-by: Prabhu Subramanian &lt;prabhu@appthreat.com&gt;

* Include atom-tools for java 17

Signed-off-by: Prabhu Subramanian &lt;prabhu@appthreat.com&gt;

* Bug fix

Signed-off-by: Prabhu Subramanian &lt;prabhu@appthreat.com&gt;

---------

Signed-off-by: Prabhu Subramanian &lt;prabhu@appthreat.com&gt;
diff --git a/.github/workflows/python-atom-tests.yml b/.github/workflows/python-atom-tests.yml
@@ -35,6 +35,7 @@ jobs:
         with:
           repository: 'scipy/scipy'
           path: 'repotests/scipy'
+          ref: 'v1.15.2'
       - uses: actions/checkout@v4
         with:
           repository: 'psf/black'
diff --git a/ci/base-images/cdxgen/Dockerfile.dotnet6 b/ci/base-images/cdxgen/Dockerfile.dotnet6
@@ -21,7 +21,6 @@ COPY . /opt/cdxgen
 
 RUN set -e; \
     ARCH_NAME="$(rpm --eval '%{_arch}')"; \
-    url=; \
     case "${ARCH_NAME##*-}" in \
         'x86_64') \
             DOSAI_ARCH_SUFFIX='-full'; \
diff --git a/ci/base-images/cdxgen/Dockerfile.java17 b/ci/base-images/cdxgen/Dockerfile.java17
@@ -12,14 +12,34 @@ LABEL maintainer="CycloneDX" \
       org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -p 9090:9090 -v $(pwd):/app:rw -t ghcr.io/cyclonedx/cdxgen-java17:v11 -r /app --server"
 
 ENV CDXGEN_IN_CONTAINER=true \
+    ATOM_CMD=/usr/local/bin/atom \
     NODE_COMPILE_CACHE="/opt/cdxgen-node-cache"
 ENV PATH=${PATH}:/usr/local/bin:/opt/cdxgen/node_modules/.bin:
 
 COPY . /opt/cdxgen
 
-RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && corepack pnpm cache delete \
+RUN set -e; \
+    ARCH_NAME="$(rpm --eval '%{_arch}')"; \
+    case "${ARCH_NAME##*-}" in \
+        'x86_64') \
+            ATOM_ARCH_SUFFIX='amd64'; \
+            ;; \
+        'arm64') \
+            ATOM_ARCH_SUFFIX='arm64'; \
+            ;; \
+        'aarch64') \
+            ATOM_ARCH_SUFFIX='arm64'; \
+            ;; \
+        *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
+    esac \
+    && cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && corepack pnpm cache delete \
+    && curl -L https://github.com/AppThreat/atom/releases/latest/download/atom-${ATOM_ARCH_SUFFIX} -o /usr/local/bin/atom \
+    && chmod +x /usr/local/bin/atom \
+    && /usr/local/bin/atom --help \
     && mkdir -p /opt/cdxgen-node-cache \
     && node /opt/cdxgen/bin/cdxgen.js --help \
+    && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
+    && atom-tools --help \
     && rm -rf /root/.cache/node \
     && chmod a-w -R /opt
 WORKDIR /app
diff --git a/ci/base-images/cdxgen/Dockerfile.node20 b/ci/base-images/cdxgen/Dockerfile.node20
@@ -13,12 +13,31 @@ LABEL maintainer="CycloneDX" \
 
 ENV CDXGEN_IN_CONTAINER=true \
     NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
+    ATOM_CMD=/usr/local/bin/atom \
     PYTHONPATH=/opt/pypi:${PYTHONPATH}
 ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
 
 COPY . /opt/cdxgen
 
-RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && corepack pnpm cache delete \
+RUN set -e; \
+    ARCH_NAME="$(rpm --eval '%{_arch}')"; \
+    case "${ARCH_NAME##*-}" in \
+        'x86_64') \
+            ATOM_ARCH_SUFFIX='amd64'; \
+            ;; \
+        'arm64') \
+            ATOM_ARCH_SUFFIX='arm64'; \
+            ;; \
+        'aarch64') \
+            ATOM_ARCH_SUFFIX='arm64'; \
+            ;; \
+        *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
+    esac \
+    && cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --no-optional --frozen-lockfile && corepack pnpm cache delete \
+    && curl -L https://github.com/AppThreat/atom/releases/latest/download/atom-${ATOM_ARCH_SUFFIX} -o /usr/local/bin/atom \
+    && chmod +x /usr/local/bin/atom \
+    && /usr/local/bin/atom --help \
+    && npm install -g @appthreat/atom-parsetools \
     && mkdir -p /opt/cdxgen-node-cache \
     && node /opt/cdxgen/bin/cdxgen.js --help \
     && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
diff --git a/ci/base-images/cdxgen/Dockerfile.ruby25 b/ci/base-images/cdxgen/Dockerfile.ruby25
@@ -21,7 +21,7 @@ ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
 COPY . /opt/cdxgen
 
 RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && corepack pnpm cache delete \
-    && npm install -g @appthreat/atom \
+    && npm install -g @appthreat/atom-parsetools \
     && mkdir -p /opt/cdxgen-node-cache \
     && node /opt/cdxgen/bin/cdxgen.js --help \
     && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
diff --git a/ci/base-images/cdxgen/debian/Dockerfile.ruby26 b/ci/base-images/cdxgen/debian/Dockerfile.ruby26
@@ -21,7 +21,7 @@ ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
 COPY . /opt/cdxgen
 
 RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && corepack pnpm cache delete \
-    && npm install -g @appthreat/atom \
+    && npm install -g @appthreat/atom-parsetools \
     && mkdir -p /opt/cdxgen-node-cache \
     && node /opt/cdxgen/bin/cdxgen.js --help \
     && rbastgen --help \
diff --git a/ci/base-images/cdxgen/debian/Dockerfile.ruby33 b/ci/base-images/cdxgen/debian/Dockerfile.ruby33
@@ -21,7 +21,7 @@ ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
 COPY . /opt/cdxgen
 
 RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && corepack pnpm cache delete \
-    && npm install -g @appthreat/atom \
+    && npm install -g @appthreat/atom-parsetools \
     && mkdir -p /opt/cdxgen-node-cache \
     && node /opt/cdxgen/bin/cdxgen.js --help \
     && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
diff --git a/ci/base-images/cdxgen/debian/Dockerfile.ruby34 b/ci/base-images/cdxgen/debian/Dockerfile.ruby34
@@ -20,7 +20,7 @@ ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
 COPY . /opt/cdxgen
 
 RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && corepack pnpm cache delete \
-    && npm install -g @appthreat/atom \
+    && npm install -g @appthreat/atom-parsetools \
     && mkdir -p /opt/cdxgen-node-cache \
     && node /opt/cdxgen/bin/cdxgen.js --help \
     && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
diff --git a/ci/base-images/debian/Dockerfile.dotnet6 b/ci/base-images/debian/Dockerfile.dotnet6
@@ -1,18 +1,15 @@
 FROM mcr.microsoft.com/dotnet/sdk:6.0-bookworm-slim
 
-ARG JAVA_VERSION=24-tem
 ARG NODE_VERSION=22.14.0
 
-ENV JAVA_VERSION=$JAVA_VERSION \
-    JAVA_HOME="/opt/java/${JAVA_VERSION}" \
-    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
     DOTNET_NOLOGO=true \
     DOTNET_USE_POLLING_FILE_WATCHER=false \
     NUGET_XMLDOC_MODE=skip \
     DOTNET_RUNNING_IN_CONTAINER=true \
     DOTNET_CLI_TELEMETRY_OPTOUT=1 \
     NVM_DIR="/root/.nvm"
-ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:/usr/local/bin:/root/.local/bin:
+ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:/usr/local/bin:/root/.local/bin:
 
 COPY ci/base-images/debian/install.sh /tmp/
 
diff --git a/ci/base-images/debian/Dockerfile.dotnet8 b/ci/base-images/debian/Dockerfile.dotnet8
@@ -1,18 +1,15 @@
 FROM mcr.microsoft.com/dotnet/sdk:8.0
 
-ARG JAVA_VERSION=24-tem
 ARG NODE_VERSION=24.0.1
 
-ENV JAVA_VERSION=$JAVA_VERSION \
-    JAVA_HOME="/opt/java/${JAVA_VERSION}" \
-    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
     DOTNET_NOLOGO=true \
     DOTNET_USE_POLLING_FILE_WATCHER=false \
     NUGET_XMLDOC_MODE=skip \
     DOTNET_RUNNING_IN_CONTAINER=true \
     DOTNET_CLI_TELEMETRY_OPTOUT=1 \
     NVM_DIR="/root/.nvm"
-ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:/usr/local/bin:/root/.local/bin:
+ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:/usr/local/bin:/root/.local/bin:
 
 COPY ci/base-images/debian/install.sh /tmp/
 
diff --git a/ci/base-images/debian/Dockerfile.dotnet9 b/ci/base-images/debian/Dockerfile.dotnet9
@@ -1,18 +1,15 @@
 FROM mcr.microsoft.com/dotnet/sdk:9.0
 
-ARG JAVA_VERSION=24-tem
 ARG NODE_VERSION=24.0.1
 
-ENV JAVA_VERSION=$JAVA_VERSION \
-    JAVA_HOME="/opt/java/${JAVA_VERSION}" \
-    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
     DOTNET_NOLOGO=true \
     DOTNET_USE_POLLING_FILE_WATCHER=false \
     NUGET_XMLDOC_MODE=skip \
     DOTNET_RUNNING_IN_CONTAINER=true \
     DOTNET_CLI_TELEMETRY_OPTOUT=1 \
     NVM_DIR="/root/.nvm"
-ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:/usr/local/bin:/root/.local/bin:
+ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:/usr/local/bin:/root/.local/bin:
 
 COPY ci/base-images/debian/install.sh /tmp/
 
diff --git a/ci/base-images/debian/Dockerfile.ruby18 b/ci/base-images/debian/Dockerfile.ruby18
@@ -1,21 +1,18 @@
 FROM debian:jessie
 
-ARG JAVA_VERSION=21.0.6-tem
 ARG ATOM_RUBY_VERSION=3.4.3
 ARG BUNDLER_VERSION=1.17.3
 ARG RAKE_VERSION=0.7.3
 ARG RMAGICK_VERSION=2.16.0
 ARG NOKOGIRI_VERSION=1.5.11
 
-ENV JAVA_VERSION=$JAVA_VERSION \
-    JAVA_HOME="/opt/java/${JAVA_VERSION}" \
-    ATOM_RUBY_VERSION=$ATOM_RUBY_VERSION \
+ENV ATOM_RUBY_VERSION=$ATOM_RUBY_VERSION \
+    ATOM_CMD=/usr/local/bin/atom \
     RUBY_VERSION=1.8.7-p374 \
     BUNDLER_VERSION=$BUNDLER_VERSION \
     RAKE_VERSION=$RAKE_VERSION \
     RMAGICK_VERSION=$RMAGICK_VERSION \
-    BUNDLE_SILENCE_ROOT_WARNING=true \
-    JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
+    BUNDLE_SILENCE_ROOT_WARNING=true
 ENV PATH=/usr/local/rvm/gems/ruby-${RUBY_VERSION}/bin:/usr/local/rvm/gems/ruby-${RUBY_VERSION}@global/bin:/usr/local/rvm/rubies/ruby-${RUBY_VERSION}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/rvm/bin:${PATH}:/usr/local/bin:/root/.local/bin:/root/.rbenv/bin:
 
 COPY ci/base-images/debian/install.sh /tmp/
diff --git a/ci/base-images/debian/Dockerfile.ruby26 b/ci/base-images/debian/Dockerfile.ruby26
@@ -1,14 +1,11 @@
 FROM ruby:2.6.10
 
-ARG JAVA_VERSION=21.0.6-tem
 ARG NODE_VERSION=20.19.1
 ARG ATOM_RUBY_VERSION=3.4.3
 
-ENV JAVA_VERSION=$JAVA_VERSION \
-    JAVA_HOME="/opt/java/${JAVA_VERSION}" \
-    ATOM_RUBY_VERSION=$ATOM_RUBY_VERSION \
+ENV ATOM_RUBY_VERSION=$ATOM_RUBY_VERSION \
+    ATOM_CMD=/usr/local/bin/atom \
     BUNDLE_SILENCE_ROOT_WARNING=true \
-    JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" \
     NVM_DIR="/root/.nvm"
 ENV PATH=/root/.nvm/versions/node/v${NODE_VERSION}/bin:${PATH}:/usr/local/bin:/root/.local/bin:/root/.rbenv/bin:
 
diff --git a/ci/base-images/debian/Dockerfile.ruby33 b/ci/base-images/debian/Dockerfile.ruby33
@@ -1,14 +1,11 @@
 FROM ruby:3.3.6
 
-ARG JAVA_VERSION=24-tem
 ARG NODE_VERSION=24.0.1
 ARG ATOM_RUBY_VERSION=3.4.3
 
-ENV JAVA_VERSION=$JAVA_VERSION \
-    JAVA_HOME="/opt/java/${JAVA_VERSION}" \
-    ATOM_RUBY_VERSION=$ATOM_RUBY_VERSION \
+ENV ATOM_RUBY_VERSION=$ATOM_RUBY_VERSION \
+    ATOM_CMD=/usr/local/bin/atom \
     BUNDLE_SILENCE_ROOT_WARNING=true \
-    JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" \
     NVM_DIR="/root/.nvm"
 ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:/usr/local/bin:/root/.local/bin:/root/.rbenv/bin:
 
diff --git a/ci/base-images/debian/Dockerfile.ruby34 b/ci/base-images/debian/Dockerfile.ruby34
@@ -1,12 +1,9 @@
 FROM ruby:3.4
 
-ARG JAVA_VERSION=24-tem
 ARG NODE_VERSION=24.0.1
 
-ENV JAVA_VERSION=$JAVA_VERSION \
-    JAVA_HOME="/opt/java/${JAVA_VERSION}" \
-    BUNDLE_SILENCE_ROOT_WARNING=true \
-    JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" \
+ENV BUNDLE_SILENCE_ROOT_WARNING=true \
+    ATOM_CMD=/usr/local/bin/atom \
     NVM_DIR="/root/.nvm"
 ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:/usr/local/bin:/root/.local/bin:/root/.rbenv/bin:
 
diff --git a/ci/base-images/debian/Dockerfile.swift6 b/ci/base-images/debian/Dockerfile.swift6
@@ -5,19 +5,16 @@ ARG SWIFT_PLATFORM=debian12
 ARG SWIFT_BRANCH=swift-6.1-release
 ARG SWIFT_VERSION=swift-6.1-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
-ARG JAVA_VERSION=24-tem
 ARG NODE_VERSION=22.14.0
 
-ENV JAVA_VERSION=$JAVA_VERSION \
-    JAVA_HOME="/opt/java/${JAVA_VERSION}" \
-    SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
+ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     SWIFT_BRANCH=$SWIFT_BRANCH \
     SWIFT_VERSION=$SWIFT_VERSION \
     SWIFT_WEBROOT=$SWIFT_WEBROOT \
     NVM_DIR="/root/.nvm"
 
-ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:/usr/local/bin:/root/.local/bin:
+ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:/usr/local/bin:/root/.local/bin:
 
 COPY ci/base-images/debian/install.sh /tmp/
 
diff --git a/ci/base-images/debian/install.sh b/ci/base-images/debian/install.sh
@@ -11,7 +11,11 @@ git clone https://github.com/rbenv/ruby-build.git --depth=1 "$(rbenv root)/plugi
 if [ x"${ATOM_RUBY_VERSION}" != "x" ]; then
   rbenv install $ATOM_RUBY_VERSION -- --disable-install-doc
 fi
-
+ARCH_NAME="$(dpkg --print-architecture)"
+# Download atom native binary
+curl -L https://github.com/AppThreat/atom/releases/latest/download/atom-${ARCH_NAME} -o /usr/local/bin/atom
+chmod +x /usr/local/bin/atom
+/usr/local/bin/atom --help
 curl -s "https://get.sdkman.io" | bash
 chmod +x /root/.sdkman/bin/sdkman-init.sh
 source $HOME/.sdkman/bin/sdkman-init.sh
diff --git a/ci/base-images/sle/Dockerfile.dotnet7 b/ci/base-images/sle/Dockerfile.dotnet7
@@ -1,25 +1,14 @@
 FROM registry.suse.com/bci/dotnet-sdk:7.0
 
-ARG JAVA_VERSION=24-tem
-
 ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
     DOTNET_NOLOGO=true \
     DOTNET_USE_POLLING_FILE_WATCHER=false \
     NUGET_XMLDOC_MODE=skip \
     DOTNET_RUNNING_IN_CONTAINER=true \
-    DOTNET_CLI_TELEMETRY_OPTOUT=1 \
-    JAVA_VERSION=$JAVA_VERSION \
-    JAVA_HOME="/opt/java/${JAVA_VERSION}"
-ENV PATH=${PATH}:${JAVA_HOME}/bin:/usr/local/bin:
+    DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV PATH=${PATH}:/usr/local/bin:
 
 RUN zypper refresh && zypper --non-interactive update && zypper --non-interactive install -l --no-recommends git-core nodejs20 npm20 python311 python311-pip wget zip unzip make gawk curl \
-    && curl -s "https://get.sdkman.io" | bash \
-    && echo -e "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=60\nsdkman_curl_max_time=0" >> $HOME/.sdkman/etc/config \
-    && source "$HOME/.sdkman/bin/sdkman-init.sh" \
-    && sdk install java $JAVA_VERSION \
-    && sdk offline enable \
-    && mv /root/.sdkman/candidates/* /opt/ \
-    && rm -rf /root/.sdkman \
     && npm install -g corepack \
     && zypper clean -a
 
diff --git a/ci/base-images/sle/Dockerfile.node20 b/ci/base-images/sle/Dockerfile.node20
@@ -1,26 +1,20 @@
 FROM registry.suse.com/bci/nodejs:20
 
-ARG JAVA_VERSION=24-tem
 ARG GCC_VERSION=13
 
-ENV JAVA_VERSION=$JAVA_VERSION \
-    JAVA_HOME="/opt/java/${JAVA_VERSION}" \
-    NVM_DIR="/root/.nvm" \
-    npm_config_python=/usr/bin/python3.11 \
+ENV NVM_DIR="/root/.nvm" \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US.UTF-8
-ENV PATH=${PATH}:${JAVA_HOME}/bin:/usr/local/bin:
+ENV PATH=${PATH}:/usr/local/bin:
 RUN set -e; \
     ARCH_NAME="$(rpm --eval '%{_arch}')"; \
     url=; \
     case "${ARCH_NAME##*-}" in \
         'x86_64') \
-            OS_ARCH_SUFFIX=''; \
             GOBIN_VERSION='amd64'; \
             ;; \
         'aarch64') \
-            OS_ARCH_SUFFIX='-aarch64'; \
             GOBIN_VERSION='arm64'; \
             ;; \
         *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
@@ -33,13 +27,6 @@ RUN set -e; \
     && update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-${GCC_VERSION} 10 \
     && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 10 \
     && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION} 10 \
-    && curl -s "https://get.sdkman.io" | bash \
-    && echo -e "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" >> $HOME/.sdkman/etc/config \
-    && source "$HOME/.sdkman/bin/sdkman-init.sh" \
-    && sdk install java $JAVA_VERSION \
-    && sdk offline enable \
-    && mv /root/.sdkman/candidates/* /opt/ \
-    && rm -rf /root/.sdkman \
     && npm install -g npm \
     && npm install -g node-gyp corepack \
     && npx node-gyp install \
diff --git a/ci/base-images/sle/Dockerfile.python311 b/ci/base-images/sle/Dockerfile.python311
@@ -15,7 +15,6 @@ ENV JAVA_VERSION=$JAVA_VERSION \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US.UTF-8 \
     NVM_DIR="/root/.nvm" \
-    npm_config_python=/usr/bin/python3.11 \
     PYTHONPATH=/opt/pypi
 ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:/usr/local/bin:/opt/pypi/bin:${GOPATH}/bin:/usr/local/go/bin:
 RUN set -e; \
diff --git a/deno.json b/deno.json
@@ -51,7 +51,7 @@
     "gen-types": "npx -p typescript tsc"
   },
   "imports": {
-    "@appthreat/atom": "npm:@appthreat/atom@2.1.18",
+    "@appthreat/atom": "npm:@appthreat/atom@2.2.3",
     "@appthreat/cdx-proto": "npm:@appthreat/cdx-proto@1.0.1",
     "@babel/parser": "npm:@babel/parser@^7.27.2",
     "@babel/traverse": "npm:@babel/traverse@^7.27.1",
diff --git a/lib/helpers/utils.js b/lib/helpers/utils.js
diff --git a/lib/helpers/utils.test.js b/lib/helpers/utils.test.js
diff --git a/package.json b/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
