From 6692086045efe1b0d2762f26fe119a6df409eefd Mon Sep 17 00:00:00 2001 From: Peter Nied Date: Thu, 9 May 2024 22:09:22 +0000 Subject: [PATCH] Switch depedencies to API type so they are applied in test cases as well Signed-off-by: Peter Nied --- .../jsonJoltMessageTransformer/build.gradle | 1 + .../trafficCaptureDependencies/build.gradle | 98 +++++++++---------- .../trafficCaptureProxyServer/build.gradle | 2 + 3 files changed, 52 insertions(+), 49 deletions(-) diff --git a/TrafficCapture/replayerPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/build.gradle b/TrafficCapture/replayerPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/build.gradle index fcbd83e08..366e39c0f 100644 --- a/TrafficCapture/replayerPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/build.gradle +++ b/TrafficCapture/replayerPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/build.gradle @@ -9,6 +9,7 @@ plugins { } dependencies { + implementation project(":trafficCaptureDependencies") implementation project(':replayerPlugins:jsonMessageTransformers:jsonMessageTransformerInterface') implementation group: 'com.bazaarvoice.jolt', name: 'jolt-core' diff --git a/TrafficCapture/trafficCaptureDependencies/build.gradle b/TrafficCapture/trafficCaptureDependencies/build.gradle index a1b4ed40c..e8f5c9e0d 100644 --- a/TrafficCapture/trafficCaptureDependencies/build.gradle +++ b/TrafficCapture/trafficCaptureDependencies/build.gradle @@ -6,91 +6,91 @@ dependencies { constraints { def netty = '4.1.108.Final' - implementation group: 'io.netty', name: 'netty-buffer', version: netty - implementation group: 'io.netty', name: 'netty-codec-http', version: netty - implementation group: 'io.netty', name: 'netty-handler', version: netty - implementation group: 'io.netty', name: 'netty-all', version: netty + api group: 'io.netty', name: 'netty-buffer', version: netty + api group: 'io.netty', name: 'netty-codec-http', version: netty + api group: 'io.netty', name: 'netty-handler', version: netty + api group: 'io.netty', name: 'netty-all', version: netty - implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.13' + api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.13' - implementation group: 'com.google.guava', name: 'guava', version: '32.0.1-jre' + api group: 'com.google.guava', name: 'guava', version: '32.0.1-jre' - implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.22.2' + api group: 'com.google.protobuf', name: 'protobuf-java', version: '3.22.2' - implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2.1' + api group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2.1' - implementation group: 'software.amazon.msk', name:'aws-msk-iam-auth', version: '2.0.3' + api group: 'software.amazon.msk', name:'aws-msk-iam-auth', version: '2.0.3' def log4j = '2.23.1' - implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4j - implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j - implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: log4j + api group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4j + api group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j + api group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: log4j - implementation group: 'org.projectlombok', name:'lombok', version:'1.18.26' + api group: 'org.projectlombok', name:'lombok', version:'1.18.26' - implementation group: 'org.apache.kafka', name:'kafka-clients', version:'3.6.0' + api group: 'org.apache.kafka', name:'kafka-clients', version:'3.6.0' - implementation group: 'com.google.protobuf', name: 'protoc', version: '3.22.2' + api group: 'com.google.protobuf', name: 'protoc', version: '3.22.2' def jmeter = '5.6.3' - implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_core', version: jmeter - implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_http', version: jmeter - implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_config', version: jmeter + api group: 'org.apache.jmeter', name: 'ApacheJMeter_core', version: jmeter + api group: 'org.apache.jmeter', name: 'ApacheJMeter_http', version: jmeter + api group: 'org.apache.jmeter', name: 'ApacheJMeter_config', version: jmeter - implementation group: 'com.beust', name: 'jcommander', version: '1.82' + api group: 'com.beust', name: 'jcommander', version: '1.82' - implementation group: 'org.projectlombok', name: 'lombok', version: '1.18.28' + api group: 'org.projectlombok', name: 'lombok', version: '1.18.28' def resilience4j = '1.7.0' - implementation group: 'io.github.resilience4j', name: 'resilience4j-ratelimiter', version: resilience4j - implementation group: 'io.github.resilience4j', name: 'resilience4j-retry', version: resilience4j + api group: 'io.github.resilience4j', name: 'resilience4j-ratelimiter', version: resilience4j + api group: 'io.github.resilience4j', name: 'resilience4j-retry', version: resilience4j def jackson = '2.16.2' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jackson - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-smile', version: jackson + api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jackson + api group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-smile', version: jackson def jupiter = '5.9.3' - implementation group: 'org.junit.jupiter', name:'junit-jupiter-api', version: jupiter - implementation group: 'org.junit.jupiter', name:'junit-jupiter-params', version: jupiter - implementation group: 'org.junit.jupiter', name:'junit-jupiter-engine', version: jupiter + api group: 'org.junit.jupiter', name:'junit-jupiter-api', version: jupiter + api group: 'org.junit.jupiter', name:'junit-jupiter-params', version: jupiter + api group: 'org.junit.jupiter', name:'junit-jupiter-engine', version: jupiter - implementation group: 'io.burt', name: 'jmespath-core', version: '0.6.0' + api group: 'io.burt', name: 'jmespath-core', version: '0.6.0' - implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.26.0' + api group: 'org.apache.commons', name: 'commons-compress', version: '1.26.0' def awssdk = '2.25.19' - implementation group: 'software.amazon.awssdk', name: 'arns', version: awssdk - implementation group: 'software.amazon.awssdk', name: 'auth', version: awssdk - implementation group: 'software.amazon.awssdk', name: 'sdk-core', version: awssdk - implementation group: 'software.amazon.awssdk', name: 'secretsmanager', version: awssdk + api group: 'software.amazon.awssdk', name: 'arns', version: awssdk + api group: 'software.amazon.awssdk', name: 'auth', version: awssdk + api group: 'software.amazon.awssdk', name: 'sdk-core', version: awssdk + api group: 'software.amazon.awssdk', name: 'secretsmanager', version: awssdk - implementation group: 'com.bazaarvoice.jolt', name: 'jolt-core', version: '0.1.7' + api group: 'com.bazaarvoice.jolt', name: 'jolt-core', version: '0.1.7' def opentelemetry = '1.34.1' - implementation group: 'io.opentelemetry', name: 'opentelemetry-api', version: opentelemetry - implementation group: 'io.opentelemetry', name: 'opentelemetry-exporter-otlp', version: opentelemetry - implementation group: 'io.opentelemetry', name: 'opentelemetry-sdk', version: opentelemetry - implementation group: 'io.opentelemetry', name: 'opentelemetry-sdk-testing', version: opentelemetry + api group: 'io.opentelemetry', name: 'opentelemetry-api', version: opentelemetry + api group: 'io.opentelemetry', name: 'opentelemetry-exporter-otlp', version: opentelemetry + api group: 'io.opentelemetry', name: 'opentelemetry-sdk', version: opentelemetry + api group: 'io.opentelemetry', name: 'opentelemetry-sdk-testing', version: opentelemetry - implementation group: 'io.opentelemetry.semconv', name: 'opentelemetry-semconv', version: '1.23.1-alpha' + api group: 'io.opentelemetry.semconv', name: 'opentelemetry-semconv', version: '1.23.1-alpha' - implementation group: 'com.lmax', name: 'disruptor', version: '4.0.0' + api group: 'com.lmax', name: 'disruptor', version: '4.0.0' def bouncycastle = '1.78' - implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: bouncycastle - implementation group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: bouncycastle + api group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: bouncycastle + api group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: bouncycastle def testcontainers = '1.19.7' - implementation group: 'org.testcontainers', name: 'junit-jupiter', version: testcontainers - implementation group: 'org.testcontainers', name: 'kafka', version: testcontainers - implementation group: 'org.testcontainers', name: 'testcontainers', version: testcontainers - implementation group: 'org.testcontainers', name: 'toxiproxy', version: testcontainers + api group: 'org.testcontainers', name: 'junit-jupiter', version: testcontainers + api group: 'org.testcontainers', name: 'kafka', version: testcontainers + api group: 'org.testcontainers', name: 'testcontainers', version: testcontainers + api group: 'org.testcontainers', name: 'toxiproxy', version: testcontainers def mockito = '4.6.1' - implementation group: 'org.mockito', name:'mockito-core', version: mockito - implementation group: 'org.mockito', name:'mockito-junit-jupiter', version: mockito + api group: 'org.mockito', name:'mockito-core', version: mockito + api group: 'org.mockito', name:'mockito-junit-jupiter', version: mockito - implementation group: 'eu.rekawek.toxiproxy', name: 'toxiproxy-java', version: '2.1.7' + api group: 'eu.rekawek.toxiproxy', name: 'toxiproxy-java', version: '2.1.7' // ************************************************************ // The following constraints are for mitigating transitive CVEs diff --git a/TrafficCapture/trafficCaptureProxyServer/build.gradle b/TrafficCapture/trafficCaptureProxyServer/build.gradle index 6645138d7..fdb665b3e 100644 --- a/TrafficCapture/trafficCaptureProxyServer/build.gradle +++ b/TrafficCapture/trafficCaptureProxyServer/build.gradle @@ -13,6 +13,8 @@ configurations { } dependencies { + implementation project(":trafficCaptureDependencies") + implementation 'org.opensearch.plugin:opensearch-security:2.11.1.0' implementation 'org.opensearch:opensearch-common:2.11.0' implementation 'org.opensearch:opensearch-core:2.11.0'