From 6cb84219a0c706b91709f1089356511dd39334a6 Mon Sep 17 00:00:00 2001
From: Thibaut Royer <troyer@gatling.io>
Date: Wed, 31 Jan 2024 10:57:59 +0100
Subject: [PATCH 1/2] chore: upgrade gatling-enterprise-plugin-commons 1.9.0-M7

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67f00bd..5f06786 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <maven3.version>3.0</maven3.version>
         <header.basedir>${project.basedir}</header.basedir>
         <junit.version>5.10.1</junit.version>
-        <gatling-enterprise-plugin-commons.version>1.9.0-M5</gatling-enterprise-plugin-commons.version>
+        <gatling-enterprise-plugin-commons.version>1.9.0-M7</gatling-enterprise-plugin-commons.version>
 
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
         <maven-plugin-plugin.version>3.11.0</maven-plugin-plugin.version>

From 9f85ecc2ff3cd0b3ffe724a3deca0855011bc0b4 Mon Sep 17 00:00:00 2001
From: Thibaut Royer <troyer@gatling.io>
Date: Wed, 31 Jan 2024 10:58:27 +0100
Subject: [PATCH 2/2] feat: load package configuration file and upload it with
 enterprisePackage target

Ref: MISC-446
---
 .../io/gatling/mojo/EnterpriseUploadMojo.java   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/gatling/mojo/EnterpriseUploadMojo.java b/src/main/java/io/gatling/mojo/EnterpriseUploadMojo.java
index 18199eb..fb18d55 100644
--- a/src/main/java/io/gatling/mojo/EnterpriseUploadMojo.java
+++ b/src/main/java/io/gatling/mojo/EnterpriseUploadMojo.java
@@ -17,6 +17,8 @@
 package io.gatling.mojo;
 
 import io.gatling.plugin.BatchEnterprisePlugin;
+import io.gatling.plugin.configuration.PackageConfiguration;
+import io.gatling.plugin.exceptions.EnterprisePluginException;
 import java.io.File;
 import java.util.UUID;
 import org.apache.maven.plugin.MojoFailureException;
@@ -51,6 +53,20 @@ public final class EnterpriseUploadMojo extends AbstractEnterprisePluginMojo {
 
   @Override
   public void execute() throws MojoFailureException {
+    final BatchEnterprisePlugin enterprisePlugin = initBatchEnterprisePlugin();
+
+    final String jsonConfig = PackageConfiguration.loadToJson(mavenProject.getBasedir());
+
+    if (jsonConfig != null) {
+      try {
+        getLog().info("Package configuration file detected, applying it.");
+        packageId = enterprisePlugin.uploadPackageConfiguration(jsonConfig).toString();
+        getLog().info("Package id: " + packageId);
+      } catch (EnterprisePluginException e) {
+        throw new MojoFailureException("Failed to upload package configuration", e);
+      }
+    }
+
     if (packageId == null && simulationId == null) {
       final String msg =
           "Missing packageID\n"
@@ -62,7 +78,6 @@ public void execute() throws MojoFailureException {
     }
 
     final File file = enterprisePackage();
-    final BatchEnterprisePlugin enterprisePlugin = initBatchEnterprisePlugin();
 
     RecoverEnterprisePluginException.handle(
         () ->