Merge remote-tracking branch 'origin/main'

build.gradle

@@ -16,7 +16,7 @@ plugins {
 apply plugin: "maven-publish"
 
 
-version = "0.31.1-SNAPSHOT"
+version = "0.33.2-SNAPSHOT"
 group = "org.domaindrivenarchitecture.provs"
 
 
@@ -76,8 +76,8 @@ dependencies {
     api('com.charleskorn.kaml:kaml:0.54.0')
 
     api("org.slf4j:slf4j-api:1.7.36")
-    api('ch.qos.logback:logback-classic:1.2.11')
-    api('ch.qos.logback:logback-core:1.2.11')
+    api('ch.qos.logback:logback-classic:1.4.14')
+    api('ch.qos.logback:logback-core:1.4.14')
 
     implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version_no")
     implementation("com.hierynomus:sshj:0.32.0")

build.py

@@ -8,7 +8,7 @@ name = "provs"
 PROJECT_ROOT_PATH = "."
 
 
-version = "0.31.1-SNAPSHOT"
+version = "0.33.2-dev"
 
 
 @init
@@ -38,6 +38,7 @@ def initialize2(project):
         "project_root_path": PROJECT_ROOT_PATH,
         "build_types": [],
         "mixin_types": ["RELEASE"],
+        "release_main_branch": "main",
         "release_primary_build_file": "build.gradle",
         "release_secondary_build_files": ["build.py"],
         # release artifacts

doc/Release.md

@@ -5,7 +5,7 @@ release-1.2 or release-1.2.3
 
 I.e.: release-X.X.Z where X, Y, Z are the major, minor resp. the patch level of the release. Z can be omitted.
 
-**Note:** Such kind of release tags should only be applied to commits in the master branch.
+**Note:** Such kind of release tags should only be applied to commits in the main branch.
 
 ```
 #adjust [version]

src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt

@@ -52,7 +52,11 @@ fun Prov.deprovisionK3sInfra() = task {
     deleteFile(certManagerDeployment.path, sudo = true)
     deleteFile(certManagerIssuer.path, sudo = true)
     deleteFile(k3sKubeConfig.path, sudo = true)
-    cmd("k3s-uninstall.sh")
+
+    val k3sUninstallScript = "k3s-uninstall.sh"
+    if (chk("which $k3sUninstallScript")) {
+        cmd(k3sUninstallScript)
+    }
 }