Skip to content

Commit 3a23f06

Browse files
committed
Update Ameria to 1.34.1
Fixes #6271 since the current Ameria version is affected by a couple of bugs (see comment #6271 (comment)). To support the ameria update update Netty to 4.2.7. Furthermore, the new armeria version brings in Micrometer 1.16.0 as transitive dependency, which deprecates the io.micrometer.core.lang annotations - see release notes: https://github.com/micrometer-metrics/micrometer/releases/tag/v1.16.0. Signed-off-by: Jannik Brand <jannik.brand@sap.com>
1 parent 72a85f5 commit 3a23f06

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,11 @@ subprojects {
230230
resolutionStrategy.eachDependency { def details ->
231231
if (details.requested.group == 'io.netty') {
232232
if (details.requested.name == 'netty') {
233-
details.useTarget group: 'io.netty', name: 'netty-all', version: '4.1.124.Final'
234-
details.because 'Fixes CVE-2025-24970, CVE-2022-41881, CVE-2021-21290 and CVE-2022-41915.'
233+
details.useTarget group: 'io.netty', name: 'netty-all', version: '4.2.7.Final'
234+
details.because 'Required for Armeria 1.34.1 compatibility (needs Netty 4.2.x APIs).'
235235
} else if (!details.requested.name.startsWith('netty-tcnative')) {
236-
details.useVersion '4.1.125.Final'
237-
details.because 'Fixes CVE-2025-58057, CVE-2025-58056, CVE-2025-55163, CVE-2025-24970, CVE-2022-41881, CVE-2021-21290 and CVE-2022-41915.'
236+
details.useVersion '4.2.7.Final'
237+
details.because 'Required for Armeria 1.34.1 compatibility (needs Netty 4.2.x APIs).'
238238
}
239239
} else if (details.requested.group == 'log4j' && details.requested.name == 'log4j') {
240240
details.useTarget group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.17.1'

data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
import io.micrometer.core.instrument.step.StepMeterRegistry;
2121
import io.micrometer.core.instrument.util.NamedThreadFactory;
2222
import io.micrometer.core.instrument.util.StringUtils;
23-
import io.micrometer.core.lang.Nullable;
2423
import io.micrometer.core.util.internal.logging.WarnThenDebugLogger;
2524
import software.amazon.cloudwatchlogs.emf.environment.Environment;
2625
import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider;
2726
import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
2827
import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
2928
import software.amazon.cloudwatchlogs.emf.model.Unit;
3029

30+
import javax.annotation.Nullable;
3131
import java.time.Instant;
3232
import java.util.Collections;
3333
import java.util.HashMap;

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencyResolutionManagement {
3030
libs {
3131
version('slf4j', '2.0.6')
3232
library('slf4j-api', 'org.slf4j', 'slf4j-api').versionRef('slf4j')
33-
version('armeria', '1.32.5')
33+
version('armeria', '1.34.1')
3434
library('armeria-core', 'com.linecorp.armeria', 'armeria').versionRef('armeria')
3535
library('armeria-grpc', 'com.linecorp.armeria', 'armeria-grpc').versionRef('armeria')
3636
library('armeria-junit', 'com.linecorp.armeria', 'armeria-junit5').versionRef('armeria')

0 commit comments

Comments
 (0)