Beta Release 3.1.2

.github/workflows/auto-branch-update.yaml

@@ -0,0 +1,17 @@
+name: "Autoupdate PR branches"
+
+on:
+  push:
+    branches:
+      - dev
+      - "epic/**"
+
+jobs:
+  autoupdate:
+    name: autoupdate
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: docker://chinthakagodawita/autoupdate-action:v1
+        env:
+          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          MERGE_CONFLICT_ACTION: "ignore"

.github/workflows/deploy-docker.yml

@@ -11,6 +11,7 @@ on:
   pull_request:
     branches:
       - dev
+      - beta
     types: [opened, labeled, synchronize, reopened, ready_for_review]
 
 jobs:
@@ -33,6 +34,7 @@ jobs:
           # generate Docker tags based on the following events/attributes
           tags: |
             type=schedule
+            type=raw,value=review,enable=${{ contains(github.event.pull_request.labels.*.name, 'prebuild docker image') }}
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
@@ -82,6 +84,7 @@ jobs:
           # generate Docker tags based on the following events/attributes
           tags: |
             type=schedule
+            type=raw,value=review,enable=${{ contains(github.event.pull_request.labels.*.name, 'prebuild docker image') }}
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
@@ -115,6 +118,7 @@ jobs:
           # generate Docker tags based on the following events/attributes
           tags: |
             type=schedule
+            type=raw,value=review,enable=${{ contains(github.event.pull_request.labels.*.name, 'prebuild docker image') }}
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}

.github/workflows/publish-jars.yml

@@ -13,12 +13,14 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Java
-        uses: actions/setup-java@v2
+      - name: "Checkout Branch"
+        uses: actions/checkout@v3
+      - name: "Setup Java"
+        uses: actions/setup-java@v3
         with:
-          java-version: '17'
-          distribution: 'adopt'
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'gradle'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Publish Packages

build-docker.sh

@@ -10,10 +10,13 @@ WHITE='\033[0;37m'
 
 APP_NAME='docker images'
 APP_NAME=${BLUE}${APP_NAME}${NC}
-echo -e "=== ${APP_NAME} are building${WHITE}${NC}" &&
-docker build -f docker/Dockerfile -t openbaseorg/bco:local .
-docker build -f docker/device-manager/openhab/Dockerfile -t openbaseorg/bco-device-manager-openhab:local --build-arg BCO_BASE_IMAGE_VERSION=local docker/device-manager/openhab
-docker build -f docker/bco-demo/Dockerfile -t openbaseorg/bco-demo:local --build-arg BCO_BASE_IMAGE_VERSION=local docker/bco-demo
+IMAGE_TAG=${1:-local}
+
+echo -e "=== ${APP_NAME} build docker image...${WHITE}${NC}"
+
+docker build -f docker/Dockerfile -t openbaseorg/bco:${IMAGE_TAG} .
+docker build -f docker/device-manager/openhab/Dockerfile -t openbaseorg/bco-device-manager-openhab:${IMAGE_TAG} --build-arg BCO_BASE_IMAGE_VERSION=${IMAGE_TAG} docker/device-manager/openhab
+docker build -f docker/bco-demo/Dockerfile -t openbaseorg/bco-demo:${IMAGE_TAG} --build-arg BCO_BASE_IMAGE_VERSION=${IMAGE_TAG} docker/bco-demo
 
 # use this for debugging purpose: DOCKER_BUILDKIT=0 docker build -f docker/Dockerfile --progress=plain .
 echo -e "=== ${APP_NAME} were ${GREEN}successfully${NC} build.${NC}"

build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 }
@@ -12,3 +14,10 @@ nexusPublishing {
         }
     }
 }
+
+
+tasks.withType(KotlinCompile::class).all {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}

docker/Dockerfile

@@ -75,7 +75,8 @@ ENV \
     BCO_HOME="/home/bco/data" \
     BCO_LOGS="/home/bco/data/log" \
     BCO_BINARY="/usr/bin/bco" \
-    BCO_OPTIONS=""
+    MQTT_BROKER="mqtt-broker" \
+    BCO_OPTIONS="--host ${MQTT_BROKER}"
 
 # Basic build-time metadata as defined at http://label-schema.org
 LABEL org.label-schema.build-date=$BUILD_DATE \
@@ -111,7 +112,7 @@ ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
 # Configure healthcheck
 # todo: make sure only the registry availability is checks since devices are not maintained by this instance.
-HEALTHCHECK --interval=15m --timeout=2m CMD bco-validate >/dev/null || exit 1
+HEALTHCHECK --interval=15m --timeout=2m CMD bco-validate --host ${MQTT_BROKER} > /dev/null || exit 1
 
 # switch to root, let the entrypoint drop back to bco user
 USER root

docker/bco-demo/Dockerfile

@@ -23,7 +23,7 @@ FROM openbaseorg/bco:${BCO_BASE_IMAGE_VERSION}
 ENV \
     JAVA_OPTS="" \
     OPENHAB_CONF="/etc/openhab2" \
-    BCO_OPTIONS="--db /tmp/bco/db" \
+    BCO_OPTIONS="--db /tmp/bco/db --host ${MQTT_BROKER}" \
     BCO_MODULE_PREPARE_SCRIPT="bco-module-prepare.sh"
 
 # Basic build-time metadata as defined at http://label-schema.org
@@ -51,7 +51,7 @@ COPY --from=builder /workspace/db /usr/share/bco/db/
 
 # Configure healthcheck
 # todo: make sure only device offered by this device manager are checked
-HEALTHCHECK --interval=15m --timeout=2m CMD bco-validate >/dev/null || exit 1
+HEALTHCHECK --interval=15m --timeout=2m CMD bco-validate --host ${MQTT_BROKER} >/dev/null || exit 1
 
 # switch to root, let the entrypoint drop back to bco user
 USER root

docker/device-manager/openhab/Dockerfile

@@ -6,7 +6,6 @@ FROM openbaseorg/bco:${BCO_BASE_IMAGE_VERSION}
 ENV \
     JAVA_OPTS="" \
     OPENHAB_CONF="/etc/openhab2" \
-    BCO_OPTIONS="" \
     BCO_MODULE_PREPARE_SCRIPT="bco-module-prepare.sh"
 
 # Basic build-time metadata as defined at http://label-schema.org
@@ -33,7 +32,7 @@ RUN ln -s /usr/local/bin/${BCO_MODULE_PREPARE_SCRIPT} && \
 
 # Configure healthcheck
 # todo: make sure only device offered by this device manager are checked
-HEALTHCHECK --interval=15m --timeout=2m CMD bco-validate >/dev/null || exit 1
+HEALTHCHECK --interval=15m --timeout=2m CMD bco-validate  --host ${MQTT_BROKER} >/dev/null || exit 1
 
 # switch to root, let the entrypoint drop back to bco user
 USER root

gradle.properties

@@ -1,5 +1,5 @@
-version = 3.1-SNAPSHOT
-org.gradle.caching = true
-org.gradle.parallel = false
-org.gradle.daemon = true
-org.gradle.jvmargs = -Xmx2000m
+version=3.1-SNAPSHOT
+org.gradle.caching=true
+org.gradle.parallel=false
+org.gradle.daemon=true
+org.gradle.jvmargs=-Xmx2000m

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

module/api/graphql/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("org.openbase.bco")
     id("org.springframework.boot")
-    id("io.spring.dependency-management") version "1.0.11.RELEASE"
+    id("io.spring.dependency-management") version "1.1.2"
 }
 
 dependencies {
@@ -12,12 +12,17 @@ dependencies {
         exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
     }
     api("org.springframework.boot:spring-boot-starter-jetty:_")
-    implementation("org.springframework.boot:spring-boot-starter-websocket:_") {
+    api("org.springframework.boot:spring-boot-starter-websocket:_") {
         exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
     }
     api(Spring.boot.webflux)
     api("org.springframework:spring-webmvc:_")
 
+    api("org.eclipse.jetty:jetty-server:11.0.14")
+    api("jakarta.servlet:jakarta.servlet-api:6.0.0")
+
+
+
     api(rootProject.files("lib/external/rejoiner-0.5.0-bco.jar"))
     api(rootProject.files("lib/external/rejoiner-guice-0.5.0-bco.jar"))
 // disabled since rejoiner is linked locally.
@@ -35,7 +40,6 @@ dependencies {
     api("com.google.inject:guice:_")
     api("com.google.guava:guava:_")
     api("net.javacrumbs.future-converter:future-converter-java8-guava:_")
-    api("org.jmdns:jmdns:_")
     api(ReactiveX.rxJava2)
 }
 

module/api/graphql/src/main/java/org/openbase/bco/api/graphql/BcoApiGraphQlSpringLaunchable.kt

@@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory
 import org.springframework.boot.SpringApplication
 import org.springframework.context.ConfigurableApplicationContext
 import java.util.*
-import javax.jmdns.ServiceInfo
 
 /*-
  * #%L
@@ -55,19 +54,19 @@ import javax.jmdns.ServiceInfo
         LOGGER.info("Start webserver...")
         context = SpringApplication.run(BcoGraphQlApiSpringBootApplication::class.java, *JPService.getArgs())
         LOGGER.info("Advertise graphql service...")
-        val qualifiedNameMap = HashMap<ServiceInfo.Fields, String>()
-        qualifiedNameMap[ServiceInfo.Fields.Application] = "http"
-        qualifiedNameMap[ServiceInfo.Fields.Instance] = "graphql-bco-openbase"
-        qualifiedNameMap[ServiceInfo.Fields.Subtype] = "graphql"
+//        val qualifiedNameMap = HashMap<ServiceInfo.Fields, String>()
+//        qualifiedNameMap[ServiceInfo.Fields.Application] = "http"
+//        qualifiedNameMap[ServiceInfo.Fields.Instance] = "graphql-bco-openbase"
+//        qualifiedNameMap[ServiceInfo.Fields.Subtype] = "graphql"
         val propertyMap = HashMap<String, String>()
         propertyMap["bco-uuid"] = UUID.randomUUID().toString()
         propertyMap["path"] = "graphql"
 
         // lookup port
-        context?.getEnvironment()?.getProperty("server.port")?.toInt()?.let { port ->
-            // register service advertising
-            serviceAdvertiser!!.register(qualifiedNameMap, port, 0, 0, false, propertyMap)
-        }
+//        context?.getEnvironment()?.getProperty("server.port")?.toInt()?.let { port ->
+//            // register service advertising
+//            serviceAdvertiser!!.register(qualifiedNameMap, port, 0, 0, false, propertyMap)
+//        }
     }
 
     override fun deactivate() {