From 9d4cd9bff25c1621d6e36ce3ed47de0ccf498714 Mon Sep 17 00:00:00 2001
From: Cheryl King <cheryllk@us.ibm.com>
Date: Tue, 16 Jul 2024 21:18:55 -0500
Subject: [PATCH] undo yaml and pom changes

---
 .github/workflows/maven.yml  | 5 ++---
 liberty-maven-plugin/pom.xml | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 79bf2b809..c15afc6d2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -48,8 +48,7 @@ jobs:
     - name: Checkout ci.common
       uses: actions/checkout@v3
       with:
-        repository: cherylking/ci.common
-        ref: skipTestsChanges
+        repository: OpenLiberty/ci.common
         path: ci.common
     - name: Checkout ci.ant
       uses: actions/checkout@v3
@@ -103,7 +102,7 @@ jobs:
     - 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/cherylking/ci.common.git --branch skipTestsChanges --single-branch C:/ci.common
+        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
       uses: stCarolas/setup-maven@v4.5
diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml
index a2073905f..0dbb48850 100644
--- a/liberty-maven-plugin/pom.xml
+++ b/liberty-maven-plugin/pom.xml
@@ -226,7 +226,6 @@
                                     <pomExclude>springboot-3-tests/pom.xml</pomExclude>
                                     <pomExclude>dev-container-it/pom.xml</pomExclude>
                                     <pomExclude>compile-jsp-source-17-it/pom.xml</pomExclude>
-                                    <pomExclude>verify-user-feature-it/pom.xml</pomExclude>
                                 </pomExcludes>
                             </configuration>
                         </plugin>
@@ -269,7 +268,6 @@
                                     <pomExclude>springboot-3-tests/pom.xml</pomExclude>
                                     <pomExclude>dev-container-it/pom.xml</pomExclude>
                                     <pomExclude>compile-jsp-source-17-it/pom.xml</pomExclude>
-                                    <pomExclude>verify-user-feature-it/pom.xml</pomExclude>
                                 </pomExcludes>
                             </configuration>
                         </plugin>
@@ -311,7 +309,6 @@
                                     <pomExclude>binary-scanner-it/pom.xml</pomExclude>
                                     <pomExclude>springboot-3-tests/pom.xml</pomExclude>
                                     <pomExclude>compile-jsp-source-17-it/pom.xml</pomExclude>
-                                    <pomExclude>verify-user-feature-it/pom.xml</pomExclude>
                                 </pomExcludes>
                             </configuration>
                         </plugin>
@@ -358,7 +355,6 @@
                                     <pomExclude>binary-scanner-it/pom.xml</pomExclude>
                                     <pomExclude>springboot-3-tests/pom.xml</pomExclude>
                                     <pomExclude>compile-jsp-source-17-it/pom.xml</pomExclude>
-                                    <pomExclude>verify-user-feature-it/pom.xml</pomExclude>
                                 </pomExcludes>
                             </configuration>
                         </plugin>