summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2021-09-14 20:21:46 +0000
committerGerrit Code Review <gerrit@onap.org>2021-09-14 20:21:46 +0000
commit16f9b97bda8300b354b7d156c084f9869191415f (patch)
tree02b05f225040b0e04bd032f51459e8763d48fddb
parent9a60058d5122378a304abc476b52032b277350c9 (diff)
parent1a12929be2565e9226ee725229505c5a4e3ead74 (diff)
Merge "Fixed Maven Clean Issue with Node Dependencies"
-rw-r--r--.gitignore5
-rw-r--r--runtime/clean_node_modules.sh44
-rw-r--r--runtime/pom.xml19
3 files changed, 67 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 31aad71b5..b54ca2afa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,10 @@ target
.idea
.checkstyle
*.iml
-ui-react/node_modules
+runtime/ui-react/node_modules
+runtime/ui-react/package-lock.json
+runtime/ui-react-lib/node_modules
+runtime/ui-react-lib/package-lock.json
ui-react/build
**/.evosuite/
**/debug-logs/
diff --git a/runtime/clean_node_modules.sh b/runtime/clean_node_modules.sh
new file mode 100644
index 000000000..154e6614e
--- /dev/null
+++ b/runtime/clean_node_modules.sh
@@ -0,0 +1,44 @@
+#
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
+
+#!/bin/sh
+
+if test -d ui-react/node_modules;
+then
+ echo "DELETING node_modules inside ui-react"
+ rm -rf ui-react/node_modules
+fi
+
+if test -f ui-react/package-lock.json;
+then
+ echo "DELETING package-lock.json inside ui-react"
+ rm ui-react/package-lock.json
+fi
+
+if test -d ui-react-lib/node_modules;
+then
+ echo "DELETING node_modules inside ui-react-lib"
+ rm -rf ui-react-lib/node_modules
+fi
+
+if test -f ui-react-lib/package-lock.json;
+then
+ echo "DELETING package-lock.json inside ui-react-lib"
+ rm ui-react-lib/package-lock.json
+fi
diff --git a/runtime/pom.xml b/runtime/pom.xml
index ef15198dc..d115ec7a7 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -932,6 +932,25 @@
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>cleanNodeModules</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>bash</executable>
+ <arguments>
+ <argument>${project.build.directory}/clean_node_modules.sh</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.11.3</version>