Merge pull request #227 from Trivadis/feature/issue-226-graalvm-22.2.0

Feature/issue 226 graalvm 22.2.0

Author: PhilippSalvisberg

standalone/README.md

@@ -52,8 +52,8 @@ The parameters are the same as for the [executable JAR](#executable-jar).
 ## How to Build
 
 1. [Download](https://www.oracle.com/tools/downloads/sqlcl-downloads.html) and install SQLcl 22.2.0
-2. [Download](https://github.com/graalvm/graalvm-ce-builds/releases) and install the GraalVM JDK 17 22.1.0
-3. Go to the `bin` directory of the GraalVM JDK and run `./gu install native-image`, if you want to produce a native image
+2. [Download](https://github.com/graalvm/graalvm-ce-builds/releases) and install the GraalVM JDK 17 22.2.0
+3. Go to the `bin` directory of the GraalVM JDK and run `./gu install js native-image`, if you want to produce a native image
 4. [Download](https://maven.apache.org/download.cgi) and install Apache Maven 3.8.6
 5. [Download](https://git-scm.com/downloads) and install a git command line client
 6. Clone the plsql-formatter-settings repository

standalone/pom.xml

@@ -13,8 +13,11 @@
         <jdk.version>11</jdk.version>
         <jdk.test.version>17</jdk.test.version>
         <sqlcl.version>22.2.0</sqlcl.version>
-        <graalvm.version>22.1.0.1</graalvm.version>
-        <native.maven.plugin.version>0.9.12</native.maven.plugin.version>
+        <graalvm.version>22.2.0</graalvm.version>
+        <native.maven.plugin.version>0.9.13</native.maven.plugin.version>
+        <reflections.version>0.10.2</reflections.version>
+        <slf4j.version>1.7.36</slf4j.version>
+        <javassist.version>3.29.0-GA</javassist.version>
         <skip.native>true</skip.native>
         <disable.logging>true</disable.logging>
     </properties>
@@ -92,13 +95,27 @@
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.10.2</version>
+            <version>${reflections.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <!-- transitive dependendency, added to control version -->
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <!-- transitive dependendency, added to control version -->
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>${javassist.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -363,11 +380,11 @@
                                     <goal>build</goal>
                                 </goals>
                                 <phase>package</phase>
-                                <!-- Override classpath to ensure js and js-scriptengine are not added to the classpath.
-                                     This reduces resuting image size by 22 MB (143 MB instead of 165 MB). -->
+                                <!-- Override classpath to ensure js is not added to the classpath.
+                                     This reduces resuting image size by 24 MB (162 MB instead of 186 MB). -->
                                 <configuration>
                                     <classpath>
-                                        ${project.build.directory}/${project.build.finalName}.jar:${settings.localRepository}/oracle/dbtools/dbtools-common/${sqlcl.version}/dbtools-common-${sqlcl.version}.jar:${settings.localRepository}/org/reflections/reflections/0.10.2/reflections-0.10.2.jar:${settings.localRepository}/org/javassist/javassist/3.28.0-GA/javassist-3.28.0-GA.jar:${settings.localRepository}/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar:${settings.localRepository}/org/slf4j/slf4j-jdk14/1.7.32/slf4j-jdk14-1.7.32.jar
+                                        ${project.build.directory}/${project.build.finalName}.jar:${settings.localRepository}/oracle/dbtools/dbtools-common/${sqlcl.version}/dbtools-common-${sqlcl.version}.jar:${settings.localRepository}/org/reflections/reflections/${reflections.version}/reflections-${reflections.version}.jar:${settings.localRepository}/org/javassist/javassist/${javassist.version}/javassist-${javassist.version}.jar:${settings.localRepository}/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar:${settings.localRepository}/org/slf4j/slf4j-jdk14/${slf4j.version}/slf4j-jdk14-${slf4j.version}.jar:${settings.localRepository}/org/graalvm/js/js-scriptengine/${graalvm.version}/js-scriptengine-${graalvm.version}.jar
                                     </classpath>
                                 </configuration>
                             </execution>

standalone/src/main/resources/META-INF/native-image/com.trivadis.plsql.formatter/tvdformat/resource-config.json

@@ -25,9 +25,6 @@
       {
         "pattern": "\\QMETA-INF/services/org.graalvm.polyglot.impl.AbstractPolyglotImpl\\E"
       },
-      {
-        "pattern": "\\Qcom/oracle/truffle/llvm/nfi/SulongNFI.class\\E"
-      },
       {
         "pattern": "\\Qcom/oracle/truffle/nfi/backend/libffi/LibFFILanguage.class\\E"
       },