Simplify graal demo (#970)

jline · Apr 22, 2024 · f01e9ef · f01e9ef
1 parent f370265
commit f01e9ef
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 52 deletions.
diff --git a/graal/pom.xml b/graal/pom.xml
@@ -71,41 +71,14 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-root</id>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <phase>validate</phase>
-                        <configuration>
-                            <outputDirectory>${basedir}/target</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <includes>
-                                        <include>reflection-config.json</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.graalvm.nativeimage</groupId>
                 <artifactId>native-image-maven-plugin</artifactId>
                 <configuration>
                     <skip>${native.image.skip}</skip>
                     <imageName>graal</imageName>
                     <mainClass>org.jline.demo.graal.Graal</mainClass>
-                    <buildArgs>--no-fallback
-                        --report-unsupported-elements-at-runtime
-                        --allow-incomplete-classpath
-                        -H:+UnlockExperimentalVMOptions
-                        -H:ReflectionConfigurationFiles=reflection-config.json</buildArgs>
+                    <buildArgs />
                 </configuration>
                 <executions>
                     <execution>

diff --git a/graal/src/main/resources/native-image/resource-config.json b/graal/src/main/resources/native-image/resource-config.json
diff --git a/graal/src/main/resources/reflection-config.json b/graal/src/main/resources/reflection-config.json
diff --git a/jansi-core/src/main/resources/META-INF/native-image/org.jline/jansi/native-image.properties b/jansi-core/src/main/resources/META-INF/native-image/org.jline/jansi/native-image.properties
@@ -1 +1,2 @@
-Args = -H:+UnlockExperimentalVMOptions -H:ResourceConfigurationResources=${.}/resource-config.json 
+Args = -H:+UnlockExperimentalVMOptions \
+       -H:ResourceConfigurationResources=${.}/resource-config.json
diff --git a/...e/src/main/resources/META-INF/native-image/org.jline/jline-native/native-image.properties b/...e/src/main/resources/META-INF/native-image/org.jline/jline-native/native-image.properties
@@ -1 +1,4 @@
-Args = -H:+UnlockExperimentalVMOptions -H:ResourceConfigurationResources=${.}/resource-config.json -H:ReflectionConfigurationResources=${.}/reflection-config.json -H:JNIConfigurationResources=${.}/jni-config.json 
+Args = -H:+UnlockExperimentalVMOptions \
+       -H:ResourceConfigurationResources=${.}/resource-config.json \
+       -H:ReflectionConfigurationResources=${.}/reflection-config.json \
+       -H:JNIConfigurationResources=${.}/jni-config.json
diff --git a/...main/resources/META-INF/native-image/org.jline/jline-terminal-ffm/native-image.properties b/...main/resources/META-INF/native-image/org.jline/jline-terminal-ffm/native-image.properties
@@ -1 +1,3 @@
-Args = -H:+UnlockExperimentalVMOptions -H:ResourceConfigurationResources=${.}/resource-config.json -H:ReflectionConfigurationResources=${.}/reflection-config.json
+Args = -H:+UnlockExperimentalVMOptions \
+       -H:ResourceConfigurationResources=${.}/resource-config.json \
+       -H:ReflectionConfigurationResources=${.}/reflection-config.json
diff --git a/...in/resources/META-INF/native-image/org.jline/jline-terminal-jansi/native-image.properties b/...in/resources/META-INF/native-image/org.jline/jline-terminal-jansi/native-image.properties
@@ -1 +1,3 @@
-Args = -H:+UnlockExperimentalVMOptions -H:ResourceConfigurationResources=${.}/resource-config.json -H:ReflectionConfigurationResources=${.}/reflection-config.json
+Args = -H:+UnlockExperimentalVMOptions \
+       -H:ResourceConfigurationResources=${.}/resource-config.json \
+       -H:ReflectionConfigurationResources=${.}/reflection-config.json
diff --git a/...main/resources/META-INF/native-image/org.jline/jline-terminal-jna/native-image.properties b/...main/resources/META-INF/native-image/org.jline/jline-terminal-jna/native-image.properties
@@ -1 +1,3 @@
-Args = -H:+UnlockExperimentalVMOptions -H:ResourceConfigurationResources=${.}/resource-config.json -H:ReflectionConfigurationResources=${.}/reflection-config.json
+Args = -H:+UnlockExperimentalVMOptions \
+       -H:ResourceConfigurationResources=${.}/resource-config.json \
+       -H:ReflectionConfigurationResources=${.}/reflection-config.json
diff --git a/...main/resources/META-INF/native-image/org.jline/jline-terminal-jni/native-image.properties b/...main/resources/META-INF/native-image/org.jline/jline-terminal-jni/native-image.properties
@@ -1 +1,3 @@
-Args = -H:+UnlockExperimentalVMOptions -H:ResourceConfigurationResources=${.}/resource-config.json -H:ReflectionConfigurationResources=${.}/reflection-config.json
+Args = -H:+UnlockExperimentalVMOptions \
+       -H:ResourceConfigurationResources=${.}/resource-config.json \
+       -H:ReflectionConfigurationResources=${.}/reflection-config.json
diff --git a/...src/main/resources/META-INF/native-image/org.jline/jline-terminal/native-image.properties b/...src/main/resources/META-INF/native-image/org.jline/jline-terminal/native-image.properties
@@ -1 +1,3 @@
-Args = -H:+UnlockExperimentalVMOptions -H:ResourceConfigurationResources=${.}/resource-config.json -H:ReflectionConfigurationResources=${.}/reflection-config.json
+Args = -H:+UnlockExperimentalVMOptions \
+       -H:ResourceConfigurationResources=${.}/resource-config.json \
+       -H:ReflectionConfigurationResources=${.}/reflection-config.json