From 74fe482e7dc6d4663e08fa9756b7e76ed58c93a4 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Fri, 1 Nov 2024 17:05:53 -0400
Subject: [PATCH] Modify test file to force workflow to build and test DO NOT
 MERGE

---
 .github/workflows/spi_release.yml | 14 +++++++-------
 conf/solr/update-fields.sh        |  1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/spi_release.yml b/.github/workflows/spi_release.yml
index 6398edca412..8ad74b3e4bb 100644
--- a/.github/workflows/spi_release.yml
+++ b/.github/workflows/spi_release.yml
@@ -37,15 +37,15 @@ jobs:
         runs-on: ubuntu-latest
         if: github.event_name == 'pull_request' && needs.check-secrets.outputs.available == 'true'
         steps:
-            - uses: actions/checkout@v4
-            - uses: actions/setup-java@v4
+            - uses: actions/checkout@v3
+            - uses: actions/setup-java@v3
               with:
                   java-version: '17'
                   distribution: 'adopt'
                   server-id: ossrh
                   server-username: MAVEN_USERNAME
                   server-password: MAVEN_PASSWORD
-            - uses: actions/cache@v4
+            - uses: actions/cache@v2
               with:
                   path: ~/.m2
                   key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -63,12 +63,12 @@ jobs:
         runs-on: ubuntu-latest
         if: github.event_name == 'push' && needs.check-secrets.outputs.available == 'true'
         steps:
-            -   uses: actions/checkout@v4
-            -   uses: actions/setup-java@v4
+            -   uses: actions/checkout@v3
+            -   uses: actions/setup-java@v3
                 with:
                     java-version: '17'
                     distribution: 'adopt'
-            -   uses: actions/cache@v4
+            -   uses: actions/cache@v2
                 with:
                     path: ~/.m2
                     key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -76,7 +76,7 @@ jobs:
 
             # Running setup-java again overwrites the settings.xml - IT'S MANDATORY TO DO THIS SECOND SETUP!!!
             -   name: Set up Maven Central Repository
-                uses: actions/setup-java@v4
+                uses: actions/setup-java@v3
                 with:
                     java-version: '17'
                     distribution: 'adopt'
diff --git a/conf/solr/update-fields.sh b/conf/solr/update-fields.sh
index 5c896a98a04..386c1ee4e87 100755
--- a/conf/solr/update-fields.sh
+++ b/conf/solr/update-fields.sh
@@ -22,7 +22,6 @@ COPY_FIELDS=""
 TRIGGER_CHAIN=0
 ED_DELETE_FIELDS="'a+,'b-d"
 ED_DELETE_COPYFIELDS="'a+,'b-d"
-FAKEDONOTMERGE=0
 
 SOLR_SCHEMA_FIELD_BEGIN_MARK="SCHEMA-FIELDS::BEGIN"
 SOLR_SCHEMA_FIELD_END_MARK="SCHEMA-FIELDS::END"