From 8bba51290484da05604861c2f5ae3f240423cfec Mon Sep 17 00:00:00 2001
From: Roberto Cortez <radcortez@yahoo.com>
Date: Wed, 14 Feb 2024 14:33:35 +0000
Subject: [PATCH] Move to Java 17 and Quarkus 3.7.2 (#137)

---
 .github/dependabot.yml                         |  8 +++++++-
 .github/workflows/build.yml                    | 18 ++++++------------
 .github/workflows/release.yml                  |  4 ++--
 .../META-INF/microprofile-config.properties    |  2 ++
 pom.xml                                        |  4 ++--
 tck/fault-tolerance/pom.xml                    |  1 +
 .../src/test/resources/exclusions.txt          | 11 +++++++++++
 tck/jsonb/pom.xml                              |  3 +++
 8 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 tck/fault-tolerance/src/test/resources/exclusions.txt

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2223769..1f4f7f6 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,4 +3,10 @@ updates:
   - package-ecosystem: maven
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: daily
+    open-pull-requests-limit: 10
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 048b6b3..aeb1da3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,21 +19,15 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+    - uses: actions/setup-java@v4
+      name: Set up JDK 17
       with:
-        java-version: 11
-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
+        distribution: 'temurin'
+        java-version: 17
+        cache: 'maven'
+        cache-dependency-path: '**/pom.xml'
 
     - name: Build with Maven
       run: |
         mvn -version
         mvn formatter:validate verify --file pom.xml
-
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 57ceb0d..a7d952e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,11 +30,11 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: 'maven'
           server-id: ossrh
           server-username: MAVEN_USERNAME
diff --git a/platform/runtime/src/main/resources/META-INF/microprofile-config.properties b/platform/runtime/src/main/resources/META-INF/microprofile-config.properties
index bbd44d9..80cb6af 100644
--- a/platform/runtime/src/main/resources/META-INF/microprofile-config.properties
+++ b/platform/runtime/src/main/resources/META-INF/microprofile-config.properties
@@ -18,6 +18,8 @@ quarkus.smallrye-openapi.auto-add-tags=false
 
 # Fault Tolerance
 smallrye.faulttolerance.mp-compatibility=true
+MP_Fault_Tolerance_NonFallback_Enabled=true
+MP_Fault_Tolerance_Metrics_Enabled=true
 
 # MP Telemetry is disabled by default
 quarkus.otel.sdk.disabled=true
diff --git a/pom.xml b/pom.xml
index 72b6002..647bbca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.quarkiverse</groupId>
     <artifactId>quarkiverse-parent</artifactId>
-    <version>15</version>
+    <version>16</version>
   </parent>
 
   <groupId>io.quarkiverse.microprofile</groupId>
@@ -14,7 +14,7 @@
   <name>Quarkus - MicroProfile - Parent</name>
 
   <properties>
-    <quarkus.version>3.6.7</quarkus.version>
+    <quarkus.version>3.7.2</quarkus.version>
   </properties>
 
   <scm>
diff --git a/tck/fault-tolerance/pom.xml b/tck/fault-tolerance/pom.xml
index 008195f..f029ecc 100644
--- a/tck/fault-tolerance/pom.xml
+++ b/tck/fault-tolerance/pom.xml
@@ -20,6 +20,7 @@
                     <dependenciesToScan>
                         <dependency>org.eclipse.microprofile.fault-tolerance:microprofile-fault-tolerance-tck</dependency>
                     </dependenciesToScan>
+                    <excludesFile>src/test/resources/exclusions.txt</excludesFile>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/tck/fault-tolerance/src/test/resources/exclusions.txt b/tck/fault-tolerance/src/test/resources/exclusions.txt
new file mode 100644
index 0000000..131f145
--- /dev/null
+++ b/tck/fault-tolerance/src/test/resources/exclusions.txt
@@ -0,0 +1,11 @@
+# Metrics Tests using the old MP Metrics that we don't support anymore
+org.eclipse.microprofile.fault.tolerance.tck.metrics.*
+org.eclipse.microprofile.fault.tolerance.tck.metrics.AllMetricsTest
+org.eclipse.microprofile.fault.tolerance.tck.metrics.BulkheadMetricTest
+org.eclipse.microprofile.fault.tolerance.tck.metrics.CircuitBreakerMetricTest
+org.eclipse.microprofile.fault.tolerance.tck.metrics.ClashingNameTest
+org.eclipse.microprofile.fault.tolerance.tck.metrics.ClassLevelMetricTest
+org.eclipse.microprofile.fault.tolerance.tck.metrics.FallbackMetricTest
+org.eclipse.microprofile.fault.tolerance.tck.metrics.MetricsDisabledTest
+org.eclipse.microprofile.fault.tolerance.tck.metrics.RetryMetricTest
+org.eclipse.microprofile.fault.tolerance.tck.metrics.TimeoutMetricTest
diff --git a/tck/jsonb/pom.xml b/tck/jsonb/pom.xml
index b70e2da..b622a92 100644
--- a/tck/jsonb/pom.xml
+++ b/tck/jsonb/pom.xml
@@ -20,6 +20,9 @@
                     <dependenciesToScan>
                         <dependency>jakarta.json.bind:jakarta.json.bind-tck</dependency>
                     </dependenciesToScan>
+                    <systemPropertyVariables>
+                        <java.locale.providers>COMPAT</java.locale.providers>
+                    </systemPropertyVariables>
                     <excludes>
                         <exclude>ee.jakarta.tck.json.bind.signaturetest.jsonb.JSONBSigTest</exclude>
                         <!-- @BeforeAll requires to be public -->