diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 0817aeb1c..de27df153 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -60,12 +60,6 @@ jobs:
uses: stCarolas/setup-maven@v4.5
with:
maven-version: 3.9.2
- - name: Cache maven packages
- uses: actions/cache@v3
- with:
- path: ~/.m2
- key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-m2
# Install dependencies
- name: Install ci.ant and ci.common
run: |
@@ -107,12 +101,6 @@ jobs:
cp -r D:/a/ci.maven/ci.maven C:/ci.maven
git clone https://github.com/cherylking/ci.common.git --branch addSkipInstallFeature --single-branch C:/ci.common
git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant
- - name: Cache maven packages
- uses: actions/cache@v3
- with:
- path: ~/.m2
- key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-m2
- name: Set up Maven
uses: stCarolas/setup-maven@v4.5
with:
diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml
index b539018ac..442d00c62 100644
--- a/liberty-maven-plugin/pom.xml
+++ b/liberty-maven-plugin/pom.xml
@@ -182,6 +182,7 @@
true
-Dfile.encoding=UTF-8
+ cleanTest
diff --git a/liberty-maven-plugin/src/it/binary-scanner-it/pom.xml b/liberty-maven-plugin/src/it/binary-scanner-it/pom.xml
index 63b51521d..d701ce0e9 100755
--- a/liberty-maven-plugin/src/it/binary-scanner-it/pom.xml
+++ b/liberty-maven-plugin/src/it/binary-scanner-it/pom.xml
@@ -3,9 +3,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- io.openliberty.tools.it
+
+ io.openliberty.tools.it
+ tests
+ 1.0-SNAPSHOT
+
+
binary-scanner-it
- 1.1
jar
diff --git a/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/deploy-app/pom.xml b/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/deploy-app/pom.xml
index ffe27bf0a..0f95019d8 100644
--- a/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/deploy-app/pom.xml
+++ b/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/deploy-app/pom.xml
@@ -7,7 +7,7 @@
io.openliberty.tools.it
multi-module-package-it
- 1.0
+ 1.0-SNAPSHOT
my-war
diff --git a/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/make-package/pom.xml b/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/make-package/pom.xml
index f1591f9b0..3a4ff8cf7 100644
--- a/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/make-package/pom.xml
+++ b/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/make-package/pom.xml
@@ -6,7 +6,7 @@
io.openliberty.tools.it
multi-module-package-it
- 1.0
+ 1.0-SNAPSHOT
io.openliberty.tools.it
diff --git a/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/pom.xml b/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/pom.xml
index 15f49e4c2..fd8c17c8c 100644
--- a/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/pom.xml
+++ b/liberty-maven-plugin/src/it/config-packagefile-multi-module-runnable-it/pom.xml
@@ -3,9 +3,14 @@
4.0.0
- io.openliberty.tools.it
+
+ io.openliberty.tools.it
+ tests
+ 1.0-SNAPSHOT
+
+
multi-module-package-it
- 1.0
+ 1.0-SNAPSHOT
pom
Deploy app on Liberty and package server
diff --git a/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/pom.xml b/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/pom.xml
index a61490f79..e8fc019cc 100644
--- a/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/pom.xml
+++ b/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/pom.xml
@@ -79,7 +79,7 @@
stop-server-before-clean
pre-clean
- stop-server
+ stop
diff --git a/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/pom.xml b/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/pom.xml
index 36517a6d7..3adfaf0ae 100644
--- a/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/pom.xml
+++ b/liberty-maven-plugin/src/it/ear-project-it/SampleEAR/pom.xml
@@ -97,7 +97,7 @@
stop-server-before-clean
pre-clean
- stop-server
+ stop
diff --git a/liberty-maven-plugin/src/it/ear-project-it/SampleEar_NonLooseApp/pom.xml b/liberty-maven-plugin/src/it/ear-project-it/SampleEar_NonLooseApp/pom.xml
index 1d2041dfe..d82dcddd1 100644
--- a/liberty-maven-plugin/src/it/ear-project-it/SampleEar_NonLooseApp/pom.xml
+++ b/liberty-maven-plugin/src/it/ear-project-it/SampleEar_NonLooseApp/pom.xml
@@ -97,7 +97,7 @@
stop-server-before-clean
pre-clean
- stop-server
+ stop
diff --git a/liberty-maven-plugin/src/it/ear-project-it/helloworld-ear/pom.xml b/liberty-maven-plugin/src/it/ear-project-it/helloworld-ear/pom.xml
index 4a379e955..bc8a0ecd4 100644
--- a/liberty-maven-plugin/src/it/ear-project-it/helloworld-ear/pom.xml
+++ b/liberty-maven-plugin/src/it/ear-project-it/helloworld-ear/pom.xml
@@ -61,7 +61,7 @@
stop-server-before-clean
pre-clean
- stop-server
+ stop
diff --git a/liberty-maven-plugin/src/it/generate-features-it/pom.xml b/liberty-maven-plugin/src/it/generate-features-it/pom.xml
index 823ed94ab..e23f8f498 100755
--- a/liberty-maven-plugin/src/it/generate-features-it/pom.xml
+++ b/liberty-maven-plugin/src/it/generate-features-it/pom.xml
@@ -3,9 +3,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- io.openliberty.tools.it
+
+ io.openliberty.tools.it
+ tests
+ 1.0-SNAPSHOT
+
+
generate-features-it
- 1.0-SNAPSHOT
jar
diff --git a/liberty-maven-plugin/src/it/generate-features-it/resources/restful/pom.xml b/liberty-maven-plugin/src/it/generate-features-it/resources/restful/pom.xml
index 454264030..7e70a6ca3 100644
--- a/liberty-maven-plugin/src/it/generate-features-it/resources/restful/pom.xml
+++ b/liberty-maven-plugin/src/it/generate-features-it/resources/restful/pom.xml
@@ -202,7 +202,7 @@
stop-server
post-integration-test
- stop-server
+ stop
diff --git a/liberty-maven-plugin/src/it/loose-war-ejb-it/pom.xml b/liberty-maven-plugin/src/it/loose-war-ejb-it/pom.xml
index 7c57a492d..274bf32ef 100644
--- a/liberty-maven-plugin/src/it/loose-war-ejb-it/pom.xml
+++ b/liberty-maven-plugin/src/it/loose-war-ejb-it/pom.xml
@@ -3,9 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- io.openliberty.tools.it
+
+ io.openliberty.tools.it
+ tests
+ 1.0-SNAPSHOT
+
+
ejb-war-test
- 1.0-SNAPSHOT
pom
4.0.0
diff --git a/liberty-maven-plugin/src/it/loose-war-ejb-type-it/pom.xml b/liberty-maven-plugin/src/it/loose-war-ejb-type-it/pom.xml
index 3510466c5..9c4d64ab3 100644
--- a/liberty-maven-plugin/src/it/loose-war-ejb-type-it/pom.xml
+++ b/liberty-maven-plugin/src/it/loose-war-ejb-type-it/pom.xml
@@ -3,9 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- io.openliberty.tools.it
+
+ io.openliberty.tools.it
+ tests
+ 1.0-SNAPSHOT
+
+
ejb-type-war-test
- 1.0-SNAPSHOT
pom
4.0.0
diff --git a/liberty-maven-plugin/src/it/server-param-configdir-not-override-it/pom.xml b/liberty-maven-plugin/src/it/server-param-configdir-not-override-it/pom.xml
index fbab394b7..224ed990d 100644
--- a/liberty-maven-plugin/src/it/server-param-configdir-not-override-it/pom.xml
+++ b/liberty-maven-plugin/src/it/server-param-configdir-not-override-it/pom.xml
@@ -84,7 +84,7 @@
stop-server-before-clean
pre-clean
- stop-server
+ stop
diff --git a/liberty-maven-plugin/src/it/server-param-default-it/pom.xml b/liberty-maven-plugin/src/it/server-param-default-it/pom.xml
index 52b275c37..2fae258ec 100644
--- a/liberty-maven-plugin/src/it/server-param-default-it/pom.xml
+++ b/liberty-maven-plugin/src/it/server-param-default-it/pom.xml
@@ -126,7 +126,7 @@
stop-server-before-clean
pre-clean
- stop-server
+ stop
diff --git a/liberty-maven-plugin/src/it/setup/test-parent/pom.xml b/liberty-maven-plugin/src/it/setup/test-parent/pom.xml
index 93c2dfcf2..4c3252059 100644
--- a/liberty-maven-plugin/src/it/setup/test-parent/pom.xml
+++ b/liberty-maven-plugin/src/it/setup/test-parent/pom.xml
@@ -14,6 +14,43 @@
1.7
1.7
-
-
+
+
+ test-cleanup
+
+
+ unix
+
+
+
+
+
+ maven-resources-plugin
+ 3.3.1
+
+
+ copy-resources
+ process-test-resources
+
+ copy-resources
+
+
+ ${basedir}
+
+
+
+
+ ../../../src/test/resources
+ true
+
+
+
+
+
+
+
+
+
+
+
diff --git a/liberty-maven-plugin/src/it/springboot-tests/pom.xml b/liberty-maven-plugin/src/it/springboot-tests/pom.xml
index 790f45cf5..4a30270ef 100644
--- a/liberty-maven-plugin/src/it/springboot-tests/pom.xml
+++ b/liberty-maven-plugin/src/it/springboot-tests/pom.xml
@@ -1,26 +1,30 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- 4.0.0
+ 4.0.0
- io.openliberty.tools.it
- springboot-tests
- pom
- 1.0-SNAPSHOT
+
+ io.openliberty.tools.it
+ tests
+ 1.0-SNAPSHOT
+
-
- UTF-8
- UTF-8
- 1.7
- 1.7
-
+ springboot-tests
+ pom
-
- springboot-appsdirectory-apps-it
- springboot-appsdirectory-dropins-it
-
+
+ UTF-8
+ UTF-8
+ 1.7
+ 1.7
+
+
+
+ springboot-appsdirectory-apps-it
+ springboot-appsdirectory-dropins-it
+
\ No newline at end of file
diff --git a/liberty-maven-plugin/src/it/springboot-tests/springboot-appsdirectory-apps-it/pom.xml b/liberty-maven-plugin/src/it/springboot-tests/springboot-appsdirectory-apps-it/pom.xml
index 38db0310c..40765b260 100644
--- a/liberty-maven-plugin/src/it/springboot-tests/springboot-appsdirectory-apps-it/pom.xml
+++ b/liberty-maven-plugin/src/it/springboot-tests/springboot-appsdirectory-apps-it/pom.xml
@@ -93,7 +93,7 @@
stop-server-before-clean
pre-clean
- stop-server
+ stop
diff --git a/liberty-maven-plugin/src/it/springboot-tests/springboot-appsdirectory-dropins-it/pom.xml b/liberty-maven-plugin/src/it/springboot-tests/springboot-appsdirectory-dropins-it/pom.xml
index 38e7b1fe5..2b1378bce 100644
--- a/liberty-maven-plugin/src/it/springboot-tests/springboot-appsdirectory-dropins-it/pom.xml
+++ b/liberty-maven-plugin/src/it/springboot-tests/springboot-appsdirectory-dropins-it/pom.xml
@@ -89,7 +89,7 @@
stop-server-before-clean
pre-clean
- stop-server
+ stop
diff --git a/liberty-maven-plugin/src/test/resources/cleanTest.bsh b/liberty-maven-plugin/src/test/resources/cleanTest.bsh
new file mode 100644
index 000000000..c9b4b7ff8
--- /dev/null
+++ b/liberty-maven-plugin/src/test/resources/cleanTest.bsh
@@ -0,0 +1,4 @@
+//Runs clean in the test project directory
+Runtime.getRuntime().exec("../../../../mvnw clean", null, basedir);
+System.out.println("Cleaned target dir(s) for " + basedir);
+return true;
\ No newline at end of file