From 133ead08deafde2c95bc27e16af267879a35a4f8 Mon Sep 17 00:00:00 2001
From: Jonathan Knight <jonathan.knight@oracle.com>
Date: Thu, 13 Jun 2024 10:36:39 -0500
Subject: [PATCH] COH-30304 Enable gRPC compatibility tests for CE builds
 (merge main -> ce/main 109554)

[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 109565]
---
 .github/maven/settings.xml                    | 31 +++++++++++++++++++
 .github/workflows/build-windows.yaml          |  5 +--
 .github/workflows/build.yaml                  |  5 +--
 .../grpc-compatibility/grpc-ce-22.06/pom.xml  |  1 -
 .../grpc-compatibility/grpc-ce-latest/pom.xml |  1 -
 .../grpc-compatibility/grpc-ce-main/pom.xml   |  1 -
 6 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/.github/maven/settings.xml b/.github/maven/settings.xml
index cd4437f8acd31..ab8de9c0de7db 100644
--- a/.github/maven/settings.xml
+++ b/.github/maven/settings.xml
@@ -12,4 +12,35 @@
     <activeProfile>default</activeProfile>
   </activeProfiles>
 
+  <profiles>
+    <profile>
+      <id>default</id>
+      <repositories>
+        <repository>
+          <id>central</id>
+          <name>Maven Central</name>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <url>https://repo.maven.apache.org/maven2/</url>
+          <layout>default</layout>
+        </repository>
+        <repository>
+          <id>sonatype</id>
+          <name>Sonatype Snapshots</name>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+          <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+          <layout>default</layout>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
 </settings>
diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml
index 3af35c5bd326d..48318a5039ab1 100644
--- a/.github/workflows/build-windows.yaml
+++ b/.github/workflows/build-windows.yaml
@@ -76,8 +76,9 @@ jobs:
       run: |
         echo "Building and running tests in ${{ matrix.stage }}"
         export DEV_ROOT=$(pwd)
-        mvn --file prj/pom.xml --batch-mode -U -e -s .github/maven/settings.xml -P-modules,${{ matrix.stage }} -Doptional -Dcoherence.SkipLargeMemoryTests=true clean install
-        mvn --file prj/pom.xml --batch-mode -e -s .github/maven/settings.xml -Pmodules,-coherence,${{ matrix.stage }} -nsu -Doptional -Dcoherence.SkipLargeMemoryTests=true clean install
+        export SETTINGS_XML=${DEV_ROOT}/.github/maven/settings.xml
+        mvn --file prj/pom.xml --batch-mode -U -e -s ${SETTINGS_XML} -P-modules,${{ matrix.stage }} -Doptional -Dcoherence.SkipLargeMemoryTests=true clean install
+        mvn --file prj/pom.xml --batch-mode -e -s ${SETTINGS_XML} -Pmodules,-coherence,${{ matrix.stage }} -nsu -Doptional -Dcoherence.SkipLargeMemoryTests=true -Dcoherence.compatability.settings=${SETTINGS_XML} clean install
 
     # Upload build artifacts for diagnosing failures
     - name: Build Artifacts test logs
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index be0f947239308..6d484241a018f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -77,8 +77,9 @@ jobs:
       run: |
         echo "Building and running tests in ${{ matrix.stage }}"
         export DEV_ROOT=$(pwd)
-        mvn --file prj/pom.xml --batch-mode -U -e -s .github/maven/settings.xml -P-modules,${{ matrix.stage }} -Doptional -Dcoherence.SkipLargeMemoryTests=true clean install
-        mvn --file prj/pom.xml --batch-mode -e -s .github/maven/settings.xml -Pmodules,-coherence,${{ matrix.stage }} -nsu -Doptional -Dcoherence.SkipLargeMemoryTests=true clean install
+        export SETTINGS_XML=${DEV_ROOT}/.github/maven/settings.xml
+        mvn --file prj/pom.xml --batch-mode -U -e -s ${SETTINGS_XML} -P-modules,${{ matrix.stage }} -Doptional -Dcoherence.SkipLargeMemoryTests=true clean install
+        mvn --file prj/pom.xml --batch-mode -e -s ${SETTINGS_XML} -Pmodules,-coherence,${{ matrix.stage }} -nsu -Doptional -Dcoherence.SkipLargeMemoryTests=true -Dcoherence.compatability.settings=${SETTINGS_XML} clean install
 
     # Upload build artifacts for diagnosing failures
     - name: Build Artifacts test logs
diff --git a/prj/test/distribution/grpc-compatibility/grpc-ce-22.06/pom.xml b/prj/test/distribution/grpc-compatibility/grpc-ce-22.06/pom.xml
index face9b1871c1c..0d24be53adfa5 100644
--- a/prj/test/distribution/grpc-compatibility/grpc-ce-22.06/pom.xml
+++ b/prj/test/distribution/grpc-compatibility/grpc-ce-22.06/pom.xml
@@ -33,7 +33,6 @@
 
         <coherence.compatability.minJavaVersion>11</coherence.compatability.minJavaVersion>
         <coherence.compatability.maxJavaVersion>21</coherence.compatability.maxJavaVersion>
-        <skipTests>true</skipTests>
     </properties>
 
     <dependencies>
diff --git a/prj/test/distribution/grpc-compatibility/grpc-ce-latest/pom.xml b/prj/test/distribution/grpc-compatibility/grpc-ce-latest/pom.xml
index 4c6e97581ea98..815fb89731944 100644
--- a/prj/test/distribution/grpc-compatibility/grpc-ce-latest/pom.xml
+++ b/prj/test/distribution/grpc-compatibility/grpc-ce-latest/pom.xml
@@ -33,7 +33,6 @@
 
         <coherence.compatability.minJavaVersion>17</coherence.compatability.minJavaVersion>
         <coherence.compatability.maxJavaVersion>21</coherence.compatability.maxJavaVersion>
-        <skipTests>true</skipTests>
     </properties>
 
     <dependencies>
diff --git a/prj/test/distribution/grpc-compatibility/grpc-ce-main/pom.xml b/prj/test/distribution/grpc-compatibility/grpc-ce-main/pom.xml
index c7136d8ad321f..8239844966f94 100644
--- a/prj/test/distribution/grpc-compatibility/grpc-ce-main/pom.xml
+++ b/prj/test/distribution/grpc-compatibility/grpc-ce-main/pom.xml
@@ -33,7 +33,6 @@
 
         <coherence.compatability.minJavaVersion>17</coherence.compatability.minJavaVersion>
         <coherence.compatability.maxJavaVersion/>
-        <skipTests>true</skipTests>
     </properties>
 
     <dependencies>