Test changes

graalvm · Mar 7, 2023 · c1e7dae · c1e7dae
1 parent 83f2ea3
commit c1e7dae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/MetadataCopyMojo.java b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/MetadataCopyMojo.java
@@ -81,7 +81,11 @@ public class MetadataCopyMojo extends AbstractMergeAgentFilesMojo {
 
     @Override
     public void execute() throws MojoExecutionException {
-        if (agentConfiguration != null && (agentConfiguration.isEnabled() || agentIsEnabledFromCmd())) {
+        System.out.println("===============================================================================");
+        System.out.println(session.getSystemProperties().getProperty("agent"));
+        System.out.println(agentConfiguration.isEnabled());
+        System.out.println("===============================================================================");
+        if (agentConfiguration != null && agentConfiguration.isEnabled()) {
             // in direct mode user is fully responsible for agent configuration, and we will not execute anything besides line that user provided
             if (agentConfiguration.getDefaultMode().equalsIgnoreCase("direct")) {
                 logger.info("You are running agent in direct mode. Skipping both merge and metadata copy tasks.");
@@ -219,16 +223,4 @@ private List<String> getListDiff(List<String> list1, List<String> list2) {
         return diff;
     }
 
-    private boolean agentIsEnabledFromCmd() {
-        if (session == null) {
-            return false;
-        }
-
-        if (session.getSystemProperties().getProperty("agent") == null) {
-            return false;
-        }
-
-        return session.getSystemProperties().getProperty("agent").equalsIgnoreCase("true");
-    }
-
 }
diff --git a/...en-plugin/src/main/java/org/graalvm/buildtools/maven/config/agent/AgentConfiguration.java b/...en-plugin/src/main/java/org/graalvm/buildtools/maven/config/agent/AgentConfiguration.java
@@ -53,7 +53,7 @@
 
 public class AgentConfiguration extends org.graalvm.buildtools.agent.AgentConfiguration {
 
-    @Parameter
+    @Parameter(property = "agent")
     private boolean enabled;
 
     @Parameter(defaultValue = "standard")