From aa3754bc3dbcd08203744912f01f98f91768bf61 Mon Sep 17 00:00:00 2001
From: danielhanrahan <daniel.hanrahan@est.tech>
Date: Wed, 15 Sep 2021 16:35:40 +0100
Subject: Clean package-lock.json files

Clean package-lock.json files with maven clean
Remove incorrect entry from .gitignore

Issue-ID: POLICY-3646
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: Iab744932f7def2495afa4600c9e26dbe71a1414a
---
 .gitignore                          | 1 -
 gui-clamp/pom.xml                   | 4 ++++
 gui-editors/gui-editor-apex/pom.xml | 9 ++++++---
 gui-pdp-monitoring/pom.xml          | 7 +++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d5b1a4f..17d86c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,3 @@ node
 node_modules
 package-lock.json
 **/*.iml
-src/main/resources/webapp/dist
\ No newline at end of file
diff --git a/gui-clamp/pom.xml b/gui-clamp/pom.xml
index 2f4cd9c..3aad9ca 100644
--- a/gui-clamp/pom.xml
+++ b/gui-clamp/pom.xml
@@ -223,6 +223,10 @@
                         <fileset>
                             <directory>${ui.react.lib.src}/node_modules</directory>
                         </fileset>
+                        <fileset>
+                            <directory>${basedir}</directory>
+                            <includes>**/package-lock.json</includes>
+                        </fileset>
                     </filesets>
                 </configuration>
             </plugin>
diff --git a/gui-editors/gui-editor-apex/pom.xml b/gui-editors/gui-editor-apex/pom.xml
index 62a611f..10f5392 100644
--- a/gui-editors/gui-editor-apex/pom.xml
+++ b/gui-editors/gui-editor-apex/pom.xml
@@ -149,7 +149,7 @@
                 </excludes>
             </resource>
             <resource>
-                <directory>src/main/resources/webapp/dist/</directory>
+                <directory>${webapp.dir}/dist/</directory>
                 <targetPath>webapp/</targetPath>
             </resource>
         </resources>
@@ -214,8 +214,11 @@
                             <directory>${webapp.dir}/node_modules</directory>
                         </fileset>
                         <fileset>
-                            <directory>${webapp.dir}/dist/</directory>
-                            <includes>bundle.js</includes>
+                            <directory>${webapp.dir}</directory>
+                            <includes>
+                                <include>package-lock.json</include>
+                                <include>dist/bundle.js</include>
+                            </includes>
                         </fileset>
                     </filesets>
                 </configuration>
diff --git a/gui-pdp-monitoring/pom.xml b/gui-pdp-monitoring/pom.xml
index e070d9d..2bfe6d8 100644
--- a/gui-pdp-monitoring/pom.xml
+++ b/gui-pdp-monitoring/pom.xml
@@ -148,8 +148,11 @@
                             <directory>${webapp.dir}/node_modules</directory>
                         </fileset>
                         <fileset>
-                            <directory>${webapp.dir}/dist/</directory>
-                            <includes>bundle.js</includes>
+                            <directory>${webapp.dir}</directory>
+                            <includes>
+                                <include>package-lock.json</include>
+                                <include>dist/bundle.js</include>
+                            </includes>
                         </fileset>
                     </filesets>
                 </configuration>
-- 
cgit 1.2.3-korg