100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Upgrade Artemis to 2.44.0 (#2412)
Eric Bariaux805abaca652e
diff --git a/gradle.properties b/gradle.propertiesindex e88dacc45..0b2fc2ad2 100644--- a/gradle.properties+++ b/gradle.properties@@ -62,7 +62,7 @@ failsafeVersion=3.3.2suncalcVersion=3.11snapshotsRepoUrl=https://central.sonatype.com/repository/maven-snapshots/releasesRepoUrl=https://ossrh-staging-api.central.sonatype.com/service/local/-activeMQVersion = 2.42.0+activeMQVersion = 2.44.0jbossLoggingManagerVersion=2.1.19.FinalgreenmailVersion=2.1.2prometheusVersion=1.4.3diff --git a/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java b/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.javaindex cad228d37..76ed95936 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java@@ -44,7 +44,7 @@ import java.util.function.Function;import java.util.logging.Level;import java.util.logging.Logger;-import static org.apache.activemq.artemis.core.remoting.CertificateUtil.getCertsFromConnection;+import static org.apache.activemq.artemis.utils.CertificateUtil.getCertsFromConnection;import static org.openremote.manager.mqtt.MQTTBrokerService.connectionToString;import static org.openremote.model.syslog.SyslogCategory.API;diff --git a/manager/src/main/java/org/openremote/manager/security/MultiTenantJaasCallbackHandler.java b/manager/src/main/java/org/openremote/manager/security/MultiTenantJaasCallbackHandler.javaindex 79b65899d..774bd89b4 100644--- a/manager/src/main/java/org/openremote/manager/security/MultiTenantJaasCallbackHandler.java+++ b/manager/src/main/java/org/openremote/manager/security/MultiTenantJaasCallbackHandler.java@@ -33,8 +33,8 @@ import java.security.Principal;import java.util.Set;import java.util.function.Function;-import static org.apache.activemq.artemis.core.remoting.CertificateUtil.getCertsFromConnection;-import static org.apache.activemq.artemis.core.remoting.CertificateUtil.getPeerPrincipalFromConnection;+import static org.apache.activemq.artemis.utils.CertificateUtil.getCertsFromConnection;+import static org.apache.activemq.artemis.utils.CertificateUtil.getPeerPrincipalFromConnection;/*** A version of {@link JaasCallbackHandler} that supports multi-tenancy by introducing support for