From e0fb51fdefd291cb77967ef00363397d57b0a825 Mon Sep 17 00:00:00 2001
From: Scott Kurz <skurz@us.ibm.com>
Date: Tue, 20 Feb 2024 11:02:51 -0500
Subject: [PATCH] Use LMP for copyDeps in package

Signed-off-by: Scott Kurz <skurz@us.ibm.com>
---
 finish/Dockerfile |  2 +-
 finish/pom.xml    | 19 +++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/finish/Dockerfile b/finish/Dockerfile
index e424637..6f5901f 100644
--- a/finish/Dockerfile
+++ b/finish/Dockerfile
@@ -31,7 +31,7 @@ COPY --chown=1001:0 \
     /config/apps
 
 COPY --chown=1001:0 \
-    target/liberty/wlp/usr/shared/resources/*.jar \
+    target/liberty/wlp/usr/shared/resources/postgresql-*.jar \
     /opt/ol/wlp/usr/shared/resources/
 
 USER 1001
diff --git a/finish/pom.xml b/finish/pom.xml
index 6944f6e..43b49fb 100644
--- a/finish/pom.xml
+++ b/finish/pom.xml
@@ -111,25 +111,21 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <version>3.6.1</version>
+            </plugin>
+            <!-- end::maven-dependency-plugin[] -->
+            <plugin>
+                <groupId>io.openliberty.tools</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+                <version>3.10</version>
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>
                         <phase>prepare-package</phase>
                         <goals>
-                            <goal>copy-dependencies</goal>
+                            <goal>create</goal>
                         </goals>
-                        <configuration>
-                            <includeGroupIds>org.postgresql</includeGroupIds>
-                            <includeArtifactIds>postgresql</includeArtifactIds>
-                            <outputDirectory>${project.build.directory}/liberty/wlp/usr/shared/resources</outputDirectory>
-                        </configuration>
                     </execution>
                 </executions>
-            </plugin>
-            <!-- end::maven-dependency-plugin[] -->
-            <plugin>
-                <groupId>io.openliberty.tools</groupId>
-                <artifactId>liberty-maven-plugin</artifactId>
                 <configuration>
                     <copyDependencies>
                         <dependencyGroup>
@@ -141,7 +137,6 @@
                         </dependencyGroup>
                     </copyDependencies>
                 </configuration>
-                <version>3.10</version>
             </plugin>
             <!-- tag::failsafe[] -->
             <plugin>