Skip to content

Commit

Permalink
Updated IDSCP2, fast build script and version scanning
Browse files Browse the repository at this point in the history
  • Loading branch information
milux committed Jun 14, 2024
1 parent 52f6d70 commit fd7d66d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,17 @@ 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 {
// Reject release candidates and betas and pin Apache Camel to 3.18 LTS version
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.")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion fastBuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
idscp2 = "0.19.2"
idscp2 = "0.19.3"
ktlint = "1.3.0"

# Kotlin library/compiler version
Expand Down

0 comments on commit fd7d66d

Please sign in to comment.