diff --git a/pom.xml b/pom.xml
index 66fc31954ff9367f8016abbcfb322e26521ffbc6..82d393122920d32279c244c2406953338caaf9d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,10 @@
<spring.version>5.3.20</spring.version>
<xmlunit.version>2.9.0</xmlunit.version>
+ <!-- plugins -->
+ <frontend-maven-plugin.version>1.9.1</frontend-maven-plugin.version>
+ <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+
<sonar.jacoco.remotePort>${jacocoRemotePort}</sonar.jacoco.remotePort>
<sonar.jacoco.remoteAddress>${jacocoRemoteAddress}</sonar.jacoco.remoteAddress>
@@ -90,7 +94,8 @@
<sonar.language>java</sonar.language>
<sonar.binaries>target/classes</sonar.binaries>
- <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+ <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml
+ </sonar.coverage.jacoco.xmlReportPaths>
<jacoco.maven.plugin.version>0.8.6</jacoco.maven.plugin.version>
<surefire.maven.plugin.version>2.22.2</surefire.maven.plugin.version>
<sonar.exclusions>
@@ -591,6 +596,11 @@
<artifactId>soapui-maven-plugin</artifactId>
<version>${soapui.plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -606,6 +616,16 @@
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
</plugin>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>${frontend-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${exec-maven-plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
diff --git a/smp-angular/pom.xml b/smp-angular/pom.xml
index 2002563486899f05e2dc6092a90e205d9db13c76..d3ef0ab3aee11522f17b4e5307e211844e337754 100644
--- a/smp-angular/pom.xml
+++ b/smp-angular/pom.xml
@@ -17,45 +17,19 @@
<properties>
<!-- Only selected modules are deployed -->
<maven.deploy.skip>false</maven.deploy.skip>
- <frontend-maven-plugin.version>1.9.1</frontend-maven-plugin.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<node.version>v14.18.0</node.version>
<npm.version>7.24.2</npm.version>
+ <!--set variable to force use of pre-installed npm-->
+ <!-- To build with preinstalled nodejs build with usePreInstalledNpm argument as example
+ (works only on linux for windows update arguments in exec plugin below)
+ mvn clean install -DusePreInstalledNpm -Dnpm.path=/opt/programs/node-v14.17.0-linux-x64/bin
+ -->
+ <npm.path>/opt/programs/node-v14.17.0-linux-x64/bin</npm.path>
</properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>${frontend-maven-plugin.version}</version>
- <executions>
- <execution>
- <id>install node and npm</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- <configuration>
- <nodeVersion>${node.version}</nodeVersion>
- <npmVersion>${npm.version}</npmVersion>
- </configuration>
- </execution>
-
- <execution>
- <id>npm install</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>install --unsafe-perm</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -64,7 +38,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
<configuration>
<filesets>
<fileset>
@@ -76,22 +49,79 @@
</filesets>
</configuration>
</plugin>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prod</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>run-script prod</arguments>
- </configuration>
- <phase>generate-resources</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
+
+
+ <profiles>
+ <profile>
+ <id>defaultAngularBuild</id>
+ <activation>
+ <property>
+ <name>!usePreInstalledNpm</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install node and npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ <configuration>
+ <nodeVersion>${node.version}</nodeVersion>
+ <npmVersion>${npm.version}</npmVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <id>prod</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>run-script prod</arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>usePreInstalledNpm</id>
+ <activation>
+ <property>
+ <name>usePreInstalledNpm</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>${npm.path}/npm</executable>
+ <arguments>
+ <argument>run-script</argument>
+ <argument>prod</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/smp-angular/src/styles.css b/smp-angular/src/styles.css
index 2101a908af5a514be4eb4073c788c3ea022a4c89..b02e527fed588fd0c2537b08a9508588954949eb 100644
--- a/smp-angular/src/styles.css
+++ b/smp-angular/src/styles.css
@@ -102,7 +102,7 @@ ngx-datatable span:before {
width: 100%;
border: gray outset 1px;
background-color: #c4e1f8;
- min-heigh: 5px !important;
+ min-height: 5px !important;
margin: 18px -24px 0 -24px !important;
}