Skip to content

Commit 397db6b

Browse files
committed
Upgrade GraalVM to 19.3.0
1 parent afde1e8 commit 397db6b

File tree

70 files changed

+60
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+60
-77
lines changed

bom/runtime/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<maven-plugin-annotations.version>3.5.2</maven-plugin-annotations.version>
7575
<plexus-component-annotations.version>1.7.1</plexus-component-annotations.version>
7676
<!-- What we actually depend on for the annotations, as latest Graal is not available in Maven fast enough: -->
77-
<graal-sdk.version>19.2.1</graal-sdk.version>
77+
<graal-sdk.version>19.3.0</graal-sdk.version>
7878
<gizmo.version>1.0.0.Final</gizmo.version>
7979
<jackson.version>2.9.10.20191020</jackson.version>
8080
<commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
@@ -766,7 +766,7 @@
766766
<version>${jboss-logmanager.version}</version>
767767
<exclusions>
768768
<exclusion>
769-
<groupId>com.oracle.substratevm</groupId>
769+
<groupId>org.graalvm.nativeimage</groupId>
770770
<artifactId>svm</artifactId>
771771
</exclusion>
772772
<exclusion>
@@ -1507,7 +1507,7 @@
15071507
</dependency>
15081508

15091509
<dependency>
1510-
<groupId>com.oracle.substratevm</groupId>
1510+
<groupId>org.graalvm.nativeimage</groupId>
15111511
<artifactId>svm</artifactId>
15121512
<version>${graal-sdk.version}</version>
15131513
<scope>provided</scope>

build-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<!-- These properties are needed in order for them to be resolvable by the documentation -->
3333
<!-- The Graal version we suggest using in documentation - as that's
3434
what we work with by self downloading it: -->
35-
<graal-sdk.version-for-documentation>19.2.1</graal-sdk.version-for-documentation>
35+
<graal-sdk.version-for-documentation>19.3.0</graal-sdk.version-for-documentation>
3636
<rest-assured.version>4.1.1</rest-assured.version>
3737
<axle-client.version>0.0.9</axle-client.version>
3838
<vertx.version>3.8.3</vertx.version>

core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class NativeConfig {
3939
/**
4040
* If JNI should be enabled
4141
*/
42-
@ConfigItem(defaultValue = "false")
42+
@ConfigItem(defaultValue = "true")
4343
public boolean enableJni;
4444

4545
/**
@@ -133,7 +133,7 @@ public class NativeConfig {
133133
/**
134134
* The docker image to use to do the image build
135135
*/
136-
@ConfigItem(defaultValue = "quay.io/quarkus/ubi-quarkus-native-image:19.2.1")
136+
@ConfigItem(defaultValue = "quay.io/quarkus/ubi-quarkus-native-image:19.3.0-java8")
137137
public String builderImage;
138138

139139
/**

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,6 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa
178178
command.add("-H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy$BySpaceAndTime"); //the default collection policy results in full GC's 50% of the time
179179
command.add("-jar");
180180
command.add(runnerJarName);
181-
//https://github.com/oracle/graal/issues/660
182-
command.add("-J-Djava.util.concurrent.ForkJoinPool.common.parallelism=1");
183181
if (nativeConfig.enableFallbackImages) {
184182
command.add("-H:FallbackThreshold=5");
185183
} else {
@@ -296,10 +294,10 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa
296294
private boolean isThisGraalVMVersionObsolete() {
297295
final String vmName = System.getProperty("java.vm.name");
298296
log.info("Running Quarkus native-image plugin on " + vmName);
299-
final List<String> obsoleteGraalVmVersions = Arrays.asList("1.0.0", "19.0.", "19.1.", "19.2.0");
297+
final List<String> obsoleteGraalVmVersions = Arrays.asList("1.0.0", "19.0.", "19.1.", "19.2.");
300298
final boolean vmVersionIsObsolete = obsoleteGraalVmVersions.stream().anyMatch(vmName::contains);
301299
if (vmVersionIsObsolete) {
302-
log.error("Out of date build of GraalVM detected! Please upgrade to GraalVM 19.2.1.");
300+
log.error("Out of date build of GraalVM detected! Please upgrade to GraalVM 19.3.0.");
303301
return true;
304302
}
305303
return false;

core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageAutoFeatureStep.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class NativeImageAutoFeatureStep {
5454
static final String RUNTIME_REFLECTION = RuntimeReflection.class.getName();
5555
static final String BEFORE_ANALYSIS_ACCESS = Feature.BeforeAnalysisAccess.class.getName();
5656
static final String DYNAMIC_PROXY_REGISTRY = "com.oracle.svm.core.jdk.proxy.DynamicProxyRegistry";
57-
static final String LOCALIZATION_SUPPORT = "com.oracle.svm.core.jdk.LocalizationSupport";
57+
static final String LOCALIZATION_FEATURE = "com.oracle.svm.core.jdk.LocalizationFeature";
5858

5959
@BuildStep
6060
void generateFeature(BuildProducer<GeneratedNativeImageClassBuildItem> nativeImageClass,
@@ -170,7 +170,7 @@ public void write(String s, byte[] bytes) {
170170
}
171171

172172
if (!resourceBundles.isEmpty()) {
173-
ResultHandle locClass = overallCatch.loadClass(LOCALIZATION_SUPPORT);
173+
ResultHandle locClass = overallCatch.loadClass(LOCALIZATION_FEATURE);
174174

175175
ResultHandle params = overallCatch.marshalAsArray(Class.class, overallCatch.loadClass(String.class));
176176
ResultHandle registerMethod = overallCatch.invokeVirtualMethod(

core/runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<artifactId>graal-sdk</artifactId>
7171
</dependency>
7272
<dependency>
73-
<groupId>com.oracle.substratevm</groupId>
73+
<groupId>org.graalvm.nativeimage</groupId>
7474
<artifactId>svm</artifactId>
7575
</dependency>
7676
<dependency>

core/test-extension/runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<artifactId>quarkus-arc</artifactId>
3232
</dependency>
3333
<dependency>
34-
<groupId>com.oracle.substratevm</groupId>
34+
<groupId>org.graalvm.nativeimage</groupId>
3535
<artifactId>svm</artifactId>
3636
</dependency>
3737
<dependency>

extensions/agroal/runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<artifactId>quarkus-narayana-jta</artifactId>
2828
</dependency>
2929
<dependency>
30-
<groupId>com.oracle.substratevm</groupId>
30+
<groupId>org.graalvm.nativeimage</groupId>
3131
<artifactId>svm</artifactId>
3232
</dependency>
3333

extensions/amazon-lambda-http/deployment/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<artifactId>quarkus-amazon-lambda-http</artifactId>
3333
</dependency>
3434
<dependency>
35-
<groupId>com.oracle.substratevm</groupId>
35+
<groupId>org.graalvm.nativeimage</groupId>
3636
<artifactId>svm</artifactId>
3737
</dependency>
3838
</dependencies>

extensions/amazon-lambda-http/runtime/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<artifactId>quarkus-core</artifactId>
3030
</dependency>
3131
<dependency>
32-
<groupId>com.oracle.substratevm</groupId>
32+
<groupId>org.graalvm.nativeimage</groupId>
3333
<artifactId>svm</artifactId>
3434
</dependency>
3535
</dependencies>

0 commit comments

Comments
 (0)