Skip to content

Commit

Permalink
Updated to latest openremote submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
richturner committed Feb 8, 2024
1 parent 561db5a commit a2b4bd7
Show file tree
Hide file tree
Showing 7 changed files with 6,978 additions and 6,349 deletions.
9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.1.0.cjs

Large diffs are not rendered by default.

785 changes: 0 additions & 785 deletions .yarn/releases/yarn-berry.js

This file was deleted.

10 changes: 5 additions & 5 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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
2 changes: 1 addition & 1 deletion openremote
Submodule openremote updated 56 files
+0 −9 .yarn/plugins/@yarnpkg/plugin-typescript.cjs
+0 −550 .yarn/plugins/@yarnpkg/plugin-version.cjs
+0 −28 .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+0 −785 .yarn/releases/yarn-3.2.0.cjs
+893 −0 .yarn/releases/yarn-4.1.0.cjs
+1 −9 .yarnrc.yml
+1 −1 CONTRIBUTORS.txt
+10 −13 agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
+1 −2 agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshProtocol.java
+2 −3 agent/src/main/java/org/openremote/agent/protocol/http/HTTPProtocol.java
+2 −2 agent/src/main/java/org/openremote/agent/protocol/knx/KNXProtocol.java
+1 −2 agent/src/main/java/org/openremote/agent/protocol/mail/AbstractMailProtocol.java
+1 −2 agent/src/main/java/org/openremote/agent/protocol/mqtt/MQTTProtocol.java
+2 −2 agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorProtocol.java
+6 −7 agent/src/main/java/org/openremote/agent/protocol/simulator/storage/StorageSimulatorProtocol.java
+2 −3 agent/src/main/java/org/openremote/agent/protocol/snmp/SNMPProtocol.java
+1 −1 agent/src/main/java/org/openremote/agent/protocol/velbus/AbstractVelbusProtocol.java
+1 −2 agent/src/main/java/org/openremote/agent/protocol/zwave/ZWaveProtocol.java
+1 −1 gradle.properties
+5 −3 manager/src/main/java/org/openremote/manager/agent/AgentService.java
+7 −2 manager/src/main/java/org/openremote/manager/event/EventSubscriptions.java
+3 −4 manager/src/main/java/org/openremote/manager/notification/NotificationProcessingException.java
+12 −7 manager/src/main/java/org/openremote/manager/notification/NotificationService.java
+1 −1 manager/src/web/shared/locales/en/or.json
+1 −1 manager/src/web/shared/locales/nl/or.json
+17 −0 model-util/src/main/java/CustomExtension.java
+5 −4 model/src/main/java/org/openremote/model/asset/agent/Protocol.java
+11 −12 model/src/main/java/org/openremote/model/attribute/AttributeEvent.java
+12 −0 model/src/main/java/org/openremote/model/attribute/AttributeInfo.java
+1 −1 model/src/main/java/org/openremote/model/datapoint/Datapoint.java
+4 −2 model/src/main/java/org/openremote/model/event/Event.java
+1 −1 model/src/main/java/org/openremote/model/event/shared/SharedEvent.java
+5 −4 model/src/main/java/org/openremote/model/protocol/ProtocolUtil.java
+1 −1 package.json
+4 −1 project.gradle
+8 −3 setup/src/integration/java/org/openremote/setup/integration/protocol/MockProtocol.java
+23 −1 test/src/test/groovy/org/openremote/test/notification/NotificationTest.groovy
+9 −16 test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovy
+2 −1 ui/component/core/src/console.ts
+10 −3 ui/component/core/src/event.ts
+228 −61 ui/component/core/src/index.ts
+9 −1 ui/component/or-app/src/app.ts
+93 −14 ui/component/or-app/src/index.ts
+20 −48 ui/component/or-app/src/page-offline.ts
+5 −0 ui/component/or-app/src/types.ts
+1 −1 ui/component/or-dashboard-builder/src/index.ts
+3 −3 ui/component/or-icon/package.json
+1 −1 ui/component/or-json-forms/package.json
+4 −4 ui/demo/demo-core/package.json
+4 −4 ui/demo/demo-or-asset-tree/package.json
+4 −4 ui/demo/demo-or-map/package.json
+4 −4 ui/demo/demo-or-thermostat/package.json
+4 −4 ui/demo/demo-rest/package.json
+7 −6 ui/util/package.json
+4 −1 ui/util/webpack.util.js
+4,637 −4,110 yarn.lock
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"packageManager": "yarn@3.2.0",
"packageManager": "yarn@4.1.0",
"private": true,
"workspaces": [
"openremote",
Expand Down
11,626 changes: 6,078 additions & 5,548 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit a2b4bd7

Please sign in to comment.