fix(install): force system properties in build request

bonitasoft · Dec 2, 2024 · 77ca4f6 · 77ca4f6
1 parent 0386e06
commit 77ca4f6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -302,6 +302,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-index</id>
+            <goals>
+              <goal>main-index</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>

diff --git a/plugin/src/main/java/org/bonitasoft/plugin/install/InstallProjectStoreMojo.java b/plugin/src/main/java/org/bonitasoft/plugin/install/InstallProjectStoreMojo.java
@@ -84,7 +84,7 @@ public class InstallProjectStoreMojo extends AbstractMojo {
     private static final String VERSION = "version";
     private static final String ARTIFACT_ID = "artifactId";
 
-    static final String DEFAULT_INSTALL_PLUGIN_VERSION = "3.1.1";
+    static final String DEFAULT_INSTALL_PLUGIN_VERSION = "3.1.3";
     static final String INITIAL_INSTALL_PLUGIN_VERSION = "2.4";
     private static final String INSTALL_PLUGIN_GROUP_ID = "org.apache.maven.plugins";
     private static final String INSTALL_PLUGIN_ARTIFACT_ID = "maven-install-plugin";
@@ -353,6 +353,7 @@ MavenExecutionRequest newInstallFileExecutionRequest(Artifact artifact,
                 INSTALL_PLUGIN_ARTIFACT_ID,
                 installPluginVersion)));
         executionRequest.setLocalRepository(localRepository);
+        executionRequest.setSystemProperties(System.getProperties());
         Properties installFileProperties = new Properties();
         installFileProperties.setProperty(GROUP_ID, artifact.getGroupId());
         installFileProperties.setProperty(ARTIFACT_ID, artifact.getArtifactId());
@@ -387,6 +388,7 @@ private ProjectBuildingRequest newResolveArtifactProjectBuildingRequest() {
         ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest(session.getProjectBuildingRequest());
 
         buildingRequest.setRemoteRepositories(remoteRepositories);
+        buildingRequest.setSystemProperties(System.getProperties());
 
         return buildingRequest;
     }

diff --git a/pom.xml b/pom.xml
@@ -123,6 +123,7 @@
     <spotless-maven-plugin.version>2.38.0</spotless-maven-plugin.version>
     <gitflow-maven-plugin.version>1.20.0</gitflow-maven-plugin.version>
     <versions-maven-plugin.version>2.16.0</versions-maven-plugin.version>
+    <sisu-maven-plugin.version>0.3.5</sisu-maven-plugin.version>
     <!-- Test -->
     <junit-jupiter-engine.version>5.10.0</junit-jupiter-engine.version>
     <junit-platform-runner.version>1.7.0</junit-platform-runner.version>
@@ -199,6 +200,11 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.eclipse.sisu</groupId>
+          <artifactId>sisu-maven-plugin</artifactId>
+          <version>${sisu-maven-plugin.version}</version>
+        </plugin>
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>