Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(deps): Update cdxgen, depscan, go and add java 23 #559

Merged
merged 1 commit into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ concurrency:
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

env:
CDXGEN_VERSION: '10.9.11'
CDXGEN_VERSION: '10.10.0'
CDXGEN_PLUGINS_VERSION: '1.6.3'
GRYPE_VERSION: 'v0.80.1'
SBOMQS_VERSION: 'v0.1.9'
DEPSCAN_VERSION: 'v5.4.5'
DEPSCAN_VERSION: 'v5.4.6'
NYDUS_VERSION: '2.2.5'
SWIFT_VERSION: '5.10.1'
semantic_version: '19.0.5'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
CDXGEN_PLUGINS_VERSION: '1.6.3'
GRYPE_VERSION: 'v0.80.1'
SBOMQS_VERSION: 'v0.1.9'
DEPSCAN_VERSION: 'v5.4.5'
DEPSCAN_VERSION: 'v5.4.6'
NYDUS_VERSION: '2.2.5'
java_version: '21'
node_version: '21'
Expand Down
2 changes: 1 addition & 1 deletion docs/Repository_Config.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ Please see the [adoption documentation](Adoption.md) for details.
### `jdk.version`

The JDK versions available for selection need to be provided and configured to the Technolinator runtime.
Please see the [adoption documentation](Adoption.md) for details, in the default runtime container, there's JDK 21 (default) and JDK 17 built in.
Please see the [adoption documentation](Adoption.md) for details, in the default runtime container, there's JDK 21 (default), JDK 23 and JDK 17 built in.
5 changes: 4 additions & 1 deletion src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ ARG DEPSCAN_VERSION
# sdkman provided jdks
ARG JAVA_17_VERSION='17.0.12-tem'
ARG JAVA_21_VERSION='21.0.4-tem'
ARG JAVA_23_VERSION='23-tem'
ARG GRADLE_VERSION='8.10.1'
ARG NODE_VERSION='21'
ARG GO_VERSION='1.22.5'
ARG GO_VERSION='1.23.1'

# location of application binaries and configuration
ENV APP_DIR='/app'
Expand Down Expand Up @@ -114,6 +115,7 @@ ENV SDK_DIR="$APP_DIR/sdks"
COPY --chown=root:root src/main/docker/assets/sdkman.config /root/.sdkman/etc/config
RUN source "/root/.sdkman/bin/sdkman-init.sh" && \
sdk install java $JAVA_17_VERSION && \
sdk install java $JAVA_23_VERSION && \
sdk install java $JAVA_21_VERSION && \
sdk install maven && \
sdk install gradle $GRADLE_VERSION && \
Expand All @@ -125,6 +127,7 @@ RUN source "/root/.sdkman/bin/sdkman-init.sh" && \

# app & tools env
ENV JAVA17_HOME="$SDK_DIR/java/$JAVA_17_VERSION" \
JAVA23_HOME="$SDK_DIR/java/$JAVA_23_VERSION" \
JAVA21_HOME="$SDK_DIR/java/$JAVA_21_VERSION" \
JAVA_HOME="$SDK_DIR/java/$JAVA_21_VERSION" \
MAVEN_HOME="$SDK_DIR/maven/current" \
Expand Down
12 changes: 10 additions & 2 deletions src/test/docker/structure-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,17 @@ commandTests:
expectedOutput:
- '.*openjdk 21.*'

- name: "Go 1.22 available"
- name: "Java 23 available"
command: '$JAVA23_HOME/bin/java'
args: ["--version"]
expectedOutput:
- '.*openjdk 23.*'

- name: "Go 1.23 available"
command: "go"
args: ["version"]
expectedOutput:
- 'go version go1.22.*'
- 'go version go1.23.*'

- name: "Running as non-root"
command: 'whoami'
Expand Down Expand Up @@ -191,6 +197,8 @@ metadataTest:
value: '/app/sdks/java/17.0.12-tem'
- key: JAVA21_HOME
value: '/app/sdks/java/21.0.4-tem'
- key: JAVA23_HOME
value: '/app/sdks/java/23-tem'
- key: MAVEN_HOME
value: '/app/sdks/maven/current'
- key: GRADLE_HOME
Expand Down