From c903eeedc9defdb2565447bcc7ebde3e0db50da0 Mon Sep 17 00:00:00 2001
From: Philipp Heuer <git@philippheuer.me>
Date: Wed, 1 May 2024 16:00:58 +0200
Subject: [PATCH] feat: extend version fix with new java versions

---
 lib-golang-group.json   |  4 +---
 lib-versioning-fix.json | 27 ++++++++++++++++-----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib-golang-group.json b/lib-golang-group.json
index 8faba82..a490e94 100644
--- a/lib-golang-group.json
+++ b/lib-golang-group.json
@@ -3,9 +3,7 @@
   "packageRules": [
     {
       "groupName": "github.com/cidverse/cidverseutils",
-      "matchPackagePatterns": [
-        "^github\\.com/cidverse/cidverseutils"
-      ],
+      "matchPackagePatterns": ["^github\\.com/cidverse/cidverseutils"],
       "matchDatasources": ["maven"]
     }
   ]
diff --git a/lib-versioning-fix.json b/lib-versioning-fix.json
index cd5065d..5f0b731 100644
--- a/lib-versioning-fix.json
+++ b/lib-versioning-fix.json
@@ -7,8 +7,8 @@
         "corretto/corretto-8",
         "corretto/corretto-11",
         "corretto/corretto-17",
-        "corretto/corretto-18",
-        "corretto/corretto-19"
+        "corretto/corretto-21",
+        "corretto/corretto-22"
       ],
       "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.*(?<patch>\\d*)\\.(?<build>.+)$"
     },
@@ -25,7 +25,11 @@
         "adoptium/temurin11-binaries",
         "adoptium/temurin17-binaries",
         "adoptium/temurin18-binaries",
-        "adoptium/temurin19-binaries"
+        "adoptium/temurin19-binaries",
+        "adoptium/temurin20-binaries",
+        "adoptium/temurin21-binaries",
+        "adoptium/temurin22-binaries"
+
       ],
       "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.*(?<patch>\\d*)+(?<build>.+)$"
     },
@@ -43,6 +47,13 @@
       ],
       "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d*)\\.(?<build>\\d+)$"
     },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackageNames": [
+        "quay.io/cidverse/sonarscannercli"
+      ],
+      "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d*)\\.(?<build>\\d+)$"
+    },
     {
       "matchDatasources": ["docker"],
       "matchPackageNames": [
@@ -56,16 +67,10 @@
       "matchPackageNames": [
         "quay.io/cidverse/base-coretto-11",
         "quay.io/cidverse/base-coretto-17",
-        "quay.io/cidverse/base-coretto-19"
+        "quay.io/cidverse/base-coretto-21",
+        "quay.io/cidverse/base-coretto-22"
       ],
       "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.*(?<patch>\\d*)\\.(?<build>.+)$"
-    },
-    {
-      "matchDatasources": ["docker"],
-      "matchPackageNames": [
-        "quay.io/cidverse/sonarscannercli"
-      ],
-      "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d*)\\.(?<build>\\d+)$"
     }
   ]
 }