Update dependencies (#1848)

Update hermes dependencies

build.gradle

@@ -49,26 +49,27 @@ allprojects {
 
     project.ext.versions = [
             kafka             : '3.6.2',
-            guava             : '23.0',
-            jackson           : '2.15.2',
-            jersey            : '3.1.2',
-            jetty             : '12.0.7',
+            guava             : '33.1.0-jre',
+            jackson           : '2.17.0',
+            jersey            : '3.1.6',
+            jetty             : '12.0.8',
             curator           : '5.4.0',
-            dropwizard_metrics: '4.1.0',
-            micrometer_metrics: '1.11.1',
-            wiremock          : '3.3.1',
-            spock             : '2.4-M1-groovy-4.0',
-            groovy            : '4.0.12',
-            avro              : '1.9.1',
+            dropwizard_metrics: '4.2.25',
+            micrometer_metrics: '1.12.5',
+            wiremock          : '3.5.2',
+            spock             : '2.4-M4-groovy-4.0',
+            groovy            : '4.0.21',
+            avro              : '1.11.3',
             json2avro         : '0.2.14',
+            // TODO: newest version requires subject alternative name in a certificate during host verification, current test cert does not have a one
             okhttp            : '3.9.1',
-            undertow          : '2.0.29.Final',
-            spring_web        : '6.1.2',
-            failsafe          : '2.3.1',
-            junit_jupiter     : '5.9.1',
+            undertow          : '2.3.12.Final',
+            spring_web        : '6.1.6',
+            failsafe          : '2.4.4',
+            junit_jupiter     : '5.10.2',
             testcontainers    : '1.19.8',
-            spring            : '3.2.1',
-            assertj           : '3.24.2'
+            spring            : '3.2.4',
+            assertj           : '3.25.3'
     ]
 
     repositories {
@@ -77,15 +78,14 @@ allprojects {
 
     dependencies {
         implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.4'
-        implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
+        implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
 
         testImplementation group: 'junit', name: 'junit', version: '4.11'
         testImplementation group: 'com.tngtech.java', name: 'junit-dataprovider', version: '1.10.0'
         testImplementation group: 'pl.pragmatists', name: 'JUnitParams', version: '1.0.2'
-        testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.9.5'
+        testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.11.0'
         testImplementation group: 'org.assertj', name: 'assertj-core', version: versions.assertj
-        testImplementation group: 'com.jayway.awaitility', name: 'awaitility', version: '1.6.1'
-        testImplementation group: 'com.googlecode.catch-exception', name: 'catch-exception', version: '1.2.0'
+        testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.2.1'
 
         annotationProcessor group: 'org.springframework.boot', name: 'spring-boot-configuration-processor', version: versions.spring
     }

hermes-api/build.gradle

@@ -4,19 +4,19 @@ plugins {
 }
 
 dependencies {
-    api group: 'org.hibernate.validator', name: 'hibernate-validator', version: '8.0.0.Final'
+    api group: 'org.hibernate.validator', name: 'hibernate-validator', version: '8.0.1.Final'
 
     api group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '3.1.0'
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: versions.jackson
     api group: 'com.fasterxml.jackson.jakarta.rs', name: 'jackson-jakarta-rs-json-provider', version: versions.jackson
     api group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: versions.jackson
     implementation group: 'com.google.guava', name: 'guava', version: versions.guava
-    api group: 'com.damnhandy', name: 'handy-uri-templates', version: '2.0.2'
+    api group: 'com.damnhandy', name: 'handy-uri-templates', version: '2.1.8'
     api group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '4.0.0'
 
-    implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '4.0.3'
-    implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '4.0.3'
-    implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '2.1.1'
+    implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '4.0.5'
+    implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '4.0.5'
+    implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '3.0.0'
 
 
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock

hermes-benchmark/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'me.champeau.jmh' version '0.6.8'
+    id 'me.champeau.jmh' version '0.7.2'
 }
 
 configurations {
@@ -26,10 +26,9 @@ jmh {
 }
 
 dependencies {
-    jmh group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.12'
-    jmh group: 'org.openjdk.jmh', name: 'jmh-generator-annprocess', version: '1.12'
-    jmh group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.1'
-    jmh group: 'org.spf4j', name: 'spf4j-jmh', version: '8.0.3'
+    jmh group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.37'
+    jmh group: 'org.openjdk.jmh', name: 'jmh-generator-annprocess', version: '1.37'
+    jmh group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.5'
     jmh project(':hermes-frontend')
     jmh project(':hermes-test-helper')
     jmh project(':hermes-common')

hermes-client/build.gradle

@@ -11,13 +11,13 @@ dependencies {
     compileOnly group: 'com.squareup.okhttp3', name: 'okhttp', version: versions.okhttp
 
     implementation group: 'net.jodah', name: 'failsafe', version: versions.failsafe
-    api group: 'io.projectreactor', name: 'reactor-core', version: '3.4.25'
+    api group: 'io.projectreactor', name: 'reactor-core', version: '3.6.5'
 
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.spockframework', name: 'spock-junit4', version: versions.spock
     testImplementation group: 'org.wiremock', name: 'wiremock-standalone', version: versions.wiremock
-    testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
-    testImplementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.5.0'
+    testImplementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.0.0'
+    testImplementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.9.0'
 
     testImplementation group: 'io.micrometer', name: 'micrometer-core', version: versions.micrometer_metrics
     testImplementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: versions.jersey
@@ -26,6 +26,6 @@ dependencies {
     testImplementation group: 'org.springframework', name: 'spring-context', version: versions.spring_web
     testImplementation group: 'org.springframework', name: 'spring-webflux', version: versions.spring_web
     testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: versions.okhttp
-    testImplementation group: 'io.projectreactor.netty', name: 'reactor-netty', version: '1.0.25'
-    testImplementation group: 'io.projectreactor', name: 'reactor-test', version: '3.4.25'
+    testImplementation group: 'io.projectreactor.netty', name: 'reactor-netty', version: '1.1.18'
+    testImplementation group: 'io.projectreactor', name: 'reactor-test', version: '3.6.5'
 }

hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesClientMicrometerTaggedMetricsTest.groovy

@@ -7,7 +7,6 @@ import pl.allegro.tech.hermes.client.metrics.MicrometerTaggedMetricsProvider
 import spock.lang.Specification
 
 import java.time.Duration
-import java.time.temporal.ChronoUnit
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
 
@@ -31,8 +30,8 @@ class HermesClientMicrometerTaggedMetricsTest extends Specification {
         then:
         metrics.counter("hermes-client.status", "code", String.valueOf(201), "topic", "com_group.topic").count() == 1
         def timer = metrics.timer("hermes-client.latency", "topic", "com_group.topic")
-        timer.totalTime(TimeUnit.NANOSECONDS) >= Duration.ofMillis(100).get(ChronoUnit.NANOS)
-        timer.totalTime(TimeUnit.NANOSECONDS) < Duration.ofMillis(500).get(ChronoUnit.NANOS)
+        timer.totalTime(TimeUnit.NANOSECONDS) >= Duration.ofMillis(100).toNanos()
+        timer.totalTime(TimeUnit.NANOSECONDS) < Duration.ofMillis(1000).toNanos()
     }
 
     def "should close timer on exceptional completion and log failure metric"() {

hermes-common/build.gradle

@@ -25,21 +25,21 @@ dependencies {
     api group: 'tech.allegro.schema.json2avro', name: 'converter', version: versions.json2avro
 
     api group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
-    implementation group: 'commons-codec', name: 'commons-codec', version: '1.9'
+    implementation group: 'commons-codec', name: 'commons-codec', version: '1.16.1'
     implementation group: 'com.google.guava', name: 'guava', version: versions.guava
 
     api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: versions.jackson
     api group: 'org.apache.avro', name: 'avro', version: versions.avro
-    api group: 'com.jayway.jsonpath', name: 'json-path', version: '2.5.0'
+    api group: 'com.jayway.jsonpath', name: 'json-path', version: '2.9.0'
 
     implementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: versions.dropwizard_metrics
 
-    implementation group: 'com.google.code.findbugs', name: 'annotations', version: '3.0.0'
+    implementation group: 'com.google.code.findbugs', name: 'annotations', version: '3.0.1'
     api group: 'io.micrometer', name: 'micrometer-core', version: versions.micrometer_metrics
     api group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: versions.micrometer_metrics
 
-    implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: '2.0.4'
-    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.7'
+    implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: '2.0.13'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.14'
     api(group: 'org.apache.kafka', name: 'kafka-clients', version: versions.kafka) {
         exclude group: 'net.sf.jopt-simple'
     }
@@ -48,12 +48,10 @@ dependencies {
 
     testImplementation project(':hermes-test-helper')
 
-    testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
+    testImplementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.0.0'
 
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.spockframework', name: 'spock-junit4', version: versions.spock
-    testImplementation (group: 'com.jayway.awaitility', name: 'awaitility-groovy', version: '1.7.0') {
-        exclude group: 'org.codehaus.groovy', module: 'groovy-all'
-    }
+    testImplementation group: 'org.awaitility', name: 'awaitility-groovy', version: '4.2.1'
     testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: versions.junit_jupiter
 }

hermes-common/src/main/java/pl/allegro/tech/hermes/common/message/converter/AvroBinaryDecoders.java

@@ -5,7 +5,7 @@
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.io.BinaryDecoder;
 import org.apache.avro.io.DecoderFactory;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import tech.allegro.schema.json2avro.converter.AvroConversionException;
 
 import java.io.ByteArrayInputStream;

hermes-common/src/main/java/pl/allegro/tech/hermes/domain/filtering/avro/AvroPathPredicate.java

@@ -1,5 +1,6 @@
 package pl.allegro.tech.hermes.domain.filtering.avro;
 
+import jakarta.annotation.Nullable;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericArray;
 import org.apache.avro.generic.GenericRecord;
@@ -26,7 +27,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyListIterator;
 import static java.util.Collections.singletonList;
-import static org.apache.commons.lang.StringUtils.strip;
+import static org.apache.commons.lang3.StringUtils.strip;
 import static pl.allegro.tech.hermes.common.message.converter.AvroRecordToBytesConverter.bytesToRecord;
 import static pl.allegro.tech.hermes.domain.filtering.FilteringException.check;
 
@@ -62,7 +63,7 @@ public boolean test(final FilterableMessage message) {
     }
 
     private List<Object> select(final FilterableMessage message) throws IOException {
-        CompiledSchema<Schema> compiledSchema = message.<Schema>getSchema().get();
+        CompiledSchema<Schema> compiledSchema = message.getSchema().get();
         return select(bytesToRecord(message.getData(), compiledSchema.getSchema()));
     }
 
@@ -82,7 +83,7 @@ private List<Object> select(Object record, ListIterator<String> iter) {
                 if (arrayMatcher.matches()) {
                     selector = arrayMatcher.group(GROUP_SELECTOR);
 
-                    current = currentRecord.get(selector);
+                    current = recordFieldValueOrNull(selector, currentRecord);
                     if (!(current instanceof GenericArray)) {
                         return emptyList();
                     }
@@ -97,7 +98,7 @@ private List<Object> select(Object record, ListIterator<String> iter) {
                     }
 
                 } else {
-                    current = currentRecord.get(selector);
+                    current = recordFieldValueOrNull(selector, currentRecord);
                 }
             } else if (current instanceof HashMap) {
                 Map<Utf8, Object> currentRecord = (HashMap<Utf8, Object>) current;
@@ -115,9 +116,9 @@ private boolean isSupportedType(Object record) {
 
     private List<Object> selectMultipleArrayItems(ListIterator<String> iter, GenericArray<Object> currentArray) {
         return currentArray.stream()
-            .map(item -> select(item, iter.hasNext() ? path.listIterator(iter.nextIndex()) : emptyListIterator()))
-            .flatMap(List::stream)
-            .collect(Collectors.toList());
+                .map(item -> select(item, iter.hasNext() ? path.listIterator(iter.nextIndex()) : emptyListIterator()))
+                .flatMap(List::stream)
+                .collect(Collectors.toList());
     }
 
     private Object selectSingleArrayItem(int idx, GenericArray<Object> currentArray) {
@@ -139,6 +140,15 @@ private boolean matchResultsStream(Stream<String> results) {
         }
     }
 
+    @Nullable
+    private Object recordFieldValueOrNull(String selector, GenericRecord record) {
+        Schema.Field field = record.getSchema().getField(selector);
+        if (field == null) {
+            return null;
+        }
+        return record.get(field.pos());
+    }
+
     private boolean matches(String value) {
         return pattern.matcher(value).matches();
     }

hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperBasedRepository.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;

hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperPaths.java

@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper;
 
 import com.google.common.base.Joiner;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import pl.allegro.tech.hermes.api.Subscription;
 import pl.allegro.tech.hermes.api.SubscriptionName;
 import pl.allegro.tech.hermes.api.TopicName;

hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/cache/HierarchicalCacheLevel.java

@@ -1,6 +1,6 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper.cache;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;

hermes-common/src/main/java/pl/allegro/tech/hermes/infrastructure/zookeeper/notifications/ZookeeperInternalNotificationBus.java

@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.infrastructure.zookeeper.notifications;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.curator.framework.recipes.cache.ChildData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsCacheTest.groovy

@@ -5,6 +5,7 @@ import ch.qos.logback.classic.Logger
 import ch.qos.logback.classic.spi.ILoggingEvent
 import ch.qos.logback.core.read.ListAppender
 import com.fasterxml.jackson.databind.ObjectMapper
+import org.awaitility.Awaitility
 import org.slf4j.LoggerFactory
 import pl.allegro.tech.hermes.api.Constraints
 import pl.allegro.tech.hermes.api.SubscriptionName
@@ -14,8 +15,8 @@ import pl.allegro.tech.hermes.test.IntegrationTest
 
 import java.util.concurrent.TimeUnit
 
-import static com.jayway.awaitility.Awaitility.await
 import static java.util.Collections.emptyMap
+import static org.awaitility.Awaitility.await
 
 class ZookeeperWorkloadConstraintsCacheTest extends IntegrationTest {
 

hermes-common/src/test/groovy/pl/allegro/tech/hermes/infrastructure/zookeeper/ZookeeperWorkloadConstraintsRepositoryTest.groovy

@@ -2,6 +2,7 @@ package pl.allegro.tech.hermes.infrastructure.zookeeper
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.apache.zookeeper.KeeperException
+import org.awaitility.Awaitility
 import pl.allegro.tech.hermes.api.SubscriptionName
 import pl.allegro.tech.hermes.api.TopicName
 import pl.allegro.tech.hermes.api.Constraints
@@ -13,7 +14,8 @@ import pl.allegro.tech.hermes.test.IntegrationTest
 
 import java.util.concurrent.TimeUnit
 
-import static com.jayway.awaitility.Awaitility.await
+import static org.awaitility.Awaitility.await
+
 
 class ZookeeperWorkloadConstraintsRepositoryTest extends IntegrationTest {