From 21469cbc1932dfa6fde2412a98776631036bdb75 Mon Sep 17 00:00:00 2001 From: Peter De Witte Date: Thu, 14 Mar 2024 14:58:45 +0100 Subject: [PATCH 1/2] Add org.jdom version, fix for build error --- agent/build.gradle | 2 ++ gradle.properties | 1 + 2 files changed, 3 insertions(+) diff --git a/agent/build.gradle b/agent/build.gradle index 3e0a2c78a3..71e32fa14d 100644 --- a/agent/build.gradle +++ b/agent/build.gradle @@ -36,6 +36,8 @@ dependencies { implementation "dev.failsafe:failsafe:$failsafeVersion" implementation "org.eclipse.angus:angus-mail:$jakartaMailVersion" + + implementation "org.jdom:jdom:$jdomVersion" } jar { diff --git a/gradle.properties b/gradle.properties index c882823129..87b55a98ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,3 +60,4 @@ jbossLoggingManagerVersion=2.1.19.Final greenmailVersion=2.0.0 prometheusVersion=0.16.0 micrometerVersion=1.11.0 +jdomVersion=1.1.3 From 3cfdc713117cbe478ee81c46099b9fd6420e5c1b Mon Sep 17 00:00:00 2001 From: Peter De Witte Date: Thu, 14 Mar 2024 17:24:48 +0100 Subject: [PATCH 2/2] Upgrade to jdom2 --- agent/build.gradle | 2 +- .../mesh/SequenceNumberPersistencyManager.java | 12 ++++++------ gradle.properties | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/agent/build.gradle b/agent/build.gradle index 71e32fa14d..cd7fa92655 100644 --- a/agent/build.gradle +++ b/agent/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation "org.eclipse.angus:angus-mail:$jakartaMailVersion" - implementation "org.jdom:jdom:$jdomVersion" + implementation "org.jdom:jdom2:$jdomVersion" } jar { diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/SequenceNumberPersistencyManager.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/SequenceNumberPersistencyManager.java index 71c9c9b498..aa0283a99f 100644 --- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/SequenceNumberPersistencyManager.java +++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/SequenceNumberPersistencyManager.java @@ -19,12 +19,12 @@ */ package org.openremote.agent.protocol.bluetooth.mesh; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.JDOMException; -import org.jdom.input.SAXBuilder; -import org.jdom.output.Format; -import org.jdom.output.XMLOutputter; +import org.jdom2.Document; +import org.jdom2.Element; +import org.jdom2.JDOMException; +import org.jdom2.input.SAXBuilder; +import org.jdom2.output.Format; +import org.jdom2.output.XMLOutputter; import org.openremote.agent.protocol.bluetooth.mesh.utils.MeshParserUtils; import org.openremote.model.syslog.SyslogCategory; diff --git a/gradle.properties b/gradle.properties index 87b55a98ca..b7aac5d465 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,4 +60,4 @@ jbossLoggingManagerVersion=2.1.19.Final greenmailVersion=2.0.0 prometheusVersion=0.16.0 micrometerVersion=1.11.0 -jdomVersion=1.1.3 +jdomVersion=2.0.6.1