From 5a47383b6848949e92933e15d723fb2dddd203ca Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.RIHTARSIC@ext.ec.europa.eu>
Date: Wed, 1 Jun 2022 20:17:22 +0200
Subject: [PATCH] maven release issue does not pass arguments to sub-build
---
pom.xml | 6 +++++-
smp-angular/pom.xml | 6 +++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5cfac94e2..351594081 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,7 @@
</sonar.coverage.exclusions>
<!-- latest version compatible with SonarQube 5.6 is: 3.3.0.603-->
<sonar.maven.plugin.version>3.5.0.1254</sonar.maven.plugin.version>
+ <release.arguments>-Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true -Dmaven.test.skip=true</release.arguments>
</properties>
<scm>
@@ -698,7 +699,10 @@
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
- <arguments>$(arguments)</arguments>
+ <arguments>-DusePreInstallNpm -Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true -Dmaven.test.skip=true</arguments>
+ <!-- <arguments>${release.arguments}</arguments> and setting it as
+ release:prepare -Darguments="-Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true -Dmaven.test.skip=true" -DskipITs=true
+ does not work! -->
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
diff --git a/smp-angular/pom.xml b/smp-angular/pom.xml
index 7b9ac6027..76421fb5f 100644
--- a/smp-angular/pom.xml
+++ b/smp-angular/pom.xml
@@ -55,10 +55,10 @@
<profiles>
<profile>
- <id>installNpm</id>
+ <id>defaultInstallNpm</id>
<activation>
<property>
- <name>installNpm</name>
+ <name>!usePreInstallNpm</name>
</property>
</activation>
<build>
@@ -105,7 +105,7 @@
<id>usePreInstalledNpm</id>
<activation>
<property>
- <name>!installNpm</name>
+ <name>usePreInstallNpm</name>
</property>
</activation>
<build>
--
GitLab