From d39e38a6cb145f5dca2e50ac5949d8603fe3c302 Mon Sep 17 00:00:00 2001
From: Dinesh Udayakumar <dinesh.udayakumar@retailnext.net>
Date: Wed, 5 Jul 2023 19:24:48 -0400
Subject: [PATCH 1/4] Update to java 17

As this artifact is used by the reports this needs to be updated
to java 17.
As per the current plan reports built with java 17 will be tested
in canary so there will be a period where both old reports built
with java 8 and new reports built with java 17 needs to be available
so sstemplates built with java 8 is also needs to be available.
So updating the version of the artifacts to 2.0.0

1.0.0-SNAPSHOTS are built with java 8 and 2.0.0-SNAPSHOTS will
be built with java 17
---
 .gitignore | 2 ++
 pom.xml    | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8d4892..0737762 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ buildNumber.properties
 .project
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
+# IntelliJ
+.idea
diff --git a/pom.xml b/pom.xml
index 6680dd5..0be9b1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,10 +30,10 @@
     </repository>
   </distributionManagement>
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <revision>1.0.0-SNAPSHOT</revision>
+    <revision>2.0.0-SNAPSHOT</revision>
     <tag>HEAD</tag>
     <tree>main</tree>
   </properties>

From 17d7d7dbe81e74be47230e6bc8af0be768bdd09a Mon Sep 17 00:00:00 2001
From: Dinesh Udayakumar <dinesh.udayakumar@retailnext.net>
Date: Thu, 6 Jul 2023 18:25:19 -0400
Subject: [PATCH 2/4] Update github workflow to use java 17

---
 .github/workflows/build-main.yml    | 8 ++++++--
 .github/workflows/build-pr.yml      | 8 ++++++--
 .github/workflows/build-release.yml | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index efb982d..c296d7c 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@@ -12,10 +12,14 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Zulu 8
+      - name: Set up Maven
+        uses: stCarolas/setup-maven@v4.5
+        with:
+          maven-version: 3.9.3
+      - name: Set up Zulu 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'zulu'
           cache: 'maven'
       - name: Build with Maven
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index aec23c9..12bb3a5 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -6,10 +6,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Zulu 8
+      - name: Set up Maven
+        uses: stCarolas/setup-maven@v4.5
+        with:
+          maven-version: 3.9.3
+      - name: Set up Zulu 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'zulu'
           cache: 'maven'
       - name: Build with Maven
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 939e677..a5b571b 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -13,10 +13,14 @@ jobs:
     if: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Zulu 8
+      - name: Set up Maven
+        uses: stCarolas/setup-maven@v4.5
+        with:
+          maven-version: 3.9.3
+      - name: Set up Zulu 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'zulu'
       - name: Deploy Release with Maven
         run: >

From dd11a0bb8cdda049cf48ec9d3e6ac19f50723255 Mon Sep 17 00:00:00 2001
From: Dinesh Udayakumar <dinesh.udayakumar@retailnext.net>
Date: Fri, 7 Jul 2023 09:50:31 -0400
Subject: [PATCH 3/4] Update renovate.json after updating to java 17

Remove jetty matching rule from renovate.json
---
 renovate.json | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/renovate.json b/renovate.json
index 35d2c97..f45d8f1 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,13 +1,5 @@
 {
   "extends": [
     "config:base"
-  ],
-  "packageRules": [
-    {
-      "matchPackageNames": [
-        "org.eclipse.jetty:jetty-maven-plugin"
-      ],
-      "allowedVersions": "<10"
-    }
   ]
-}
\ No newline at end of file
+}

From d172d167c8107f9c8f54ddb30a13273b2a960512 Mon Sep 17 00:00:00 2001
From: Dinesh Udayakumar <dinesh.udayakumar@retailnext.net>
Date: Fri, 7 Jul 2023 10:17:31 -0400
Subject: [PATCH 4/4] Update jetty-maven-plugin to latest

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f1b08a6..6043f6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
         <plugin>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-maven-plugin</artifactId>
-          <version>9.4.51.v20230217</version>
+          <version>11.0.15</version>
         </plugin>
       </plugins>
     </pluginManagement>