Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Upgrade Artemis to 2.44.0 (#2412)

Eric Bariaux805abaca652e
diff --git a/gradle.properties b/gradle.properties
index e88dacc45..0b2fc2ad2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -62,7 +62,7 @@ failsafeVersion=3.3.2
suncalcVersion=3.11
snapshotsRepoUrl=https://central.sonatype.com/repository/maven-snapshots/
releasesRepoUrl=https://ossrh-staging-api.central.sonatype.com/service/local/
-activeMQVersion = 2.42.0
+activeMQVersion = 2.44.0
jbossLoggingManagerVersion=2.1.19.Final
greenmailVersion=2.1.2
prometheusVersion=1.4.3
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java b/manager/src/main/java/org/openremote/manager/mqtt/ActiveMQORSecurityManager.java
index 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.java
index 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