Skip to content

Commit 0889e47

Browse files
committed
Upgrade to GraalVM 22.3 and introduce PreComputeFieldFeature
This new GraalVM feature replaces ConstantFieldFeature and introduces various enhancements: - Leverage the new FieldValueTransformer API - Use GraalVM 22.3 graal-sdk dependency instead of svm one - Avoid using internal GraalVM APIs - No need to configure JPMS exports - Directly integrated in spring-core module - Simplified build configuration Closes spring-projectsgh-29081 Closes spring-projectsgh-29080 Closes spring-projectsgh-29089
1 parent ba99672 commit 0889e47

File tree

16 files changed

+111
-335
lines changed

16 files changed

+111
-335
lines changed

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ derby.log
2121
/build
2222
buildSrc/build
2323
/spring-*/build
24-
/spring-core/graalvm/build
25-
/spring-core/kotlin-coroutines/build
2624
/framework-bom/build
2725
/integration-tests/build
2826
/src/asciidoc/build

framework-platform/framework-platform.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ dependencies {
120120
api("org.glassfish.external:opendmk_jmxremote_optional_jar:1.0-b01-ea")
121121
api("org.glassfish.tyrus:tyrus-container-servlet:2.0.1")
122122
api("org.glassfish:jakarta.el:4.0.2")
123-
api("org.graalvm.nativeimage:svm:22.1.0.1")
123+
api("org.graalvm.sdk:graal-sdk:22.3.0")
124124
api("org.hamcrest:hamcrest:2.2")
125125
api("org.hibernate:hibernate-core-jakarta:5.6.12.Final")
126126
api("org.hibernate:hibernate-validator:7.0.5.Final")

settings.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ include "spring-context"
1818
include "spring-context-indexer"
1919
include "spring-context-support"
2020
include "spring-core"
21-
include "graalvm-feature"
22-
project(':graalvm-feature').projectDir = file('spring-core/graalvm')
2321
include "spring-core-test"
2422
include "spring-expression"
2523
include "spring-instrument"

spring-core/graalvm/graalvm-feature.gradle

-40
This file was deleted.

spring-core/graalvm/src/main/java/org/springframework/aot/graalvm/ConstantFieldFeature.java

-51
This file was deleted.

spring-core/graalvm/src/main/java/org/springframework/aot/graalvm/ConstantFieldSubstitutionProcessor.java

-106
This file was deleted.

spring-core/graalvm/src/main/java/org/springframework/aot/graalvm/ConstantReadableJavaField.java

-117
This file was deleted.

spring-core/graalvm/src/main/java/org/springframework/aot/graalvm/package-info.java

-5
This file was deleted.

spring-core/spring-core.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ task objenesisSourceJar(type: Jar) {
5858
dependencies {
5959
javapoet("com.squareup:javapoet:${javapoetVersion}@jar")
6060
objenesis("org.objenesis:objenesis:${objenesisVersion}@jar")
61-
graalvm(project(path: ":graalvm-feature", configuration: 'classesOnlyElements'))
6261
api(files(javapoetRepackJar))
6362
api(files(objenesisRepackJar))
6463
api(project(":spring-jcl"))
6564
compileOnly("io.projectreactor.tools:blockhound")
65+
compileOnly("org.graalvm.sdk:graal-sdk")
6666
optional("net.sf.jopt-simple:jopt-simple")
6767
optional("org.aspectj:aspectjweaver")
6868
optional("org.jetbrains.kotlin:kotlin-reflect")
@@ -108,8 +108,6 @@ jar {
108108
from(zipTree(objenesisRepackJar.archivePath)) {
109109
include "org/springframework/objenesis/**"
110110
}
111-
112-
from configurations.graalvm
113111
}
114112

115113
test {

0 commit comments

Comments
 (0)