Various build and compose related updates

.yarnrc.yml

@@ -9,4 +9,4 @@ npmMinimalAgeGate: 1w
 npmPreapprovedPackages:
   - "@openremote/*"
 
-yarnPath: .yarn/releases/yarn-4.17.1.cjs
+yarnPath: .yarn/releases/yarn-4.18.0.cjs

build.gradle

@@ -1,3 +1,5 @@
+import java.nio.file.Paths
+
 import static org.apache.tools.ant.taskdefs.condition.Os.FAMILY_WINDOWS
 import static org.apache.tools.ant.taskdefs.condition.Os.isFamily
 
@@ -44,29 +46,38 @@ allprojects {
 //        return password.toCharArray()
 //    }
 //}
+//
+//interface InjectedExecOps {
+//  @Inject
+//  ExecOperations getExecOps()
+//}
+//def encryptedPlainFiles = gradleFileEncrypt.plainFiles.files.collect { it.path }
 //tasks.register('checkFilesGitIgnoredNew') {
-//    doLast {
-//        // The provided checkFilesGitIgnored task doesn't work on Windows so here's one that does
-//        def plainFiles = project.getProperties().get("gradleFileEncrypt").plainFiles
-//        plainFiles.each { plainFile ->
-//            def args = []
-//            if (isFamily(FAMILY_WINDOWS)) {
-//                args.add("cmd")
-//                args.add("/c")
-//            }
-//            args.add("git")
-//            args.add("check-ignore")
-//            args.add("-q")
-//            args.add(plainFile) // Assuming plainFile is a single file path
+//  def injected = objects.newInstance(InjectedExecOps)
 //
-//            def result = project.exec {
-//                commandLine args
-//                ignoreExitValue = true // Allow the build to continue so we can check the exit value
-//            }
+//  inputs.files(gradleFileEncrypt.plainFiles)
 //
-//            if (result.exitValue != 0) {
-//                throw new GradleException("Command execution failed for file ${plainFile} with exit code: ${result.exitValue}")
-//            }
-//        }
+//  doLast {
+//    // The provided checkFilesGitIgnored task doesn't work on Windows so here's one that does
+//    encryptedPlainFiles.each { plainFile ->
+//      def args = []
+//      if (isFamily(FAMILY_WINDOWS)) {
+//        args.add("cmd")
+//        args.add("/c")
+//      }
+//      args.add("git")
+//      args.add("check-ignore")
+//      args.add("-q")
+//      args.add(plainFile)
+//
+//      def result = injected.execOps.exec {
+//        commandLine args
+//        ignoreExitValue = true
+//      }
+//
+//      if (result.exitValue != 0) {
+//        throw new GradleException("Command execution failed for file ${plainFile} with exit code: ${result.exitValue}")
+//      }
 //    }
+//  }
 //}

docker-compose.yml

@@ -97,9 +97,8 @@ services:
     volumes:
       - deployment-data:/deployment
     environment:
-      KEYCLOAK_ADMIN_PASSWORD: ${OR_ADMIN_PASSWORD:?OR_ADMIN_PASSWORD must be set}
-      KC_HOSTNAME: ${OR_HOSTNAME:-localhost}
-      KC_HOSTNAME_PORT: ${OR_SSL_PORT:--1}
+      KC_BOOTSTRAP_ADMIN_PASSWORD: ${OR_ADMIN_PASSWORD:?OR_ADMIN_PASSWORD must be set}
+      KC_HOSTNAME: https://${OR_HOSTNAME:-localhost}/auth
     <<: *awslogs
 
   manager:

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 axionRelease = "1.21.2"
 fileEncrypt = "2.1.0"
 jackson = "2.21.4"
-openremote = "1.28.1"
+openremote = "1.30.0"
 testLogger = "4.0.0"
 typescript-generator = "4.1.1"
 

package.json

@@ -1,5 +1,5 @@
 {
-  "packageManager": "yarn@4.17.1",
+  "packageManager": "yarn@4.18.0",
   "private": true,
   "scripts": {
     "lint": "cd ui && eslint . --cache --cache-location ../.eslintcache",

profile/dev-testing.yml

@@ -4,34 +4,24 @@
 #
 # Please see profile/deploy.yml for configuration details for each service.
 #
-x-base: &base https://github.com/openremote/openremote.git#1.28.1:profile/deploy.yml
+x-base: &base https://github.com/openremote/openremote.git#1.30.0:profile/deploy.yml
 
 services:
   keycloak:
     extends:
       file: *base
       service: keycloak
-    volumes:
-      # Map custom themes
-      - ../deployment:/deployment
-    # Access directly if needed on localhost
     ports:
       - "8081:8080"
     depends_on:
       postgresql:
         condition: service_healthy
-    environment:
-      KC_HOSTNAME_STRICT_HTTPS: "false"
-      KC_HOSTNAME_PORT: ${KC_HOSTNAME_PORT:-8080}
-      # Prevent theme caching during dev
-      KEYCLOAK_START_OPTS: --spi-theme-static-max-age=-1 --spi-theme-cache-themes=false --spi-theme-cache-templates=false
 
   postgresql:
     extends:
       file: *base
       service: postgresql
     volumes:
       - ../openremote/tmp:/storage
-    # Access directly if needed on localhost
     ports:
       - "5432:5432"

profile/dev-ui.yml

@@ -4,7 +4,7 @@
 #
 # Please see profile/deploy.yml for configuration details for each service.
 #
-x-base: &base https://github.com/openremote/openremote.git#1.28.1:profile/deploy.yml
+x-base: &base https://github.com/openremote/openremote.git#1.30.0:profile/deploy.yml
 
 volumes:
   manager-data:
@@ -24,9 +24,6 @@ services:
       postgresql:
         condition: service_healthy
     environment:
-      KC_HOSTNAME: ${OR_HOSTNAME:-localhost}
-      KC_HOSTNAME_STRICT_HTTPS: "false"
-      KC_HOSTNAME_PORT: ${KC_HOSTNAME_PORT:-8080}
       # Prevent theme caching during dev
       KEYCLOAK_START_OPTS: --spi-theme-static-max-age=-1 --spi-theme-cache-themes=false --spi-theme-cache-templates=false
 
@@ -53,6 +50,6 @@ services:
     environment:
       OR_SETUP_RUN_ON_RESTART: ${OR_SETUP_RUN_ON_RESTART:-true}
       OR_DEV_MODE: ${OR_DEV_MODE:-true}
-      KC_HOSTNAME_PORT: ${KC_HOSTNAME_PORT:-8080}
+      OR_SETUP_TYPE: "demo"
     ports:
       - "8080:8080"

project.gradle

@@ -340,7 +340,6 @@ tasks.register('yarnInstall', Exec) {
 tasks.register('yarnInstallForce', Exec) {
   commandLine npmCommand("yarn"), "install", "--force"
 }
-
 tasks.register('npmClean', Exec) {
   dependsOn getYarnInstallTask()
   commandLine npmCommand("yarn"), "run", "clean"

ui/app/custom-react/package.json

@@ -11,9 +11,9 @@
     "serve": "npx cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 rspack serve"
   },
   "dependencies": {
-    "@openremote/core": "~1.28.1",
-    "@openremote/model": "~1.28.1",
-    "@openremote/or-mwc-components": "~1.28.1",
+    "@openremote/core": "~1.30.0",
+    "@openremote/model": "~1.30.0",
+    "@openremote/or-mwc-components": "~1.30.0",
     "react": "^19.2.0",
     "react-dom": "^19.2.0"
   },

ui/app/custom/package.json

@@ -18,14 +18,14 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@openremote/manager": "~1.28.1",
-    "@openremote/or-app": "~1.28.1",
+    "@openremote/manager": "~1.30.0",
+    "@openremote/or-app": "~1.30.0",
     "lit": "^3.3.1",
     "model": "workspace:*",
     "rest": "workspace:*"
   },
   "devDependencies": {
-    "@openremote/util": "~1.28.1",
+    "@openremote/util": "~1.30.0",
     "@rspack/cli": "^1.7.10",
     "@rspack/core": "^1.7.10",
     "@typescript-eslint/eslint-plugin": "8.40.0",

ui/component/model/package.json

@@ -22,7 +22,7 @@
   "author": "OpenRemote",
   "license": "AGPL-3.0-or-later",
   "devDependencies": {
-    "@openremote/util": "~1.28.1",
+    "@openremote/util": "~1.30.0",
     "@typescript-eslint/eslint-plugin": "8.40.0",
     "@typescript-eslint/parser": "8.40.0",
     "eslint": "8.57.1",

ui/component/rest/package.json

@@ -22,11 +22,11 @@
   "author": "OpenRemote",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@openremote/rest": "~1.28.1",
+    "@openremote/rest": "~1.30.0",
     "model": "workspace:*"
   },
   "devDependencies": {
-    "@openremote/util": "~1.28.1",
+    "@openremote/util": "~1.30.0",
     "@rspack/core": "^1.7.10",
     "@typescript-eslint/eslint-plugin": "8.40.0",
     "@typescript-eslint/parser": "8.40.0",