Skip to content

armgit / core

Public Imported from GitHub
0

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

Update dependencies (#2732)

Eric Bariaux68f3e232fc8f
diff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
index 44cba4558..29d34f02e 100644
--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
@@ -52,6 +52,7 @@ import org.openremote.model.util.TextUtil;
import javax.security.auth.Subject;
import java.net.URI;
import java.security.Principal;
+import java.time.Duration;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@@ -61,7 +62,6 @@ import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.Logger;
-import static java.util.concurrent.TimeUnit.MINUTES;
import static org.openremote.model.Constants.*;
import static org.openremote.model.util.MapAccess.getInteger;
import static org.openremote.model.util.MapAccess.getString;
@@ -368,7 +368,7 @@ public abstract class KeycloakIdentityProvider implements IdentityProvider {
// TODO configurable? Or replace all of this with Observable.cache()?
return CacheBuilder.newBuilder()
.maximumSize(500)
- .expireAfterWrite(10, MINUTES)
+ .expireAfterWrite(Duration.ofMinutes(10))
.build(loader);
}
diff --git a/gradle.properties b/gradle.properties
index 4f50cc4a8..3c4024a7a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,25 +12,25 @@ jaxrsSpecVersion = 3.1.0
javaxAnnotationsVersion = 3.0.0
javaxELAPIVersion = 6.0.1
javaxELVersion = 4.0.2
-slf4jVersion = 2.0.6
-guavaVersion = 33.5.0-jre
+slf4jVersion = 2.0.17
+guavaVersion = 33.6.0-jre
checkerframeworkVersion = 3.55.1
-undertowVersion = 2.3.22.Final
-resteasyVersion = 6.2.15.Final
+undertowVersion = 2.3.24.Final
+resteasyVersion = 6.2.16.Final
keycloakVersion = 25.0.3
classgraphVersion=4.8.184
-jacksonVersion = 2.21.2
+jacksonVersion = 2.21.3
groovyVersion = 4.0.24
-groovySandboxVersion = 4.2.2
-sqliteVersion = 3.51.3.0
-hibernateVersion = 7.3.1.Final
+groovySandboxVersion = 4.3.2
+sqliteVersion = 3.53.0.0
+hibernateVersion = 7.3.3.Final
hibernateValidatorVersion = 9.1.0.Final
hikaricpVersion = 6.2.1
-postgresJdbcVersion = 42.7.8
+postgresJdbcVersion = 42.7.11
spockVersion = 2.4-M5-groovy-4.0
byteBuddyVersion = 1.16.1
objenesisVersion = 3.4
-camelVersion = 4.18.1
+camelVersion = 4.20.0
easyRulesVersion = 4.1.0
quartzVersion= 2.5.2
calimeroVersion = 2.6
@@ -52,9 +52,9 @@ californiumScandiumVersion = 3.14.0
zwaveVersion = 3.4.0
niftyModbusVersion = 0.17.0
reflectionsVersion=0.10.2
-swaggerVersion=2.2.47
+swaggerVersion=2.2.49
swaggeruiVersion = 5.18.2
-hiveMQClientVersion=1.3.10
+hiveMQClientVersion=1.3.13
bluetoothVersion = 0.64
failsafeVersion=3.3.2
suncalcVersion=3.11
@@ -63,8 +63,8 @@ releasesRepoUrl=https://ossrh-staging-api.central.sonatype.com/service/local/
artemisVersion = 2.53.0
jbossLoggingManagerVersion=2.1.19.Final
greenmailVersion=2.1.2
-prometheusVersion=1.5.1
-micrometerVersion=1.16.4
+prometheusVersion=1.6.1
+micrometerVersion=1.16.5
jdomVersion = 2.0.6.1
apacheMINAVersion = 2.16.0
bouncyCastleVersion = 1.81
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java
index a89f245dd..18fcc7a8e 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/DefaultMQTTHandler.java
@@ -42,12 +42,12 @@ import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.ValueUtil;
import java.nio.charset.StandardCharsets;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.logging.Level;
@@ -76,13 +76,13 @@ public class DefaultMQTTHandler extends MQTTHandler {
// TODO: Switch to caffeine library once ActiveMQ has migrated
protected final Cache<String, ConcurrentHashSet<String>> authorizationCache = CacheBuilder.newBuilder()
.maximumSize(100000)
- .expireAfterWrite(300000, TimeUnit.MILLISECONDS)
+ .expireAfterWrite(Duration.ofMillis(300000))
.build();
// Intermediary cache for authorized event subscriptions created during the canSubscribe method to be used later in the onSubscribe method
protected final Cache<String, EventSubscription<?>> eventSubscriptionCache = CacheBuilder.newBuilder()
- .expireAfterWrite(30000, TimeUnit.MILLISECONDS)
+ .expireAfterWrite(Duration.ofMillis(30000))
.build();
@Override
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java
index b28911379..882b23e29 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/MQTTBrokerService.java
@@ -84,11 +84,11 @@ import org.openremote.model.util.UniqueIdentifierGenerator;
import javax.security.auth.Subject;
import javax.security.auth.login.AppConfigurationEntry;
import java.security.Principal;
+import java.time.Duration;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static java.lang.System.Logger.Level.*;
@@ -160,7 +160,7 @@ public class MQTTBrokerService extends RouteBuilder implements ContainerService,
// This allows last will messages to be processed
disconnectedConnectionCache = CacheBuilder.newBuilder()
.maximumSize(10000)
- .expireAfterWrite(3000, TimeUnit.MILLISECONDS)
+ .expireAfterWrite(Duration.ofMillis(3000))
.build();
if (!identityService.isKeycloakEnabled()) {