Skip to content

Commit 360c35e

Browse files
authored
Upgrade GraalVM to 21.3.0 (helidon-io#3578)
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
1 parent c26e20c commit 360c35e

15 files changed

Lines changed: 18 additions & 18 deletions

File tree

archetypes/quickstart-mp/src/main/resources/Dockerfile.native.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# 1st stage, build the app
3-
FROM helidon/jdk11-graalvm-maven:21.1.0 as build
3+
FROM helidon/jdk11-graalvm-maven:21.3.0 as build
44

55
WORKDIR /helidon
66

archetypes/quickstart-se/src/main/resources/Dockerfile.native.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# 1st stage, build the app
3-
FROM helidon/jdk11-graalvm-maven:21.1.0 as build
3+
FROM helidon/jdk11-graalvm-maven:21.3.0 as build
44

55
WORKDIR /helidon
66

dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<version.lib.google-api-client>1.32.2</version.lib.google-api-client>
5757
<version.lib.google-oauth-client>1.32.1</version.lib.google-oauth-client>
5858
<version.lib.google-error-prone>2.3.3</version.lib.google-error-prone>
59-
<version.lib.graalvm>21.1.0</version.lib.graalvm>
59+
<version.lib.graalvm>21.3.0</version.lib.graalvm>
6060
<version.lib.graphql-java>15.0</version.lib.graphql-java>
6161
<version.lib.graphql-java.extended.scalars>15.0.0</version.lib.graphql-java.extended.scalars>
6262
<version.lib.grpc>1.35.0</version.lib.grpc>

docs/common/guides/graalnative.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ set the `GRAALVM_HOME` environment variable to point at your GraalVM installatio
4040
[source,bash]
4141
----
4242
# Your path might be different
43-
export GRAALVM_HOME=/usr/local/graalvm-ce-21.1.0/Contents/Home/
43+
export GRAALVM_HOME=/usr/local/graalvm-ce-21.3.0/Contents/Home/
4444
----
4545
4646
Then install the optional `native-image` command:

etc/dependency-check-suppression.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@
5353
-->
5454
<suppress>
5555
<notes><![CDATA[
56-
file name: graal-sdk-21.1.0.jar
56+
file name: graal-sdk-21.3.0.jar
5757
]]></notes>
5858
<packageUrl regex="true">^pkg:maven/org\.graalvm.*/.*@.*$</packageUrl>
5959
<cve>CVE-2021-2341</cve>
6060
</suppress>
6161
<suppress>
6262
<notes><![CDATA[
63-
file name: graal-sdk-21.1.0.jar
63+
file name: graal-sdk-21.3.0.jar
6464
]]></notes>
6565
<packageUrl regex="true">^pkg:maven/org\.graalvm.*/.*@.*$</packageUrl>
6666
<cve>CVE-2021-2369</cve>
6767
</suppress>
6868
<suppress>
6969
<notes><![CDATA[
70-
file name: graal-sdk-21.1.0.jar
70+
file name: graal-sdk-21.3.0.jar
7171
]]></notes>
7272
<packageUrl regex="true">^pkg:maven/org\.graalvm.*/.*@.*$</packageUrl>
7373
<cve>CVE-2021-2388</cve>

etc/dockerfiles/Dockerfile.jdk11-graalvm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN set -x \
2323
&& apt-get -y install curl
2424

2525
RUN curl -O -L \
26-
https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.1.0/graalvm-ce-java11-linux-amd64-21.1.0.tar.gz && \
26+
https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java11-linux-amd64-21.3.0.tar.gz && \
2727
tar -xvzf graalvm-*.tar.gz && \
2828
rm graalvm-*.tar.gz && \
2929
mv graalvm-* graalvm && \

etc/dockerfiles/Dockerfile.jdk11-graalvm-maven

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN set -x && \
3030

3131
RUN echo "done!"
3232

33-
FROM helidon/jdk11-graalvm:21.1.0
33+
FROM helidon/jdk11-graalvm:21.3.0
3434

3535
COPY --from=build /build/maven /usr/share/maven
3636
RUN ln -s /usr/share/maven/bin/mvn /bin/

etc/dockerfiles/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ This defines the dependencies used by Helidon native image feature used during n
88
## Docker images
99
In `etc/dockerfiles`, update the version:
1010

11-
1. `build.sh` - update the `GRAALVM_VERSION` variable to the desired version
11+
1. `scripts/include/pipeline-env.sh` - update the `GRAALVM_VERSION` variable to the desired version
1212
2. `Dockerfile.jdk11-graalvm` update the curl command to point to the correct tar
1313
3. `Dockerfile.jdk11-graalvm-maven` update the `FROM` command to use the latest image
14-
4. Run `build.sh` to create the docker images and push them to docker hub
14+
4. Run `build.sh --push` to create the docker images and push them to docker hub
1515

1616
## Examples
1717
Fix `Dockerfile.native` and `README.md` in all examples that have them.

etc/dockerfiles/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ else
5858
fi
5959
readonly MY_DIR=$(cd $(dirname -- "${SCRIPT_PATH}") ; pwd -P)
6060

61-
readonly GRAALVM_VERSION=21.1.0
61+
readonly GRAALVM_VERSION=21.3.0
6262

6363
docker build -f ${MY_DIR}/Dockerfile.jdk11-graalvm -t helidon/jdk11-graalvm:${GRAALVM_VERSION} ${MY_DIR}
6464
docker build -f ${MY_DIR}/Dockerfile.jdk11-graalvm-maven -t helidon/jdk11-graalvm-maven:${GRAALVM_VERSION} ${MY_DIR}

etc/scripts/includes/pipeline-env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [ -z "${__PIPELINE_ENV_INCLUDED__}" ]; then
4747
. ${WS_DIR}/etc/scripts/includes/error_handlers.sh
4848

4949
if [ -z "${GRAALVM_HOME}" ]; then
50-
export GRAALVM_HOME="/tools/graalvm-ce-java11-21.1.0"
50+
export GRAALVM_HOME="/tools/graalvm-ce-java11-21.3.0"
5151
fi
5252

5353
require_env() {

0 commit comments

Comments
 (0)