Skip to content

Commit 3872679

Browse files
committed
Move to sdk:graal-sdk over nativeimage:svm
The former is public API, the latter shouldn't be used unless absolutely necessary. Use scope 'provided' for all usages for consistency as the Graal SDK would be available at native image build time anyway. See oracle/graal#4683
1 parent 881ab1b commit 3872679

File tree

62 files changed

+140
-135
lines changed

Some content is hidden

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

62 files changed

+140
-135
lines changed

bom/application/pom.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
<maven-toolchain.version>3.0-alpha-2</maven-toolchain.version>
9191
<plexus-component-annotations.version>2.1.0</plexus-component-annotations.version>
9292
<graal-sdk.version>22.3.2</graal-sdk.version>
93-
<graal-svm.version>${graal-sdk.version}</graal-svm.version>
9493
<gizmo.version>1.6.1.Final</gizmo.version>
9594
<jackson-bom.version>2.15.2</jackson-bom.version>
9695
<commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
@@ -3215,10 +3214,6 @@
32153214
<artifactId>jboss-logmanager-embedded</artifactId>
32163215
<version>${jboss-logmanager.version}</version>
32173216
<exclusions>
3218-
<exclusion>
3219-
<groupId>org.graalvm.nativeimage</groupId>
3220-
<artifactId>svm</artifactId>
3221-
</exclusion>
32223217
<exclusion>
32233218
<groupId>org.jboss.modules</groupId>
32243219
<artifactId>jboss-modules</artifactId>
@@ -4929,20 +4924,6 @@
49294924
<version>${jandex.version}</version>
49304925
</dependency>
49314926

4932-
<dependency>
4933-
<groupId>org.graalvm.nativeimage</groupId>
4934-
<artifactId>svm</artifactId>
4935-
<version>${graal-svm.version}</version>
4936-
<!-- TODO: declaring a provided or test scope in BoM is not necessarily a good practice. We should think of removing it -->
4937-
<scope>provided</scope>
4938-
<!-- We only want the included annotations -->
4939-
<exclusions>
4940-
<exclusion>
4941-
<artifactId>*</artifactId>
4942-
<groupId>*</groupId>
4943-
</exclusion>
4944-
</exclusions>
4945-
</dependency>
49464927
<dependency>
49474928
<groupId>org.jboss.logging</groupId>
49484929
<artifactId>jboss-logging-annotations</artifactId>

core/runtime/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@
8080
<dependency>
8181
<groupId>org.graalvm.sdk</groupId>
8282
<artifactId>graal-sdk</artifactId>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.graalvm.nativeimage</groupId>
86-
<artifactId>svm</artifactId>
8783
<scope>provided</scope>
8884
</dependency>
8985
<dependency>

extensions/agroal/runtime/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<artifactId>quarkus-narayana-jta</artifactId>
3131
</dependency>
3232
<dependency>
33-
<groupId>org.graalvm.nativeimage</groupId>
34-
<artifactId>svm</artifactId>
33+
<groupId>org.graalvm.sdk</groupId>
34+
<artifactId>graal-sdk</artifactId>
3535
<scope>provided</scope>
3636
</dependency>
3737

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<artifactId>microprofile-jwt-auth-api</artifactId>
4242
</dependency>
4343
<dependency>
44-
<groupId>org.graalvm.nativeimage</groupId>
45-
<artifactId>svm</artifactId>
44+
<groupId>org.graalvm.sdk</groupId>
45+
<artifactId>graal-sdk</artifactId>
4646
<scope>provided</scope>
4747
</dependency>
4848
<dependency>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<artifactId>commons-logging-jboss-logging</artifactId>
3838
</dependency>
3939
<dependency>
40-
<groupId>org.graalvm.nativeimage</groupId>
41-
<artifactId>svm</artifactId>
40+
<groupId>org.graalvm.sdk</groupId>
41+
<artifactId>graal-sdk</artifactId>
4242
<scope>provided</scope>
4343
</dependency>
4444
</dependencies>

extensions/avro/runtime/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
</dependency>
3232

3333
<dependency>
34-
<groupId>org.graalvm.nativeimage</groupId>
35-
<artifactId>svm</artifactId>
34+
<groupId>org.graalvm.sdk</groupId>
35+
<artifactId>graal-sdk</artifactId>
3636
<scope>provided</scope>
3737
</dependency>
3838
</dependencies>

extensions/awt/runtime/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<artifactId>quarkus-arc</artifactId>
1717
</dependency>
1818
<dependency>
19-
<groupId>org.graalvm.nativeimage</groupId>
20-
<artifactId>svm</artifactId>
19+
<groupId>org.graalvm.sdk</groupId>
20+
<artifactId>graal-sdk</artifactId>
2121
<scope>provided</scope>
2222
</dependency>
2323
</dependencies>

extensions/azure-functions-http/deployment/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<artifactId>azure-functions-java-library</artifactId>
3939
</dependency>
4040
<dependency>
41-
<groupId>org.graalvm.nativeimage</groupId>
42-
<artifactId>svm</artifactId>
41+
<groupId>org.graalvm.sdk</groupId>
42+
<artifactId>graal-sdk</artifactId>
4343
<scope>provided</scope>
4444
</dependency>
4545
</dependencies>

extensions/caffeine/runtime/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<artifactId>caffeine</artifactId>
2323
</dependency>
2424
<dependency>
25-
<groupId>org.graalvm.nativeimage</groupId>
26-
<artifactId>svm</artifactId>
25+
<groupId>org.graalvm.sdk</groupId>
26+
<artifactId>graal-sdk</artifactId>
2727
<scope>provided</scope>
2828
</dependency>
2929
</dependencies>

extensions/elasticsearch-java-client/runtime/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
<groupId>co.elastic.clients</groupId>
4141
<artifactId>elasticsearch-java</artifactId>
4242
</dependency>
43+
<dependency>
44+
<groupId>org.graalvm.sdk</groupId>
45+
<artifactId>graal-sdk</artifactId>
46+
<scope>provided</scope>
47+
</dependency>
4348
</dependencies>
4449

4550

0 commit comments

Comments
 (0)