Rework Maven plugin, add excludeConfig option, set useBuildArg to false on nix systems.

- Completely reworked Maven plugin (should fix many of previous issues
and inconsistencies between main and test builds).

- Added `classesDirectory`, `debug`, `fallback`, `verbose`, `sharedLibrary`,
`configurationFileDirectories`, `excludeConfig` and `jvmArgs` properties in
order to match those present in the Gradle plugin.

- `useArgFile` is now set to true by default only on Windows

- Added `excludeConfig` configuration option that allows skipping of
configuration files that are present in classpath `jar` s.

Author: lazar-mitrovic

docs/src/docs/asciidoc/index.adoc

@@ -23,6 +23,13 @@ If you are interested in contributing, please refer to our https://github.com/gr
 * Introduced the `metadataCopy` task.
 * Introduced the concept of agent modes.
 ** Under the hood, the agent mode dictates what options are passed to the agent and how metadata produced by multiple runs get merged.
+* Added `excludeConfig` configuration option that allows skipping of configuration files that are present in classpath `jar` s.
+* `useArgFile` is now set to true by default only on Windows.
+
+==== Maven plugin
+* Completely reworked Maven plugin (should fix many of previous issues and inconsistencies between main and test builds).
+* Added `classesDirectory`, `debug`, `fallback`, `verbose`, `sharedLibrary`, `configurationFileDirectories`, `excludeConfig` and `jvmArgs` properties in order to match those present in the Gradle plugin.
+* `useArgFile` is now set to true by default only on Windows.
 
 === Release 0.9.11
 

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -126,6 +126,7 @@
 import static org.graalvm.buildtools.gradle.internal.GradleUtils.transitiveProjectArtifacts;
 import static org.graalvm.buildtools.gradle.internal.NativeImageExecutableLocator.graalvmHomeProvider;
 import static org.graalvm.buildtools.utils.SharedConstants.AGENT_PROPERTY;
+import static org.graalvm.buildtools.utils.SharedConstants.IS_WINDOWS;
 
 /**
  * Gradle plugin for GraalVM Native Image.
@@ -170,7 +171,7 @@ public void apply(Project project) {
 
         logger = GraalVMLogger.of(project.getLogger());
         DefaultGraalVmExtension graalExtension = (DefaultGraalVmExtension) registerGraalVMExtension(project);
-        graalExtension.getUseArgFile().convention(true);
+        graalExtension.getUseArgFile().convention(IS_WINDOWS);
         project.getPlugins()
                 .withType(JavaPlugin.class, javaPlugin -> configureJavaProject(project, nativeImageServiceProvider, graalExtension));
 

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/dsl/GraalVMExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -99,7 +99,7 @@ public interface GraalVMExtension {
 
     /**
      * Property driving the use of @-arg files when invoking native image.
-     * This is enabled by default. For older native-image versions, this
+     * This is enabled by default on Windows. For older native-image versions, this
      * needs to be disabled.
      *
      * @return the argument file property

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/dsl/NativeImageOptions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -171,14 +171,24 @@ public interface NativeImageOptions extends Named {
     Property<JavaLauncher> getJavaLauncher();
 
     /**
-     * Returns the list of configuration file directories (e.g resource-config.json, ...) which need
+     * Returns the list of configuration file directories (e.g. resource-config.json, ...) which need
      * to be passed to native-image.
      *
      * @return a collection of directories
      */
     @InputFiles
     ConfigurableFileCollection getConfigurationFileDirectories();
 
+    /**
+     * Returns the map that as contains information about configuration that should be excluded
+     * during image building. It consists of a jar regular expression as a key and a resource
+     * regular expression as a value.
+     *
+     * @return a map of filters for configuration exclusion
+     */
+    @Input
+    MapProperty<String, String> getExcludeConfig();
+
     @Nested
     NativeResourcesOptions getResources();
 

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/internal/NativeImageCommandLineProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -104,6 +104,12 @@ public List<String> asArguments() {
         NativeImageOptions options = getOptions().get();
         List<String> cliArgs = new ArrayList<>(20);
 
+        options.getExcludeConfig().get().forEach((jarPath, resourcePattern) -> {
+            cliArgs.add("--exclude-config");
+            cliArgs.add(jarPath);
+            cliArgs.add(resourcePattern);
+        });
+
         cliArgs.add("-cp");
         String classpathString = buildClasspathString(options);
         cliArgs.add(classpathString);

native-maven-plugin/build-plugins/src/main/java/org/graalvm/build/maven/MavenTask.java

@@ -88,7 +88,7 @@ protected void executeMaven() {
         File projectdir = getProjectDirectory().getAsFile().get();
         getExecOperations().javaexec(spec -> {
             spec.setClasspath(getMavenEmbedderClasspath());
-            spec.setMain("org.apache.maven.cli.MavenCli");
+            spec.getMainClass().set("org.apache.maven.cli.MavenCli");
             spec.systemProperty("maven.multiModuleProjectDirectory", projectdir.getAbsolutePath());
             prepareSpec(spec);
             List<String> arguments = new ArrayList<>();

native-maven-plugin/build-plugins/src/main/kotlin/org.graalvm.build.maven-functional-testing.gradle.kts

@@ -1,6 +1,3 @@
-import org.graalvm.build.maven.MavenTask
-import org.gradle.util.GFileUtils
-
 /*
  * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy

@@ -64,7 +64,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
 
         then:
         buildSucceeded
-        outputContains "JVM reachability metadata repository is enabled, but no repository has been configured"
+        outputContains "GraalVM reachability metadata repository is enabled, but no repository has been configured"
         outputContains "Reflection failed"
     }
 
@@ -77,8 +77,8 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
 
         then:
         buildSucceeded
-        outputContains "The official JVM reachability metadata repository is not released yet. Only local repositories are supported"
-        outputContains "JVM reachability metadata repository is enabled, but no repository has been configured"
+        outputContains "The official GraalVM reachability metadata repository is not released yet. Only local repositories are supported"
+        outputContains "GraalVM reachability metadata repository is enabled, but no repository has been configured"
         outputContains "Reflection failed"
     }
 
@@ -94,10 +94,10 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
         outputContains "Hello, from reflection!"
 
         and: "it doesn't find a configuration directory for the current version"
-        outputContains "[jvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
+        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
 
         and: "but it finds one thanks to the latest configuration field"
-        outputContains "[jvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org/graalvm/internal/library-with-reflection/1"
+        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org/graalvm/internal/library-with-reflection/1"
     }
 
     void "if the path doesn't exist it throws an error"() {
@@ -109,7 +109,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
 
         then:
         buildSucceeded
-        outputContains "JVM reachability metadata repository path does not exist"
+        outputContains "GraalVM reachability metadata repository path does not exist"
         outputContains "Reflection failed"
     }
 
@@ -134,7 +134,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
 
         then:
         buildSucceeded
-        outputContains "[jvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration is forced to version 2"
+        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration is forced to version 2"
         outputContains "Reflection failed"
     }
 
@@ -150,10 +150,10 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
         outputContains "Hello, from reflection!"
 
         and: "it doesn't find a configuration directory for the current version"
-        outputContains "[jvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
+        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
 
         and: "but it finds one thanks to the latest configuration field"
-        outputContains "[jvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org/graalvm/internal/library-with-reflection/1"
+        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org/graalvm/internal/library-with-reflection/1"
     }
 
     void "it can download a remote repository"() {
@@ -170,10 +170,10 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
         outputContains "Downloaded GraalVM reachability metadata repository from http://localhost:${localServerPort}/target/repo.zip"
 
         and: "it doesn't find a configuration directory for the current version"
-        outputContains "[jvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
+        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
 
         and: "but it finds one thanks to the latest configuration field"
-        outputContains "[jvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org/graalvm/internal/library-with-reflection/1"
+        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org/graalvm/internal/library-with-reflection/1"
     }
 
     void "when pointing to a missing URL, reflection fails"() {