diff --git a/build.gradle b/build.gradle index 6fd3227fac..189c265727 100644 --- a/build.gradle +++ b/build.gradle @@ -230,11 +230,11 @@ subprojects { resolutionStrategy.eachDependency { def details -> if (details.requested.group == 'io.netty') { if (details.requested.name == 'netty') { - details.useTarget group: 'io.netty', name: 'netty-all', version: '4.1.124.Final' - details.because 'Fixes CVE-2025-24970, CVE-2022-41881, CVE-2021-21290 and CVE-2022-41915.' + details.useTarget group: 'io.netty', name: 'netty-all', version: '4.2.7.Final' + details.because 'Required for Armeria 1.34.2 compatibility (needs Netty 4.2.x APIs).' } else if (!details.requested.name.startsWith('netty-tcnative')) { - details.useVersion '4.1.125.Final' - 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.' + details.useVersion '4.2.7.Final' + details.because 'Required for Armeria 1.34.2 compatibility (needs Netty 4.2.x APIs).' } } else if (details.requested.group == 'log4j' && details.requested.name == 'log4j') { details.useTarget group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.17.1' @@ -278,7 +278,7 @@ subprojects { configure(subprojects.findAll {it.name != 'data-prepper-api'}) { dependencies { - implementation platform('software.amazon.awssdk:bom:2.30.23') + implementation platform('software.amazon.awssdk:bom:2.41.5') implementation 'jakarta.validation:jakarta.validation-api:3.0.2' } } diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java index 412e4c4d81..f5a1047c0f 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java @@ -20,7 +20,6 @@ import io.micrometer.core.instrument.step.StepMeterRegistry; import io.micrometer.core.instrument.util.NamedThreadFactory; import io.micrometer.core.instrument.util.StringUtils; -import io.micrometer.core.lang.Nullable; import io.micrometer.core.util.internal.logging.WarnThenDebugLogger; import software.amazon.cloudwatchlogs.emf.environment.Environment; import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider; @@ -28,6 +27,7 @@ import software.amazon.cloudwatchlogs.emf.model.DimensionSet; import software.amazon.cloudwatchlogs.emf.model.Unit; +import javax.annotation.Nullable; import java.time.Instant; import java.util.Collections; import java.util.HashMap; diff --git a/data-prepper-plugins/dynamodb-source-coordination-store/src/test/java/org/opensearch/dataprepper/plugins/sourcecoordinator/dynamodb/DynamoDbClientWrapperTest.java b/data-prepper-plugins/dynamodb-source-coordination-store/src/test/java/org/opensearch/dataprepper/plugins/sourcecoordinator/dynamodb/DynamoDbClientWrapperTest.java index 715a2ae4e8..8dbd518e34 100644 --- a/data-prepper-plugins/dynamodb-source-coordination-store/src/test/java/org/opensearch/dataprepper/plugins/sourcecoordinator/dynamodb/DynamoDbClientWrapperTest.java +++ b/data-prepper-plugins/dynamodb-source-coordination-store/src/test/java/org/opensearch/dataprepper/plugins/sourcecoordinator/dynamodb/DynamoDbClientWrapperTest.java @@ -70,6 +70,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockStatic; import static org.mockito.Mockito.never; @@ -842,7 +843,7 @@ void tryDeletePartition_item_success_calls_delete_on_correct_item() throws NoSuc @Test void tryDeletePartition_with_exception_throws_PartitionUpdateException() throws NoSuchFieldException, IllegalAccessException { final DynamoDbTable table = mock(DynamoDbTable.class); - when(table.deleteItem(any(DeleteItemEnhancedRequest.class))).thenThrow(RuntimeException.class); + lenient().when(table.deleteItem(any(DeleteItemEnhancedRequest.class))).thenThrow(RuntimeException.class); final DynamoDbClientWrapper objectUnderTest = createObjectUnderTest(); diff --git a/settings.gradle b/settings.gradle index f161e8c7d5..7b307ea904 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,7 +30,7 @@ dependencyResolutionManagement { libs { version('slf4j', '2.0.6') library('slf4j-api', 'org.slf4j', 'slf4j-api').versionRef('slf4j') - version('armeria', '1.32.5') + version('armeria', '1.34.2') library('armeria-core', 'com.linecorp.armeria', 'armeria').versionRef('armeria') library('armeria-grpc', 'com.linecorp.armeria', 'armeria-grpc').versionRef('armeria') library('armeria-junit', 'com.linecorp.armeria', 'armeria-junit5').versionRef('armeria') @@ -66,7 +66,7 @@ dependencyResolutionManagement { library('parquet-avro', 'org.apache.parquet', 'parquet-avro').versionRef('parquet') library('parquet-column', 'org.apache.parquet', 'parquet-column').versionRef('parquet') library('parquet-hadoop', 'org.apache.parquet', 'parquet-hadoop').versionRef('parquet') - version('hadoop', '3.4.0') + version('hadoop', '3.4.2') library('hadoop-common', 'org.apache.hadoop', 'hadoop-common').versionRef('hadoop') library('hadoop-mapreduce', 'org.apache.hadoop', 'hadoop-mapreduce-client-core').versionRef('hadoop') version('avro', '1.11.4')