update java versions

Signed-off-by: Prabhu Subramanian <[email protected]>
CycloneDX · Jan 23, 2025 · 5b96b6c · 5b96b6c
1 parent 15649b6
commit 5b96b6c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -58,6 +58,12 @@ Sections include:
 npm install -g @cyclonedx/cdxgen
 ```
 
+To run cdxgen without installing (hotloading), use the [pnpm dlx](https://pnpm.io/cli/dlx) command.
+
+```shell
+corepack pnpm dlx @cyclonedx/cdxgen --help
+```
+
 If you are a [Homebrew][homebrew-homepage] user, you can also install [cdxgen][homebrew-cdxgen] via:
 
 ```shell

diff --git a/ci/base-images/debian/Dockerfile.ruby18 b/ci/base-images/debian/Dockerfile.ruby18
@@ -1,6 +1,6 @@
 FROM debian:jessie
 
-ARG JAVA_VERSION=21.0.5-tem
+ARG JAVA_VERSION=21.0.6-tem
 ARG ATOM_RUBY_VERSION=3.4.1
 ARG BUNDLER_VERSION=1.17.3
 ARG RAKE_VERSION=0.7.3

diff --git a/ci/base-images/debian/Dockerfile.ruby26 b/ci/base-images/debian/Dockerfile.ruby26
@@ -1,6 +1,6 @@
 FROM ruby:2.6.10
 
-ARG JAVA_VERSION=21.0.5-tem
+ARG JAVA_VERSION=21.0.6-tem
 ARG NODE_VERSION=20.18.1
 ARG ATOM_RUBY_VERSION=3.4.1
 

diff --git a/ci/base-images/sle/Dockerfile.python36 b/ci/base-images/sle/Dockerfile.python36
@@ -1,6 +1,6 @@
 FROM registry.suse.com/bci/python:3.6
 
-ARG JAVA_VERSION=21.0.5-tem
+ARG JAVA_VERSION=21.0.6-tem
 ARG MAVEN_VERSION=3.9.9
 ARG GCC_VERSION=13
 ARG NODE_VERSION=20.18.1

diff --git a/docs/ENV.md b/docs/ENV.md
@@ -71,8 +71,8 @@ The following environment variables are available to configure the bom generatio
 | GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE | Specifies the namespace for HTTP_PROXY variable usage. If not set by the user, it defaults to an empty string to support standard HTTP proxy configurations.                                                                                                                                                                        |
 | JAVA8_TOOL                                  | Specifies the Java 8 toolchain version to use. Defaults to `8.0.432-tem` if not explicitly set. Can be overridden to point to a custom Java 8 version.                                                                                                                                                                              |
 | JAVA11_TOOL                                 | Specifies the Java 11 toolchain version to use. Defaults to `11.0.25-tem` if not explicitly set. Can be overridden to point to a custom Java 11 version.                                                                                                                                                                            |
-| JAVA17_TOOL                                 | Specifies the Java 17 toolchain version to use. Defaults to `17.0.13-tem` if not explicitly set. Can be overridden to point to a custom Java 17 version.                                                                                                                                                                            |
-| JAVA21_TOOL                                 | Specifies the Java 21 toolchain version to use. Defaults to `21.0.5-tem` if not explicitly set. Can be overridden to point to a custom Java 21 version.                                                                                                                                                                             |
+| JAVA17_TOOL                                 | Specifies the Java 17 toolchain version to use. Defaults to `17.0.14-tem` if not explicitly set. Can be overridden to point to a custom Java 17 version.                                                                                                                                                                            |
+| JAVA21_TOOL                                 | Specifies the Java 21 toolchain version to use. Defaults to `21.0.6-tem` if not explicitly set. Can be overridden to point to a custom Java 21 version.                                                                                                                                                                             |
 | JAVA22_TOOL                                 | Specifies the Java 22 toolchain version to use. Defaults to `22.0.2-tem` if not explicitly set. Can be overridden to point to a custom Java 22 version.                                                                                                                                                                             |
 | JAVA23_TOOL                                 | Specifies the Java 23 toolchain version to use. Defaults to `23.0.1-tem` if not explicitly set. Can be overridden to point to a custom Java 23 version.                                                                                                                                                                             |
 | CDXGEN_PLUGINS_DIR                          | Defines the directory where cdxgen plugins are stored. If not set, defaults to an empty value, and a global node_modules path is used if available.                                                                                                                                                                                 |

diff --git a/docs/README.md b/docs/README.md
@@ -18,7 +18,7 @@ If you are a [Homebrew](https://brew.sh/) user, you can also install [cdxgen](ht
 brew install cdxgen
 ```
 
-For Windows, Single Application Executable (sae) builds are available from GitHub [Releases](https://github.com/CycloneDX/cdxgen/releases) in two flavours:
+For Windows and Linux, Single Application Executable (sae) builds are available from GitHub [Releases](https://github.com/CycloneDX/cdxgen/releases) in two flavours:
 
 - cdxgen.exe - Node 22 runtime + CLI with the optional binary plugins (atom, dosai, etc)
 - cdxgen-slim.exe - Node 22 runtime + CLI

diff --git a/lib/helpers/envcontext.js b/lib/helpers/envcontext.js
@@ -31,8 +31,8 @@ export const GIT_COMMAND = process.env.GIT_CMD || "git";
 export const SDKMAN_JAVA_TOOL_ALIASES = {
   java8: process.env.JAVA8_TOOL || "8.0.432-tem",
   java11: process.env.JAVA11_TOOL || "11.0.25-tem",
-  java17: process.env.JAVA17_TOOL || "17.0.13-tem",
-  java21: process.env.JAVA21_TOOL || "21.0.5-tem",
+  java17: process.env.JAVA17_TOOL || "17.0.14-tem",
+  java21: process.env.JAVA21_TOOL || "21.0.6-tem",
   java22: process.env.JAVA22_TOOL || "22.0.2-tem",
   java23: process.env.JAVA23_TOOL || "23.0.1-tem",
 };