From 29183cddbf110b2dffae25cca9100866478c94e9 Mon Sep 17 00:00:00 2001
From: Steven Massaro <steven.massaro.web@gmail.com>
Date: Fri, 28 Jul 2023 09:53:28 -0700
Subject: [PATCH] Revert "test functional tests with recent commits reverted
 (#4555)" (DAT-14615) (#4563)

Revert "test functional tests with recent commits reverted (#4555)"

This reverts commit e5df0d967e7ed0a264bbd8732b61a1ed86f1d4c9.
---
 .github/workflows/build-branch.yml      |  2 +-
 .github/workflows/build-main.yml        |  4 ++--
 .github/workflows/release-published.yml |  4 ++--
 liquibase-dist/pom.xml                  | 10 +++++-----
 pom.xml                                 | 10 +++++-----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-branch.yml b/.github/workflows/build-branch.yml
index f96e8e3ca86..05af46ae311 100644
--- a/.github/workflows/build-branch.yml
+++ b/.github/workflows/build-branch.yml
@@ -23,7 +23,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'maven'
-          server-id: github
+          server-id: liquibase
       - name: Set up Maven
         uses: stCarolas/setup-maven@v4.5
         with:
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index b16e0ff5640..3cb99c33062 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@@ -27,7 +27,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'maven'
-          server-id: github
+          server-id: liquibase
       - name: Set up Maven
         uses: stCarolas/setup-maven@v4.5
         with:
@@ -59,7 +59,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'maven'
-          server-id: github
+          server-id: liquibase
       - name: Set up Maven
         uses: stCarolas/setup-maven@v4.5
         with:
diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml
index b36277e4854..5ca8f5e5423 100644
--- a/.github/workflows/release-published.yml
+++ b/.github/workflows/release-published.yml
@@ -251,7 +251,7 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
           cache: 'maven'
-          server-id: github
+          server-id: liquibase
       - name: Set up Maven
         uses: stCarolas/setup-maven@v4.5
         with:
@@ -265,7 +265,7 @@ jobs:
         run: mvn -B clean deploy -DskipTests=true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TARGET_ARTIFACT_REPOSITORY: github
+          TARGET_ARTIFACT_REPOSITORY: liquibase
 
   deploy_xsd:
       name: Upload xsds
diff --git a/liquibase-dist/pom.xml b/liquibase-dist/pom.xml
index 6c82210ac33..f207a6d3613 100644
--- a/liquibase-dist/pom.xml
+++ b/liquibase-dist/pom.xml
@@ -15,15 +15,15 @@
 
 	<repositories>
 		<repository>
-			<id>github</id>
-			<url>https://liquibot:${env.GITHUB_TOKEN}@maven.pkg.github.com/liquibase/liquibase</url>
+			<id>liquibase</id>
+			<url>https://maven.pkg.github.com/liquibase/liquibase</url>
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
 		</repository>
 		<repository>
 			<id>liquibase-pro</id>
-			<url>https://liquibot:${env.GITHUB_TOKEN}@maven.pkg.github.com/liquibase/liquibase-pro</url>
+			<url>https://maven.pkg.github.com/liquibase/liquibase-pro</url>
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
@@ -31,8 +31,8 @@
 	</repositories>
 
 	<properties>
-		<deploy.repositoryId>github</deploy.repositoryId>
-		<deploy.url>https://liquibot:${env.GITHUB_TOKEN}@maven.pkg.github.com/liquibase/liquibase</deploy.url>
+		<deploy.repositoryId>liquibase</deploy.repositoryId>
+		<deploy.url>https://maven.pkg.github.com/liquibase/liquibase</deploy.url>
 		<h2.version>2.1.214</h2.version>
 		<hsqldb.version>2.7.2</hsqldb.version>
 		<postgresql.version>42.6.0</postgresql.version>
diff --git a/pom.xml b/pom.xml
index 4f911434da1..8691a279d29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,15 +55,15 @@
 
     <repositories>
         <repository>
-            <id>github</id>
-            <url>https://liquibot:${env.GITHUB_TOKEN}@maven.pkg.github.com/liquibase/liquibase</url>
+            <id>liquibase</id>
+            <url>https://maven.pkg.github.com/liquibase/liquibase</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
         </repository>
         <repository>
             <id>liquibase-pro</id>
-            <url>https://liquibot:${env.GITHUB_TOKEN}@maven.pkg.github.com/liquibase/liquibase-pro</url>
+            <url>https://maven.pkg.github.com/liquibase/liquibase-pro</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -96,9 +96,9 @@
 
     <distributionManagement>
         <repository>
-            <id>github</id>
+            <id>liquibase</id>
             <name>GitHub Packages</name>
-            <url>https://liquibot:${env.GITHUB_TOKEN}@maven.pkg.github.com/liquibase/liquibase</url>
+            <url>https://maven.pkg.github.com/liquibase/liquibase</url>
         </repository>
     </distributionManagement>