From 452a8e6dc4c6e56a3fc80fa8700c27eaec829f00 Mon Sep 17 00:00:00 2001
From: ShammiL <shammi0107@gmail.com>
Date: Wed, 14 Aug 2024 14:36:59 +0530
Subject: [PATCH] change 5 disable windows and skip ubuntu tests

---
 .github/workflows/all-tests.yml               | 62 +++++++++----------
 .../tests-integration/tests/pom.xml           |  2 +-
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/all-tests.yml b/.github/workflows/all-tests.yml
index e8924836ac..2331720435 100644
--- a/.github/workflows/all-tests.yml
+++ b/.github/workflows/all-tests.yml
@@ -3,9 +3,30 @@ name: All Tests ( openjdk8 )
 on: [push]
 
 jobs:
-#  Ubuntu:
+  Ubuntu:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: joschi/setup-jdk@v2
+        with:
+          distribution: 'adopt'
+          java-version: 11
+      - name: Set JAVA_TOOL_OPTIONS
+        run: |
+          NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED"
+          echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV
+      - name: Build with Maven
+        run: |
+          mvn -B clean install --file pom.xml -fae '-Dtest=!ODataETagTestCase#validateETagConcurrentHandlingTestCaseForDeleteMethod+validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod+validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPatchMethod'
+        env:
+          JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}
+
+#  MacOS:
 #
-#    runs-on: ubuntu-latest
+#    runs-on: macOS-latest
 #
 #    steps:
 #      - uses: actions/checkout@v2
@@ -24,11 +45,14 @@ jobs:
 #        env:
 #          JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}
 #
-#  MacOS:
+
+#  windows:
 #
-#    runs-on: macOS-latest
+#    runs-on: windows-latest
 #
 #    steps:
+#      - name: Support longpaths
+#        run: git config --system core.longpaths true
 #      - uses: actions/checkout@v2
 #      - name: Set up JDK 11
 #        uses: joschi/setup-jdk@v2
@@ -37,33 +61,9 @@ jobs:
 #          java-version: 11
 #      - name: Set JAVA_TOOL_OPTIONS
 #        run: |
-#          NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED"
-#          echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $GITHUB_ENV
+#          $NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED"
+#          echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $env:GITHUB_ENV
 #      - name: Build with Maven
-#        run: |
-#          mvn -B clean install --file pom.xml -fae
+#        run: mvn -B clean install --file pom.xml -fae
 #        env:
 #          JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}
-#
-
-  windows:
-
-    runs-on: windows-latest
-
-    steps:
-      - name: Support longpaths
-        run: git config --system core.longpaths true
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: joschi/setup-jdk@v2
-        with:
-          distribution: 'adopt'
-          java-version: 11
-      - name: Set JAVA_TOOL_OPTIONS
-        run: |
-          $NEW_JAVA_TOOL_OPTIONS="${{ env.JAVA_TOOL_OPTIONS }} -Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true --add-opens=java.base/java.net=ALL-UNNAMED"
-          echo "JAVA_TOOL_OPTIONS=$NEW_JAVA_TOOL_OPTIONS" >> $env:GITHUB_ENV
-      - name: Build with Maven
-        run: mvn -B clean install --file pom.xml -fae
-        env:
-          JAVA_TOOL_OPTIONS: ${{ env.JAVA_TOOL_OPTIONS }}
diff --git a/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml b/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml
index 15893db705..c13d34f68f 100644
--- a/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml
+++ b/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml
@@ -35,7 +35,7 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>false</inherited>
-                <version>2.12.4</version>
+                <version>2.22.2</version>
                 <configuration>
                     <!--<argLine>-Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
                     <argLine>-Xmx1024m</argLine>