diff --git a/.github/workflows/native-cron-build.yml.disabled b/.github/workflows/native-cron-build.yml.disabled
index e5b8db4b1e7d0..11b4ab98b7ecb 100644
--- a/.github/workflows/native-cron-build.yml.disabled
+++ b/.github/workflows/native-cron-build.yml.disabled
@@ -20,7 +20,7 @@ jobs:
run: sudo systemctl stop mysql
- name: Pull docker image
- run: docker pull quay.io/quarkus/ubi-quarkus-native-image:20.1.0-java${{ matrix.java }}
+ run: docker pull quay.io/quarkus/ubi-quarkus-native-image:20.2.0-java${{ matrix.java }}
- name: Set up JDK ${{ matrix.java }}
# Uses sha for added security since tags can be updated
@@ -55,7 +55,7 @@ jobs:
run: mvn -B install -DskipTests -DskipITs -Dformat.skip
- name: Run integration tests in native
- run: mvn -B --settings .github/mvn-settings.xml verify -f integration-tests/pom.xml --fail-at-end -Dno-format -Ddocker -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:20.1.0-java${{ matrix.java }} -Dtest-postgresql -Dtest-elasticsearch -Dtest-mysql -Dtest-db2 -Dtest-amazon-services -Dtest-vault -Dtest-neo4j -Dtest-keycloak -Dtest-kafka -Dtest-mssql -Dtest-mariadb -Dmariadb.url="jdbc:mariadb://localhost:3308/hibernate_orm_test" -pl '!io.quarkus:quarkus-integration-test-google-cloud-functions-http,!io.quarkus:quarkus-integration-test-google-cloud-functions,!io.quarkus:quarkus-integration-test-funqy-google-cloud-functions'
+ run: mvn -B --settings .github/mvn-settings.xml verify -f integration-tests/pom.xml --fail-at-end -Dno-format -Ddocker -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:20.2.0-java${{ matrix.java }} -Dtest-postgresql -Dtest-elasticsearch -Dtest-mysql -Dtest-db2 -Dtest-amazon-services -Dtest-vault -Dtest-neo4j -Dtest-keycloak -Dtest-kafka -Dtest-mssql -Dtest-mariadb -Dmariadb.url="jdbc:mariadb://localhost:3308/hibernate_orm_test" -pl '!io.quarkus:quarkus-integration-test-google-cloud-functions-http,!io.quarkus:quarkus-integration-test-google-cloud-functions,!io.quarkus:quarkus-integration-test-funqy-google-cloud-functions'
- name: Report
if: always()
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 3b92591a3e2be..50e60112b99cf 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -77,7 +77,7 @@
3.6.0
2.1.0
- 20.1.0
+ 20.2.0
1.0.4.Final
2.11.2
1.0.0.Final
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index f0afdd9cc439f..3afea82c1eefa 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -31,7 +31,7 @@
- 20.1.0
+ 20.2.0
20.1
4.1.1
1.1.0
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
index 480340fa88a84..8a901fcf6d77d 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
@@ -128,7 +128,7 @@ public class NativeConfig {
/**
* The docker image to use to do the image build
*/
- @ConfigItem(defaultValue = "quay.io/quarkus/ubi-quarkus-native-image:20.1.0-java11")
+ @ConfigItem(defaultValue = "quay.io/quarkus/ubi-quarkus-native-image:20.2.0-java11")
public String builderImage;
/**
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
index dd8db971a6f82..1010932abee0e 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
@@ -214,7 +214,7 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa
final Process process = ProcessUtil.launchProcess(pb, processInheritIODisabled);
process.waitFor();
}
- Boolean enableSslNative = false;
+ boolean enableSslNative = false;
for (NativeImageSystemPropertyBuildItem prop : nativeImageProperties) {
//todo: this should be specific build items
if (prop.getKey().equals("quarkus.ssl.native") && prop.getValue() != null) {
@@ -254,7 +254,8 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa
.map(re -> "-H:IncludeResources=" + re.trim())
.forEach(command::add));
command.add("--initialize-at-build-time=");
- command.add("-H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime"); //the default collection policy results in full GC's 50% of the time
+ command.add(
+ "-H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime"); //the default collection policy results in full GC's 50% of the time
command.add("-H:+JNI");
command.add("-jar");
command.add(runnerJarName);
@@ -579,8 +580,9 @@ static void safeWaitFor(Process process) {
intr = true;
}
} finally {
- if (intr)
+ if (intr) {
Thread.currentThread().interrupt();
+ }
}
}
@@ -667,8 +669,12 @@ static final class Version implements Comparable {
Distribution.ORACLE);
static final Version SNAPSHOT_MANDREL = new Version("Snapshot", Integer.MAX_VALUE, Integer.MAX_VALUE,
Distribution.MANDREL);
+
static final Version VERSION_20_1 = new Version("GraalVM 20.1", 20, 1, Distribution.ORACLE);
- static final Version CURRENT = VERSION_20_1;
+ static final Version VERSION_20_2 = new Version("GraalVM 20.2", 20, 2, Distribution.ORACLE);
+
+ static final Version MINIMUM = VERSION_20_1;
+ static final Version CURRENT = VERSION_20_2;
final String fullVersion;
final int major;
@@ -691,7 +697,7 @@ boolean isDetected() {
}
boolean isObsolete() {
- return this.compareTo(CURRENT) < 0;
+ return this.compareTo(MINIMUM) < 0;
}
boolean isMandrel() {
@@ -708,14 +714,16 @@ boolean isNewerThan(Version version) {
@Override
public int compareTo(Version o) {
- if (major > o.major)
+ if (major > o.major) {
return 1;
+ }
if (major == o.major) {
- if (minor > o.minor)
+ if (minor > o.minor) {
return 1;
- else if (minor == o.minor)
+ } else if (minor == o.minor) {
return 0;
+ }
}
return -1;
diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
index 92b6bb5c6e892..f46ab505db6bb 100644
--- a/independent-projects/bootstrap/pom.xml
+++ b/independent-projects/bootstrap/pom.xml
@@ -45,7 +45,7 @@
1.2.6
1.0.4
1.2.0.Final
- 20.1.0
+ 20.2.0
2.6.0
3.0.0-M5
1.3.0