Merge pull request #1899 from cherylking/prep3114release

Use 1.8.38 ci.common release

Author: cherylking

.github/workflows/maven.yml

@@ -101,7 +101,6 @@ jobs:
     # Move and cloning to C: drive for Windows for more disk space
     - name: Clone ci.ant, ci.common, ci.maven repos to C drive
       run: |
-        cp -r D:/a/ci.maven/ci.maven C:/ci.maven
         git clone https://github.com/OpenLiberty/ci.common.git C:/ci.common 
         git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant
     - name: Set up Maven
@@ -118,9 +117,10 @@ jobs:
       run: .\mvnw.cmd -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -DskipTests
     # Run tests that require a minimum of Java 17 or later
     - name: Run tests that require a minimum of Java 17 or later
+      working-directory: C:/a/ci.maven/ci.maven
       if: ${{ matrix.java == '17' || matrix.java == '21'}}
       run: .\mvnw.cmd -V verify -Ponline-its --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -D"invoker.streamLogsOnFailures"=true -D"invoker.test"="*setup*,*springboot-3-*,*compile-jsp-source-17-*" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}"
     # Run tests
     - name: Run tests
-      working-directory: C:/ci.maven
+      working-directory: C:/a/ci.maven/ci.maven
       run: .\mvnw.cmd -V verify -Ponline-its --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -D"invoker.streamLogsOnFailures"=true -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}"

liberty-maven-plugin/pom.xml

@@ -88,7 +88,7 @@
         <dependency>
             <groupId>io.openliberty.tools</groupId>
             <artifactId>ci.common</artifactId>
-            <version>1.8.38-SNAPSHOT</version>
+            <version>1.8.38</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

liberty-maven-plugin/src/it/verify-user-feature-it/src/test/java/net/wasdev/wlp/test/feature/it/VerifyUsrFeatureTest.java

@@ -34,7 +34,7 @@
 public class VerifyUsrFeatureTest {
 
 	static File mavenLocalRepo = new File(System.getProperty("user.home")+ "/.m2/repository");
-	static File userTestRepo = new File(mavenLocalRepo, "test/user/test/features");
+	static File userTestRepo = new File(mavenLocalRepo, "test/user/test/osgi");
 
 	Logger logger = Logger.getLogger(VerifyUsrFeatureTest.class.getName());
 

liberty-maven-plugin/src/test/resources/cleanTest.bsh

@@ -10,6 +10,11 @@ if (basedir.getName().contains("springboot-3-appsdirectory-apps-fail-")) {
     System.out.println("Running post-build script: "+ errorScript);
     flag = source(errorScript);
 }
+if (basedir.getName().contains("verify-user-feature-it")) {
+    String postScript = new File(basedir, "deleteMavenTestRepo.bsh").getAbsolutePath();
+    System.out.println("Running post-build script: "+ postScript);
+    source(postScript);
+}
 //Runs clean in the test project directory
 Runtime.getRuntime().exec("../../../../mvnw clean", null, basedir);
 System.out.println("Cleaned target dir(s) for " + basedir);

liberty-maven-plugin/src/test/resources/deleteMavenTestRepo.bsh

@@ -0,0 +1,33 @@
+import java.io.File;
+
+public static boolean deleteFolder(File directory) {
+		if (directory.isDirectory()) {
+				File[] files = directory.listFiles();
+				if (null != files) {
+					for (File file : files) {
+						if (file.isDirectory()) {
+							deleteFolder(file);
+						} else {
+							if (!file.delete()) {
+									file.deleteOnExit();
+							}
+						}
+					}
+				}
+		}
+		if(!directory.delete()){
+				directory.deleteOnExit();
+				return false;
+		}
+		return true;
+	}
+
+File repo = new File(System.getProperty("user.home") + "/.m2/repository/test/user/test/osgi");
+
+if (repo.exists()) {
+    System.out.println("Deleting Maven local test repository at: " + repo.getAbsolutePath());
+    deleteFolder(repo);
+    System.out.println("Test repository deleted successfully.");
+} else {
+    System.out.println("Test repository directory does not exist.");
+}