From 515579e008e7ea1b7d5705048028caa90a3a936a Mon Sep 17 00:00:00 2001
From: Richard Zowalla <rzo1@apache.org>
Date: Mon, 16 Dec 2024 15:40:29 +0100
Subject: [PATCH] STORM-4133 - Raise Minimum JRE Level to 17 Update build tools

---
 .github/workflows/maven.yaml     | 6 +-----
 .github/workflows/nightlies.yaml | 6 +-----
 .github/workflows/snapshots.yaml | 6 +-----
 pom.xml                          | 2 +-
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index e66f3265f20..1bb4e1afe09 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -47,7 +47,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -57,10 +57,6 @@ jobs:
         with:
           distribution: temurin
           java-version: ${{ matrix.java }}
-      - name: Set up Maven #We need to avoid default-http-blocker at the moment until we fix it ;-)
-        uses: stCarolas/setup-maven@v5
-        with:
-          maven-version: 3.6.3
       - name: Ensure a clean state without storm artifacts
         run: rm -rf ~/.m2/repository/org/apache/storm
       - name: Set up project dependencies
diff --git a/.github/workflows/nightlies.yaml b/.github/workflows/nightlies.yaml
index 6eba8e95616..8e822005c4b 100644
--- a/.github/workflows/nightlies.yaml
+++ b/.github/workflows/nightlies.yaml
@@ -52,11 +52,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
-      - name: Set up Maven # We need to avoid default-http-blocker at the moment until we fix it ;-)
-        uses: stCarolas/setup-maven@v5
-        with:
-          maven-version: 3.6.3
+          java-version: 20
       - name: Ensure a clean state without storm artifacts
         run: rm -rf ~/.m2/repository/org/apache/storm
       - name: Set up project dependencies
diff --git a/.github/workflows/snapshots.yaml b/.github/workflows/snapshots.yaml
index 3a5ae6eb9fd..6574062f2ee 100644
--- a/.github/workflows/snapshots.yaml
+++ b/.github/workflows/snapshots.yaml
@@ -52,11 +52,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
-      - name: Set up Maven # We need to avoid default-http-blocker at the moment until we fix it ;-)
-        uses: stCarolas/setup-maven@v5
-        with:
-          maven-version: 3.6.3
+          java-version: 20
       - id: extract_version
         name: Extract project version
         shell: bash
diff --git a/pom.xml b/pom.xml
index 433009c0b95..38868cdfa48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
     </issueManagement>
 
     <properties>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>${maven.compiler.target}</maven.compiler.source>
         <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
         <maven.javadoc.failOnWarnings>false</maven.javadoc.failOnWarnings>