From 34eabe4fb2e76f613381b1edf263d0c534a55c99 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Tue, 13 Apr 2021 14:02:37 -0400
Subject: Update version of maven resources plugin

Policy parent specifies a newer version of the maven resources plugin.
Modified the pom to work with it.  According to the docs, copy-resources
is only needed when copying from directories outside of
src/main/resources.

Issue-ID: POLICY-3182
Change-Id: Icb125914dd0fc15a9b2da4290b7e06338a0fae4a
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 gui-editors/gui-editor-apex/pom.xml | 38 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

(limited to 'gui-editors/gui-editor-apex/pom.xml')

diff --git a/gui-editors/gui-editor-apex/pom.xml b/gui-editors/gui-editor-apex/pom.xml
index 61ea8af..905ad47 100644
--- a/gui-editors/gui-editor-apex/pom.xml
+++ b/gui-editors/gui-editor-apex/pom.xml
@@ -135,6 +135,18 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <outputDirectory>${project.build.directory}/classes</outputDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>webapp/node/**</exclude>
+                    <exclude>webapp/node_modules/**</exclude>
+                    <exclude>webapp/webpack.config.js</exclude>
+                    <exclude>webapp/package.json</exclude>
+                    <exclude>webapp/package-lock.json</exclude>
+                </excludes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>com.github.eirslett</groupId>
@@ -183,32 +195,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <overwrite>true</overwrite>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>Copy frontend build to target</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${webapp.dir}/dist</directory>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-- 
cgit 1.2.3-korg