Skip to content

Commit

Permalink
deps: try graal-sdk 21.3.2 (old but patched) (#831)
Browse files Browse the repository at this point in the history
* chore(deps): update dependency org.graalvm.sdk:graal-sdk to v22.1.0

* use different versions for graal sdk and svm

* update dependency management

* more dependencyManagement updates

* deps: graal-sdk 21.3.2

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Shubha Rajan <shubhadayini@google.com>
  • Loading branch information
3 people authored May 3, 2022
1 parent d362f41 commit 7f71d09
Show file tree
Hide file tree
Showing 10 changed files with 86 additions and 7 deletions.
14 changes: 12 additions & 2 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,18 @@
<artifactId>jnr-ffi</artifactId>
<version>2.2.12</version>
</dependency>
<dependency>
<!-- This dependency is "provided" scope. It doesn't affect library
users' class paths -->
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${graal-svm.version}</version>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>${graal-sdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -196,13 +208,11 @@
<dependency>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${graalvm.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>${graalvm.version}</version>
<scope>provided</scope>
</dependency>
<!-- GAX provides native-image metadata for core Google libraries, such as
Expand Down
12 changes: 12 additions & 0 deletions jdbc/mysql-j-5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,18 @@
<artifactId>jnr-ffi</artifactId>
<version>2.2.12</version>
</dependency>
<dependency>
<!-- This dependency is "provided" scope. It doesn't affect library
users' class paths -->
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${graal-svm.version}</version>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>${graal-sdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
12 changes: 12 additions & 0 deletions jdbc/mysql-j-8/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,18 @@
<artifactId>google-http-client-gson</artifactId>
<version>1.41.7</version>
</dependency>
<dependency>
<!-- This dependency is "provided" scope. It doesn't affect library
users' class paths -->
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${graal-svm.version}</version>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>${graal-sdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
12 changes: 12 additions & 0 deletions jdbc/postgres/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,18 @@
<artifactId>google-http-client-gson</artifactId>
<version>1.41.7</version>
</dependency>
<dependency>
<!-- This dependency is "provided" scope. It doesn't affect library
users' class paths -->
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${graal-svm.version}</version>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>${graal-sdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
12 changes: 12 additions & 0 deletions jdbc/sqlserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,18 @@
<artifactId>google-http-client-gson</artifactId>
<version>1.41.7</version>
</dependency>
<dependency>
<!-- This dependency is "provided" scope. It doesn't affect library
users' class paths -->
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${graal-svm.version}</version>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>${graal-sdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javac.version>9+181-r4173-1</javac.version>
<native-image.version>0.9.11</native-image.version>
<graalvm.version>22.0.0.2</graalvm.version>
<graal-sdk.version>21.3.2</graal-sdk.version>
<graal-svm.version>22.0.0.2</graal-svm.version>
<assembly.skipAssembly>true</assembly.skipAssembly>
</properties>

Expand Down
7 changes: 6 additions & 1 deletion r2dbc/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@
users' class paths -->
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${graalvm.version}</version>
<version>${graal-svm.version}</version>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>${graal-sdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
7 changes: 6 additions & 1 deletion r2dbc/mysql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,12 @@
users' class paths -->
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${graalvm.version}</version>
<version>${graal-svm.version}</version>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>${graal-sdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
7 changes: 6 additions & 1 deletion r2dbc/postgres/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,12 @@
users' class paths -->
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${graalvm.version}</version>
<version>${graal-svm.version}</version>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>${graal-sdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
7 changes: 6 additions & 1 deletion r2dbc/sqlserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,12 @@
users' class paths -->
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<version>${graalvm.version}</version>
<version>${graal-svm.version}</version>
</dependency>
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>${graal-sdk.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down

0 comments on commit 7f71d09

Please sign in to comment.