diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 642d572c..9b66d8c7 100644 --- 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 index 1fa5c4e0..1d21bdcf 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -302,6 +302,18 @@ + + org.eclipse.sisu + sisu-maven-plugin + + + generate-index + + main-index + + + + org.jacoco jacoco-maven-plugin diff --git a/plugin/src/main/java/org/bonitasoft/plugin/install/InstallProjectStoreMojo.java b/plugin/src/main/java/org/bonitasoft/plugin/install/InstallProjectStoreMojo.java index e461ad93..afe14bf9 100644 --- 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 index b8641043..b7078605 100644 --- a/pom.xml +++ b/pom.xml @@ -123,6 +123,7 @@ 2.38.0 1.20.0 2.16.0 + 0.3.5 5.10.0 1.7.0 @@ -199,6 +200,11 @@ + + org.eclipse.sisu + sisu-maven-plugin + ${sisu-maven-plugin.version} + org.jacoco jacoco-maven-plugin