Skip to content

Commit

Permalink
Merge pull request #17014 from zakkak/graalvm21.1-update
Browse files Browse the repository at this point in the history
Update to GraalVM 21.1
  • Loading branch information
gsmet authored May 7, 2021
2 parents 34a353e + d7229fe commit a590bb3
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ jobs:
uses: DeLaGuardo/setup-graalvm@master
if: startsWith(matrix.os-name, 'windows')
with:
graalvm-version: '21.0.0.java11'
graalvm-version: '21.1.0.java11'
- name: Install native-image component
if: startsWith(matrix.os-name, 'windows')
run: |
Expand Down
2 changes: 1 addition & 1 deletion bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
<plexus-component-annotations.version>2.1.0</plexus-component-annotations.version>
<!-- What we actually depend on for the annotations, as latest Graal is not available in Maven fast enough: -->
<graal-sdk.version>21.0.0</graal-sdk.version>
<graal-sdk.version>21.1.0</graal-sdk.version>
<gizmo.version>1.0.7.Final</gizmo.version>
<jackson.version>2.12.3</jackson.version>
<commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
Expand Down
4 changes: 2 additions & 2 deletions build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<!-- These properties are needed in order for them to be resolvable by the documentation -->
<!-- The Graal version we suggest using in documentation - as that's
what we work with by self downloading it: -->
<graal-sdk.version-for-documentation>21.0.0</graal-sdk.version-for-documentation>
<graal-sdk.version-for-documentation>21.1.0</graal-sdk.version-for-documentation>
<mandrel.version-for-documentation>21.0</mandrel.version-for-documentation>
<rest-assured.version>4.3.2</rest-assured.version>
<mutiny-client.version>1.1.0</mutiny-client.version>
Expand Down Expand Up @@ -130,7 +130,7 @@
<forbiddenapis-maven-plugin.version>3.1</forbiddenapis-maven-plugin.version>

<!-- platform properties - this is a floating tag -->
<platform.quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:21.0-java11</platform.quarkus.native.builder-image>
<platform.quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:21.1-java11</platform.quarkus.native.builder-image>

<script.extension>sh</script.extension>
<docker-prune.location>${maven.multiModuleProjectDirectory}/.github/docker-prune.${script.extension}</docker-prune.location>
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/building-native-image.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ Sample Dockerfile for building with Maven:
[source,dockerfile,subs=attributes+]
----
## Stage 1 : build with maven builder image with native capabilities
FROM quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11 AS build
FROM quay.io/quarkus/ubi-quarkus-native-image:21.1.0-java11 AS build
COPY pom.xml /project/
COPY mvnw /project/mvnw
COPY .mvn /project/.mvn
Expand Down Expand Up @@ -551,7 +551,7 @@ Sample Dockerfile for building with Gradle:
[source,dockerfile,subs=attributes+]
----
## Stage 1 : build with maven builder image with native capabilities
FROM quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11 AS build
FROM quay.io/quarkus/ubi-quarkus-native-image:21.1.0-java11 AS build
COPY gradlew /project/gradlew
COPY gradle /project/gradle
COPY build.gradle /project/
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/platform.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ A platform properties file for the example above would contain (the actual value

[source,text]
----
platform.quarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:21.0.0.2-java11
platform.quarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:21.1.0-java11
----

There is also a Maven plugin goal that validates the platform properties content and its artifact coordinates and also checks whether the platform properties artifact is present in the platform's BOM. Here is a sample plugin configuration:
Expand Down
2 changes: 1 addition & 1 deletion independent-projects/bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<jboss-logmanager-embedded.version>1.0.9</jboss-logmanager-embedded.version>
<slf4j-jboss-logmanager.version>1.1.0.Final</slf4j-jboss-logmanager.version>
<slf4j-api.version>1.7.30</slf4j-api.version>
<graal-sdk.version>21.0.0</graal-sdk.version>
<graal-sdk.version>21.1.0</graal-sdk.version>
<plexus-classworlds.version>2.6.0</plexus-classworlds.version> <!-- not actually used but ClassRealm class is referenced from the API used in BootstrapWagonConfigurator -->
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<smallrye-common.version>1.6.0</smallrye-common.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

import org.junit.jupiter.api.Test;

import io.quarkus.test.junit.DisabledOnNativeImage;
import io.quarkus.test.junit.NativeImageTest;

@NativeImageTest
public class BouncyCastleJsseITCase extends BouncyCastleJsseTestCase {
@Test
@DisabledOnNativeImage
@Override
public void testListProviders() {
doTestListProviders();
Expand Down

0 comments on commit a590bb3

Please sign in to comment.