Skip to content

Commit fd7d66d

Browse files
committed
Updated IDSCP2, fast build script and version scanning
1 parent 52f6d70 commit fd7d66d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,17 @@ licenseReport {
2626

2727
allprojects {
2828
group = "de.fhg.aisec.ids"
29-
version = "7.2.1"
29+
version = "7.2.2"
3030

31-
val versionRegex = ".*((rc|beta)-?[0-9]*|-b[0-9.]+)$".toRegex(RegexOption.IGNORE_CASE)
31+
val versionRegex = ".*((rc|beta|alpha)-?[0-9]*|-b[0-9.]+)$".toRegex(RegexOption.IGNORE_CASE)
3232

3333
tasks.withType<DependencyUpdatesTask> {
3434
rejectVersionIf {
3535
// Reject release candidates and betas and pin Apache Camel to 3.18 LTS version
3636
versionRegex.matches(candidate.version)
3737
|| (candidate.group in setOf("org.apache.camel", "org.apache.camel.springboot")
3838
&& !candidate.version.startsWith("3.18"))
39+
|| candidate.group == "com.google.protobuf" && !candidate.version.startsWith("3.")
3940
}
4041
}
4142
}

fastBuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ trap "trap_handler" ERR EXIT INT TERM
1212

1313
cd "$(dirname "${BASH_SOURCE[0]}")" || return
1414

15-
echo "Warning: fastBuild.sh requires JDK 17+, nodejs 16+ incl. npm and protoc (i.e. protobuf-compiler) to be installed locally on your machine."
15+
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."
1616
echo "Lacking any of these dependencies will cause this build to fail."
1717
echo "For a pre-configured build environment, use build.sh, which requires only docker and docker-compose."
1818
echo ""

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
idscp2 = "0.19.2"
2+
idscp2 = "0.19.3"
33
ktlint = "1.3.0"
44

55
# Kotlin library/compiler version

0 commit comments

Comments
 (0)