From e5eb9e0a19ff4da058b1cb7c4c4020d7b5a3a2da Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 25 Oct 2024 11:20:50 +1000
Subject: [PATCH 1/2] Simplity copying dependencies

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 applications/proberapp/pom.xml | 73 ++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 26 deletions(-)

diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml
index afa63576..39f2e4fb 100644
--- a/applications/proberapp/pom.xml
+++ b/applications/proberapp/pom.xml
@@ -211,43 +211,64 @@
 
         <plugins>
             <plugin>
-                <groupId>com.coderplus.maven.plugins</groupId>
-                <artifactId>copy-rename-maven-plugin</artifactId>
-                <version>1.0.1</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <!-- TODO it would good to have this version only in pluginManagement in top pom -->
+                <version>3.8.0</version>
                 <executions>
                     <execution>
                         <id>copy-file</id>
                         <phase>pre-integration-test</phase>
                         <goals>
-                            <goal>copy</goal>
+                            <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                              <fileSets>
-                                <fileSet>
-                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-impl-jetty9.jar</sourceFile>
-                                    <destinationFile>${appengine.runtime.location}/runtime-impl-jetty9.jar</destinationFile>
-                                </fileSet>
-                                <fileSet>
-                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-shared-jetty9.jar</sourceFile>
-                                    <destinationFile>${appengine.runtime.location}/runtime-shared-jetty9.jar</destinationFile>
-                                </fileSet>
-                                <fileSet>
-                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-impl-jetty12.jar</sourceFile>
-                                    <destinationFile>${appengine.runtime.location}/runtime-impl-jetty12.jar</destinationFile>
-                                </fileSet>
-                                <fileSet>
-                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-shared-jetty12.jar</sourceFile>
-                                    <destinationFile>${appengine.runtime.location}/runtime-shared-jetty12.jar</destinationFile>
-                                </fileSet>
-                                <fileSet>
-                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-main.jar</sourceFile>
-                                    <destinationFile>${appengine.runtime.location}/runtime-main.jar</destinationFile>
-                                </fileSet>
-                            </fileSets>
+                            <excludeTransitive>true</excludeTransitive>
+                            <includeGroupIds>com.google.appengine</includeGroupIds>
+                            <stripVersion>true</stripVersion>
+                            <outputDirectory>${appengine.runtime.location}</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+<!--            <plugin>-->
+<!--                <groupId>com.coderplus.maven.plugins</groupId>-->
+<!--                <artifactId>copy-rename-maven-plugin</artifactId>-->
+<!--                <version>1.0.1</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>copy-file</id>-->
+<!--                        <phase>pre-integration-test</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>copy</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                              <fileSets>-->
+<!--                                <fileSet>-->
+<!--                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-impl-jetty9.jar</sourceFile>-->
+<!--                                    <destinationFile>${appengine.runtime.location}/runtime-impl-jetty9.jar</destinationFile>-->
+<!--                                </fileSet>-->
+<!--                                <fileSet>-->
+<!--                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-shared-jetty9.jar</sourceFile>-->
+<!--                                    <destinationFile>${appengine.runtime.location}/runtime-shared-jetty9.jar</destinationFile>-->
+<!--                                </fileSet>-->
+<!--                                <fileSet>-->
+<!--                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-impl-jetty12.jar</sourceFile>-->
+<!--                                    <destinationFile>${appengine.runtime.location}/runtime-impl-jetty12.jar</destinationFile>-->
+<!--                                </fileSet>-->
+<!--                                <fileSet>-->
+<!--                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-shared-jetty12.jar</sourceFile>-->
+<!--                                    <destinationFile>${appengine.runtime.location}/runtime-shared-jetty12.jar</destinationFile>-->
+<!--                                </fileSet>-->
+<!--                                <fileSet>-->
+<!--                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-main.jar</sourceFile>-->
+<!--                                    <destinationFile>${appengine.runtime.location}/runtime-main.jar</destinationFile>-->
+<!--                                </fileSet>-->
+<!--                            </fileSets>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>

From f15dd0bcb710ed8215b20402c61739d3c292defd Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 25 Oct 2024 11:37:59 +1000
Subject: [PATCH 2/2] exclude not needed artifacts

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 applications/proberapp/pom.xml | 39 +---------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml
index 39f2e4fb..41d82182 100644
--- a/applications/proberapp/pom.xml
+++ b/applications/proberapp/pom.xml
@@ -223,6 +223,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
+                            <excludeArtifactIds>appengine-api-1.0-sdk,appengine-remote-api,appengine-api-stubs,appengine-testing</excludeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
                             <includeGroupIds>com.google.appengine</includeGroupIds>
                             <stripVersion>true</stripVersion>
@@ -231,44 +232,6 @@
                     </execution>
                 </executions>
             </plugin>
-<!--            <plugin>-->
-<!--                <groupId>com.coderplus.maven.plugins</groupId>-->
-<!--                <artifactId>copy-rename-maven-plugin</artifactId>-->
-<!--                <version>1.0.1</version>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>copy-file</id>-->
-<!--                        <phase>pre-integration-test</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>copy</goal>-->
-<!--                        </goals>-->
-<!--                        <configuration>-->
-<!--                              <fileSets>-->
-<!--                                <fileSet>-->
-<!--                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-impl-jetty9.jar</sourceFile>-->
-<!--                                    <destinationFile>${appengine.runtime.location}/runtime-impl-jetty9.jar</destinationFile>-->
-<!--                                </fileSet>-->
-<!--                                <fileSet>-->
-<!--                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-shared-jetty9.jar</sourceFile>-->
-<!--                                    <destinationFile>${appengine.runtime.location}/runtime-shared-jetty9.jar</destinationFile>-->
-<!--                                </fileSet>-->
-<!--                                <fileSet>-->
-<!--                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-impl-jetty12.jar</sourceFile>-->
-<!--                                    <destinationFile>${appengine.runtime.location}/runtime-impl-jetty12.jar</destinationFile>-->
-<!--                                </fileSet>-->
-<!--                                <fileSet>-->
-<!--                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-shared-jetty12.jar</sourceFile>-->
-<!--                                    <destinationFile>${appengine.runtime.location}/runtime-shared-jetty12.jar</destinationFile>-->
-<!--                                </fileSet>-->
-<!--                                <fileSet>-->
-<!--                                    <sourceFile>../../runtime/deployment/target/runtime-deployment-${project.version}/runtime-main.jar</sourceFile>-->
-<!--                                    <destinationFile>${appengine.runtime.location}/runtime-main.jar</destinationFile>-->
-<!--                                </fileSet>-->
-<!--                            </fileSets>-->
-<!--                        </configuration>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>