From c00e72f143c74f89dda00dce87e8b4e1e4f581cf Mon Sep 17 00:00:00 2001
From: Cheryl King <cheryllk@us.ibm.com>
Date: Thu, 23 Mar 2023 10:45:29 -0500
Subject: [PATCH] Added cleanLogs false for clean goal in integration tests

---
 .../pom.xml                                                    | 1 +
 .../pom.xml                                                    | 1 +
 .../src/it/appsdirectory-apps-configured-bootstraps-it/pom.xml | 1 +
 .../src/it/appsdirectory-apps-configured-it/pom.xml            | 1 +
 .../src/it/appsdirectory-apps-configured-variables-it/pom.xml  | 1 +
 .../it/appsdirectory-apps-dependency-notconfigured-it/pom.xml  | 1 +
 .../pom.xml                                                    | 1 +
 .../src/it/appsdirectory-apps-notconfigured-it/pom.xml         | 1 +
 .../src/it/appsdirectory-configdropins-it/pom.xml              | 1 +
 .../src/it/appsdirectory-dropins-notconfigured-it/pom.xml      | 1 +
 .../src/it/appsdirectory-include-configured-it/pom.xml         | 1 +
 .../src/it/appsdirectory-notset-configured-it/pom.xml          | 1 +
 .../src/it/appsdirectory-notset-notconfigured-it/pom.xml       | 1 +
 .../src/it/appsdirectory-set-appz-notconfigured-it/pom.xml     | 3 +++
 liberty-maven-plugin/src/it/basic-it/pom.xml                   | 1 +
 .../src/it/basic-runtime-properties-dependency-mgmt-it/pom.xml | 1 +
 .../src/it/basic-runtime-properties-override-it/pom.xml        | 1 +
 .../src/it/basic-runtime-properties-pom-override-it/pom.xml    | 1 +
 liberty-maven-plugin/src/it/compile-jsp-it/pom.xml             | 1 +
 liberty-maven-plugin/src/it/config-directory-it/pom.xml        | 1 +
 .../src/it/deploy-loose-config-apps-it/pom.xml                 | 1 +
 liberty-maven-plugin/src/it/deploy-loose-config-it/pom.xml     | 1 +
 liberty-maven-plugin/src/it/install-apps-project-it/pom.xml    | 1 +
 liberty-maven-plugin/src/it/loose-config-it/pom.xml            | 1 +
 liberty-maven-plugin/src/it/merge-server-env-it/pom.xml        | 1 +
 liberty-maven-plugin/src/it/merge-server-env-none-it/pom.xml   | 1 +
 26 files changed, 28 insertions(+)

diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-it/pom.xml
index cb2d35fae..43d543c30 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-it/pom.xml
@@ -121,6 +121,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-recursive-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-recursive-it/pom.xml
index c8560e3e0..49847274d 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-recursive-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-recursive-it/pom.xml
@@ -114,6 +114,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-it/pom.xml
index 9bb56a689..b19fc15ef 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-it/pom.xml
@@ -123,6 +123,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-it/pom.xml
index da1678754..5189558f7 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-it/pom.xml
@@ -138,6 +138,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-variables-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-variables-it/pom.xml
index 71b58ae56..2eedf9955 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-variables-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-variables-it/pom.xml
@@ -119,6 +119,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-dependency-notconfigured-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-apps-dependency-notconfigured-it/pom.xml
index 79fa0dc2b..eb6c98c3e 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-apps-dependency-notconfigured-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-apps-dependency-notconfigured-it/pom.xml
@@ -122,6 +122,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-dependency-configured-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-dependency-configured-it/pom.xml
index 9e09376cc..2e3d9a537 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-dependency-configured-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-dependency-configured-it/pom.xml
@@ -122,6 +122,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-it/pom.xml
index 6d46b3a64..46871d454 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-apps-notconfigured-it/pom.xml
@@ -116,6 +116,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-configdropins-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-configdropins-it/pom.xml
index 67e275ce6..d6bc46c9d 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-configdropins-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-configdropins-it/pom.xml
@@ -112,6 +112,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
        </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-dropins-notconfigured-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-dropins-notconfigured-it/pom.xml
index 68e7d6fed..06f50a489 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-dropins-notconfigured-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-dropins-notconfigured-it/pom.xml
@@ -138,6 +138,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-include-configured-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-include-configured-it/pom.xml
index eafb75c5d..b7d98f7e0 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-include-configured-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-include-configured-it/pom.xml
@@ -112,6 +112,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
        </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-notset-configured-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-notset-configured-it/pom.xml
index edc100e41..2cde52142 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-notset-configured-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-notset-configured-it/pom.xml
@@ -138,6 +138,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-notset-notconfigured-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-notset-notconfigured-it/pom.xml
index 8f67b4833..c3463143b 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-notset-notconfigured-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-notset-notconfigured-it/pom.xml
@@ -169,6 +169,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/appsdirectory-set-appz-notconfigured-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-set-appz-notconfigured-it/pom.xml
index 0a990c963..e02e76ba0 100644
--- a/liberty-maven-plugin/src/it/appsdirectory-set-appz-notconfigured-it/pom.xml
+++ b/liberty-maven-plugin/src/it/appsdirectory-set-appz-notconfigured-it/pom.xml
@@ -89,6 +89,9 @@
                         <goals>
                             <goal>clean</goal>
                         </goals>
+                        <configuration>
+                            <cleanLogs>false</cleanLogs>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/liberty-maven-plugin/src/it/basic-it/pom.xml b/liberty-maven-plugin/src/it/basic-it/pom.xml
index 3c2d1acac..b5078d670 100644
--- a/liberty-maven-plugin/src/it/basic-it/pom.xml
+++ b/liberty-maven-plugin/src/it/basic-it/pom.xml
@@ -152,6 +152,7 @@
                         <configuration>
                             <cleanDropins>true</cleanDropins>
                             <cleanApps>true</cleanApps>
+                            <cleanLogs>false</cleanLogs>
                             <!-- Temporarily set this to false due to ci.ant issue 131 -->
                             <cleanWorkarea>false</cleanWorkarea>
                         </configuration>
diff --git a/liberty-maven-plugin/src/it/basic-runtime-properties-dependency-mgmt-it/pom.xml b/liberty-maven-plugin/src/it/basic-runtime-properties-dependency-mgmt-it/pom.xml
index c9e8784f4..97c9c25e8 100644
--- a/liberty-maven-plugin/src/it/basic-runtime-properties-dependency-mgmt-it/pom.xml
+++ b/liberty-maven-plugin/src/it/basic-runtime-properties-dependency-mgmt-it/pom.xml
@@ -103,6 +103,7 @@
                         <configuration>
                             <cleanDropins>true</cleanDropins>
                             <cleanApps>true</cleanApps>
+                            <cleanLogs>false</cleanLogs>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/liberty-maven-plugin/src/it/basic-runtime-properties-override-it/pom.xml b/liberty-maven-plugin/src/it/basic-runtime-properties-override-it/pom.xml
index d7eb33a66..c8da9cb66 100644
--- a/liberty-maven-plugin/src/it/basic-runtime-properties-override-it/pom.xml
+++ b/liberty-maven-plugin/src/it/basic-runtime-properties-override-it/pom.xml
@@ -92,6 +92,7 @@
                         <configuration>
                             <cleanDropins>true</cleanDropins>
                             <cleanApps>true</cleanApps>
+                            <cleanLogs>false</cleanLogs>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/liberty-maven-plugin/src/it/basic-runtime-properties-pom-override-it/pom.xml b/liberty-maven-plugin/src/it/basic-runtime-properties-pom-override-it/pom.xml
index 49311c9a4..7e860c465 100644
--- a/liberty-maven-plugin/src/it/basic-runtime-properties-pom-override-it/pom.xml
+++ b/liberty-maven-plugin/src/it/basic-runtime-properties-pom-override-it/pom.xml
@@ -98,6 +98,7 @@
                         <configuration>
                             <cleanDropins>true</cleanDropins>
                             <cleanApps>true</cleanApps>
+                            <cleanLogs>false</cleanLogs>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/liberty-maven-plugin/src/it/compile-jsp-it/pom.xml b/liberty-maven-plugin/src/it/compile-jsp-it/pom.xml
index 8d0d63066..b18c1a0e4 100644
--- a/liberty-maven-plugin/src/it/compile-jsp-it/pom.xml
+++ b/liberty-maven-plugin/src/it/compile-jsp-it/pom.xml
@@ -132,6 +132,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/config-directory-it/pom.xml b/liberty-maven-plugin/src/it/config-directory-it/pom.xml
index 77b1f190e..d6fbc0a85 100644
--- a/liberty-maven-plugin/src/it/config-directory-it/pom.xml
+++ b/liberty-maven-plugin/src/it/config-directory-it/pom.xml
@@ -101,6 +101,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/deploy-loose-config-apps-it/pom.xml b/liberty-maven-plugin/src/it/deploy-loose-config-apps-it/pom.xml
index e87d3edb6..b0b781c7e 100644
--- a/liberty-maven-plugin/src/it/deploy-loose-config-apps-it/pom.xml
+++ b/liberty-maven-plugin/src/it/deploy-loose-config-apps-it/pom.xml
@@ -124,6 +124,7 @@
                         <configuration>
                             <cleanDropins>true</cleanDropins>
                             <cleanApps>true</cleanApps>
+                            <cleanLogs>false</cleanLogs>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/liberty-maven-plugin/src/it/deploy-loose-config-it/pom.xml b/liberty-maven-plugin/src/it/deploy-loose-config-it/pom.xml
index 9b4744cb4..211c4fa0a 100644
--- a/liberty-maven-plugin/src/it/deploy-loose-config-it/pom.xml
+++ b/liberty-maven-plugin/src/it/deploy-loose-config-it/pom.xml
@@ -114,6 +114,7 @@
                         <configuration>
                             <cleanDropins>true</cleanDropins>
                             <cleanApps>true</cleanApps>
+                            <cleanLogs>false</cleanLogs>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/liberty-maven-plugin/src/it/install-apps-project-it/pom.xml b/liberty-maven-plugin/src/it/install-apps-project-it/pom.xml
index 6c4580e74..780596425 100644
--- a/liberty-maven-plugin/src/it/install-apps-project-it/pom.xml
+++ b/liberty-maven-plugin/src/it/install-apps-project-it/pom.xml
@@ -130,6 +130,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/loose-config-it/pom.xml b/liberty-maven-plugin/src/it/loose-config-it/pom.xml
index adbf8c2d9..6f4fde6e0 100644
--- a/liberty-maven-plugin/src/it/loose-config-it/pom.xml
+++ b/liberty-maven-plugin/src/it/loose-config-it/pom.xml
@@ -125,6 +125,7 @@
                         <configuration>
                             <cleanDropins>true</cleanDropins>
                             <cleanApps>true</cleanApps>
+                            <cleanLogs>false</cleanLogs>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/liberty-maven-plugin/src/it/merge-server-env-it/pom.xml b/liberty-maven-plugin/src/it/merge-server-env-it/pom.xml
index 9b48d7e59..a198f47a3 100644
--- a/liberty-maven-plugin/src/it/merge-server-env-it/pom.xml
+++ b/liberty-maven-plugin/src/it/merge-server-env-it/pom.xml
@@ -134,6 +134,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>
diff --git a/liberty-maven-plugin/src/it/merge-server-env-none-it/pom.xml b/liberty-maven-plugin/src/it/merge-server-env-none-it/pom.xml
index 37fcc5f38..4a013e2eb 100644
--- a/liberty-maven-plugin/src/it/merge-server-env-none-it/pom.xml
+++ b/liberty-maven-plugin/src/it/merge-server-env-none-it/pom.xml
@@ -126,6 +126,7 @@
                 <configuration>
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
+                    <cleanLogs>false</cleanLogs>
                 </configuration>
             </execution>
          </executions>