Merge remote-tracking branch 'origin/main' into feature/release-manag…

…ement

.yarnrc.yml

@@ -1,17 +1,13 @@
-nodeLinker: node-modules
+compressionLevel: mixed
+
+enableGlobalCache: false
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: "@yarnpkg/plugin-typescript"
+nodeLinker: node-modules
 
-yarnPath: ".yarn/releases/yarn-berry.js"
+yarnPath: .yarn/releases/yarn-4.1.0.cjs
 
-# Use this server when consuming artifacts
 npmRegistryServer: "https://nexus.maindrain.net/repository/npm/"
 
-# Use this server when publish artifacts
-#npmRegistryServer: "https://nexus.maindrain.net/repository/npm-releases/"
-
 npmScopes:
   openremote:
     npmRegistryServer: "https://nexus.maindrain.net/repository/npm-releases/"

agent/src/main/java/org/openremote/agent/custom/CustomProtocol.java

@@ -66,7 +66,7 @@ protected void doUnlinkAttribute(String assetId, Attribute<?> attribute, Default
     }
 
     @Override
-    protected void doLinkedAttributeWrite(Attribute<?> attribute, DefaultAgentLink agentLink, AttributeEvent event, Object processedValue) {
+    protected void doLinkedAttributeWrite(DefaultAgentLink agentLink, AttributeEvent event, Object processedValue) {
 
     }
 

package.json

@@ -1,5 +1,5 @@
 {
-  "packageManager": "yarn@3.2.0",
+  "packageManager": "yarn@4.1.0",
   "private": true,
   "workspaces": [
     "openremote",

settings.gradle

@@ -1,15 +1,7 @@
-pluginManagement {
-    plugins {
-        id "com.cherryperry.gradle-file-encrypt" version "2.0.0"
-        id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.3"
-        id 'cz.habarta.typescript-generator' version "$typescriptGeneratorVersion"
-    }
-}
-
 plugins {
-    id "com.cherryperry.gradle-file-encrypt" apply false
-    id "org.jetbrains.gradle.plugin.idea-ext" apply false
-    id "cz.habarta.typescript-generator" apply false
+    id "com.cherryperry.gradle-file-encrypt" version "2.0.3" apply false
+    id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.3" apply false
+    id 'cz.habarta.typescript-generator' version "$typescriptGeneratorVersion" apply false
 }
 
 rootProject.name = "$projectName"
@@ -19,5 +11,5 @@ fileTree(dir: rootDir, include: "**/build.gradle", excludes: ["**/node_modules/*
         .filter { it.parent != rootDir }
         .filter { !file("${it.parent}/.buildignore").exists() }
         .each {
-    include it.parent.replace(rootDir.canonicalPath, "").replace("\\", ":").replace("/", ":")
-}
+            include it.parent.replace(rootDir.canonicalPath, "").replace("\\", ":").replace("/", ":")
+        }

ui/app/custom/package.json

@@ -49,6 +49,7 @@
     "fork-ts-checker-webpack-plugin": "^6.5.0",
     "html-webpack-plugin": "^5.5.0",
     "prettier": "^2.5.1",
+    "querystring-es3": "^0.2.1",
     "shx": "^0.3.3",
     "source-map-loader": "^3.0.0",
     "style-loader": "^3.3.1",