From 956e1da2adb597164ff4a69aa19f97e0d7dde0be Mon Sep 17 00:00:00 2001
From: Paulo Lopes <pmlopes@users.noreply.github.com>
Date: Mon, 21 Jun 2021 16:10:39 +0200
Subject: [PATCH] Update graal annotations dependencies GAV to allow license
 GPL2+CE (#11404)

Motivation:

We need to use a GraalVM dependency which uses GPL2 + CE.

Modifications:

- Update all graalvm dependencies to new GAV which introduces a license change from GPL2 to GPL2 + CE
- This also required a small bump on the general version from 19.2 to 19.3, which should be fine as 19.3 is an official maintained LTS version, while 19.2 wasn't.

Result:

Fixes: #11398

Signed-off-by: Paulo Lopes <pmlopes@gmail.com>
---
 common/pom.xml                                     | 2 +-
 pom.xml                                            | 2 +-
 testsuite-native-image-client-runtime-init/pom.xml | 2 +-
 testsuite-native-image-client/pom.xml              | 2 +-
 testsuite-native-image/pom.xml                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 8c9fd060b6..f812999b52 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -39,7 +39,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.oracle.substratevm</groupId>
+      <groupId>org.graalvm.nativeimage</groupId>
       <artifactId>svm</artifactId>
       <version>${graalvm.version}</version>
       <!-- Provided scope as it is only needed for compiling the SVM substitution classes -->
diff --git a/pom.xml b/pom.xml
index 6a13ce1f6a..bc6118e9f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -495,7 +495,7 @@
     <skipAutobahnTestsuite>false</skipAutobahnTestsuite>
     <skipHttp2Testsuite>false</skipHttp2Testsuite>
     <skipJapicmp>false</skipJapicmp>
-    <graalvm.version>19.2.1</graalvm.version>
+    <graalvm.version>19.3.6</graalvm.version>
     <brotli4j.version>1.4.2</brotli4j.version>
     <!-- By default skip native testsuite as it requires a custom environment with graalvm installed -->
     <skipNativeImageTestsuite>true</skipNativeImageTestsuite>
diff --git a/testsuite-native-image-client-runtime-init/pom.xml b/testsuite-native-image-client-runtime-init/pom.xml
index aaf9bf623f..c29f9e2e11 100644
--- a/testsuite-native-image-client-runtime-init/pom.xml
+++ b/testsuite-native-image-client-runtime-init/pom.xml
@@ -59,7 +59,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>com.oracle.substratevm</groupId>
+        <groupId>org.graalvm.nativeimage</groupId>
         <artifactId>native-image-maven-plugin</artifactId>
         <version>${graalvm.version}</version>
         <executions>
diff --git a/testsuite-native-image-client/pom.xml b/testsuite-native-image-client/pom.xml
index 3aeee97540..bc752c24a7 100644
--- a/testsuite-native-image-client/pom.xml
+++ b/testsuite-native-image-client/pom.xml
@@ -65,7 +65,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>com.oracle.substratevm</groupId>
+        <groupId>org.graalvm.nativeimage</groupId>
         <artifactId>native-image-maven-plugin</artifactId>
         <version>${graalvm.version}</version>
         <executions>
diff --git a/testsuite-native-image/pom.xml b/testsuite-native-image/pom.xml
index 57b694b792..3647de6923 100644
--- a/testsuite-native-image/pom.xml
+++ b/testsuite-native-image/pom.xml
@@ -80,7 +80,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>com.oracle.substratevm</groupId>
+        <groupId>org.graalvm.nativeimage</groupId>
         <artifactId>native-image-maven-plugin</artifactId>
         <version>${graalvm.version}</version>
         <executions>