From fd7d66d212aa0ec508cd0930e695adf51ae02510 Mon Sep 17 00:00:00 2001
From: Michael Lux <michael.lux@aisec.fraunhofer.de>
Date: Fri, 14 Jun 2024 10:37:01 +0200
Subject: [PATCH] Updated IDSCP2, fast build script and version scanning

---
 build.gradle.kts          | 5 +++--
 fastBuild.sh              | 2 +-
 gradle/libs.versions.toml | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1f92a724..2dd2e80f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,9 +26,9 @@ licenseReport {
 
 allprojects {
     group = "de.fhg.aisec.ids"
-    version = "7.2.1"
+    version = "7.2.2"
 
-    val versionRegex = ".*((rc|beta)-?[0-9]*|-b[0-9.]+)$".toRegex(RegexOption.IGNORE_CASE)
+    val versionRegex = ".*((rc|beta|alpha)-?[0-9]*|-b[0-9.]+)$".toRegex(RegexOption.IGNORE_CASE)
 
     tasks.withType<DependencyUpdatesTask> {
         rejectVersionIf {
@@ -36,6 +36,7 @@ allprojects {
             versionRegex.matches(candidate.version)
                 || (candidate.group in setOf("org.apache.camel", "org.apache.camel.springboot")
                 && !candidate.version.startsWith("3.18"))
+                || candidate.group == "com.google.protobuf" && !candidate.version.startsWith("3.")
         }
     }
 }
diff --git a/fastBuild.sh b/fastBuild.sh
index 0ca9a3a4..fd53190e 100755
--- a/fastBuild.sh
+++ b/fastBuild.sh
@@ -12,7 +12,7 @@ trap "trap_handler" ERR EXIT INT TERM
 
 cd "$(dirname "${BASH_SOURCE[0]}")" || return
 
-echo "Warning: fastBuild.sh requires JDK 17+, nodejs 16+ incl. npm and protoc (i.e. protobuf-compiler) to be installed locally on your machine."
+echo "Warning: fastBuild.sh requires JDK 17+, Node.js 20 incl. npm and protoc (i.e. protobuf-compiler) to be installed locally on your machine."
 echo "Lacking any of these dependencies will cause this build to fail."
 echo "For a pre-configured build environment, use build.sh, which requires only docker and docker-compose."
 echo ""
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a840c9eb..47ab5cc7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-idscp2 = "0.19.2"
+idscp2 = "0.19.3"
 ktlint = "1.3.0"
 
 # Kotlin library/compiler version