From a8c231be44af171e4d3dd63eed729166aa3a4eed Mon Sep 17 00:00:00 2001 From: Andre Kurait Date: Tue, 1 Oct 2024 11:30:20 -0500 Subject: [PATCH] Apply dependency overrides to all dependency types Signed-off-by: Andre Kurait --- CreateSnapshot/build.gradle | 2 -- DocumentsFromSnapshotMigration/build.gradle | 1 - MetadataMigration/build.gradle | 2 -- RFS/build.gradle | 2 -- TrafficCapture/captureKafkaOffloader/build.gradle | 1 - TrafficCapture/captureOffloader/build.gradle | 1 - TrafficCapture/captureProtobufs/build.gradle | 1 - TrafficCapture/nettyWireLogging/build.gradle | 2 -- .../trafficCaptureProxyServer/build.gradle | 2 -- .../trafficCaptureProxyServerTest/build.gradle | 2 -- TrafficCapture/trafficReplayer/build.gradle | 2 -- .../jsonJoltMessageTransformer/build.gradle | 1 - .../jsonMessageTransformerInterface/build.gradle | 1 - awsUtilities/build.gradle | 2 -- build.gradle | 14 ++++++++++++++ coreUtilities/build.gradle | 2 -- dashboardsSanitizer/build.gradle | 3 --- testHelperFixtures/build.gradle | 2 -- transformation/build.gradle | 2 -- 19 files changed, 14 insertions(+), 31 deletions(-) diff --git a/CreateSnapshot/build.gradle b/CreateSnapshot/build.gradle index 3ac514578..2460ff0e4 100644 --- a/CreateSnapshot/build.gradle +++ b/CreateSnapshot/build.gradle @@ -9,8 +9,6 @@ java.sourceCompatibility = JavaVersion.VERSION_11 java.targetCompatibility = JavaVersion.VERSION_11 dependencies { - implementation project(":commonDependencyVersionConstraints") - implementation project(':coreUtilities') implementation project(":RFS") diff --git a/DocumentsFromSnapshotMigration/build.gradle b/DocumentsFromSnapshotMigration/build.gradle index b7abff63f..e023b7dcd 100644 --- a/DocumentsFromSnapshotMigration/build.gradle +++ b/DocumentsFromSnapshotMigration/build.gradle @@ -23,7 +23,6 @@ class DockerServiceProps { } dependencies { - implementation project(":commonDependencyVersionConstraints") implementation platform('io.projectreactor:reactor-bom:2023.0.5') testImplementation platform('io.projectreactor:reactor-bom:2023.0.5') diff --git a/MetadataMigration/build.gradle b/MetadataMigration/build.gradle index 7a80f19d3..fa0bf72d9 100644 --- a/MetadataMigration/build.gradle +++ b/MetadataMigration/build.gradle @@ -8,8 +8,6 @@ java.sourceCompatibility = JavaVersion.VERSION_11 java.targetCompatibility = JavaVersion.VERSION_11 dependencies { - implementation project(":commonDependencyVersionConstraints") - implementation project(":coreUtilities") implementation project(":RFS") implementation project(':transformation') diff --git a/RFS/build.gradle b/RFS/build.gradle index 6524f1ded..c8ec4ba51 100644 --- a/RFS/build.gradle +++ b/RFS/build.gradle @@ -15,7 +15,6 @@ ext { } dependencies { - implementation project(":commonDependencyVersionConstraints") implementation project(':awsUtilities') implementation project(':coreUtilities') implementation project(':transformation') @@ -75,7 +74,6 @@ dependencies { implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations' - testFixturesImplementation project(":commonDependencyVersionConstraints") testFixturesImplementation project(':transformation') testFixturesImplementation testFixtures(project(":coreUtilities")) testFixturesImplementation group: 'com.github.docker-java', name: 'docker-java' diff --git a/TrafficCapture/captureKafkaOffloader/build.gradle b/TrafficCapture/captureKafkaOffloader/build.gradle index d9ab478ef..f32ffaebf 100644 --- a/TrafficCapture/captureKafkaOffloader/build.gradle +++ b/TrafficCapture/captureKafkaOffloader/build.gradle @@ -5,7 +5,6 @@ plugins { } dependencies { - api project(":commonDependencyVersionConstraints") implementation project(':TrafficCapture:captureOffloader') implementation project(':coreUtilities') implementation group: 'com.google.protobuf', name:'protobuf-java' diff --git a/TrafficCapture/captureOffloader/build.gradle b/TrafficCapture/captureOffloader/build.gradle index aafb283d9..0e3f572a6 100644 --- a/TrafficCapture/captureOffloader/build.gradle +++ b/TrafficCapture/captureOffloader/build.gradle @@ -16,7 +16,6 @@ sourceSets { } } dependencies { - api project(":commonDependencyVersionConstraints") api group: 'io.netty', name: 'netty-buffer' implementation project(':TrafficCapture:captureProtobufs') diff --git a/TrafficCapture/captureProtobufs/build.gradle b/TrafficCapture/captureProtobufs/build.gradle index d60e248a4..501913507 100644 --- a/TrafficCapture/captureProtobufs/build.gradle +++ b/TrafficCapture/captureProtobufs/build.gradle @@ -8,7 +8,6 @@ plugins { } dependencies { - api project(":commonDependencyVersionConstraints") api group: 'com.google.protobuf', name: 'protobuf-java' } diff --git a/TrafficCapture/nettyWireLogging/build.gradle b/TrafficCapture/nettyWireLogging/build.gradle index e3162b41d..ed2ea9c65 100644 --- a/TrafficCapture/nettyWireLogging/build.gradle +++ b/TrafficCapture/nettyWireLogging/build.gradle @@ -8,8 +8,6 @@ plugins { } dependencies { - api project(":commonDependencyVersionConstraints") - implementation project(':TrafficCapture:captureOffloader') implementation project(':coreUtilities') api group: 'io.netty', name: 'netty-buffer' diff --git a/TrafficCapture/trafficCaptureProxyServer/build.gradle b/TrafficCapture/trafficCaptureProxyServer/build.gradle index bb3430705..5b1995ee1 100644 --- a/TrafficCapture/trafficCaptureProxyServer/build.gradle +++ b/TrafficCapture/trafficCaptureProxyServer/build.gradle @@ -13,8 +13,6 @@ configurations { } dependencies { - implementation project(":commonDependencyVersionConstraints") - def openSearch = '2.11.1' implementation "org.opensearch.plugin:opensearch-security:${openSearch}.0" implementation "org.opensearch:opensearch-common:${openSearch}" diff --git a/TrafficCapture/trafficCaptureProxyServerTest/build.gradle b/TrafficCapture/trafficCaptureProxyServerTest/build.gradle index 410859562..619e3cd96 100644 --- a/TrafficCapture/trafficCaptureProxyServerTest/build.gradle +++ b/TrafficCapture/trafficCaptureProxyServerTest/build.gradle @@ -20,8 +20,6 @@ def calculateDockerHash = { projectName -> } dependencies { - api project(":commonDependencyVersionConstraints") - implementation project(':TrafficCapture:trafficCaptureProxyServer') compileOnly 'org.projectlombok:lombok:1.18.28' annotationProcessor 'org.projectlombok:lombok:1.18.28' diff --git a/TrafficCapture/trafficReplayer/build.gradle b/TrafficCapture/trafficReplayer/build.gradle index f15c13984..891c18a25 100644 --- a/TrafficCapture/trafficReplayer/build.gradle +++ b/TrafficCapture/trafficReplayer/build.gradle @@ -16,8 +16,6 @@ plugins { } dependencies { - implementation project(":commonDependencyVersionConstraints") - implementation project(':TrafficCapture:captureProtobufs') implementation project(':coreUtilities') implementation project(':awsUtilities') diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/build.gradle b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/build.gradle index f2b55000e..72516e467 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/build.gradle +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/build.gradle @@ -9,7 +9,6 @@ plugins { } dependencies { - implementation project(":commonDependencyVersionConstraints") implementation project(':TrafficCapture:transformationPlugins:jsonMessageTransformers:jsonMessageTransformerInterface') implementation group: 'com.bazaarvoice.jolt', name: 'jolt-core' diff --git a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonMessageTransformerInterface/build.gradle b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonMessageTransformerInterface/build.gradle index 552e43791..4230d3ec7 100644 --- a/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonMessageTransformerInterface/build.gradle +++ b/TrafficCapture/transformationPlugins/jsonMessageTransformers/jsonMessageTransformerInterface/build.gradle @@ -23,5 +23,4 @@ plugins { } dependencies { - api project(":commonDependencyVersionConstraints") } diff --git a/awsUtilities/build.gradle b/awsUtilities/build.gradle index 722d604b9..8738b60ff 100644 --- a/awsUtilities/build.gradle +++ b/awsUtilities/build.gradle @@ -26,8 +26,6 @@ java.sourceCompatibility = JavaVersion.VERSION_11 java.targetCompatibility = JavaVersion.VERSION_11 dependencies { - api project(":commonDependencyVersionConstraints") - implementation group: 'software.amazon.awssdk', name: 'arns' implementation group: 'software.amazon.awssdk', name: 'auth' implementation group: 'software.amazon.awssdk', name: 'sdk-core' diff --git a/build.gradle b/build.gradle index 1e0efd760..8ec44b253 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,20 @@ allprojects { } } +subprojects { subproject -> + subproject.afterEvaluate { + if (subproject.plugins.hasPlugin('java') && subproject.name != 'commonDependencyVersionConstraints') { + subproject.dependencies { + implementation project(":commonDependencyVersionConstraints") + annotationProcessor project(":commonDependencyVersionConstraints") + if (subproject.plugins.hasPlugin('java-test-fixtures')) { + testFixturesImplementation project(":commonDependencyVersionConstraints") + } + } + } + } +} + task buildDockerImages() { dependsOn(':TrafficCapture:dockerSolution:buildDockerImages') dependsOn(':DocumentsFromSnapshotMigration:buildDockerImages') diff --git a/coreUtilities/build.gradle b/coreUtilities/build.gradle index 0a16ed15e..8494c3f30 100644 --- a/coreUtilities/build.gradle +++ b/coreUtilities/build.gradle @@ -27,8 +27,6 @@ java.sourceCompatibility = JavaVersion.VERSION_11 java.targetCompatibility = JavaVersion.VERSION_11 dependencies { - api project(":commonDependencyVersionConstraints") - implementation group: "com.google.protobuf", name: "protobuf-java" implementation group: 'org.slf4j', name: 'slf4j-api' diff --git a/dashboardsSanitizer/build.gradle b/dashboardsSanitizer/build.gradle index 894c7e051..f8065ab4a 100644 --- a/dashboardsSanitizer/build.gradle +++ b/dashboardsSanitizer/build.gradle @@ -19,9 +19,6 @@ repositories { } dependencies { - - implementation project(":commonDependencyVersionConstraints") - implementation project(':coreUtilities') implementation project(":RFS") diff --git a/testHelperFixtures/build.gradle b/testHelperFixtures/build.gradle index e5b3ab7ed..fee569e59 100644 --- a/testHelperFixtures/build.gradle +++ b/testHelperFixtures/build.gradle @@ -25,8 +25,6 @@ plugins { } dependencies { - api project(":commonDependencyVersionConstraints") - testFixturesImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind' testFixturesImplementation group: 'com.google.guava', name: 'guava' testFixturesImplementation group: 'eu.rekawek.toxiproxy', name: 'toxiproxy-java' diff --git a/transformation/build.gradle b/transformation/build.gradle index 48f086804..832a2e27f 100644 --- a/transformation/build.gradle +++ b/transformation/build.gradle @@ -27,8 +27,6 @@ java.sourceCompatibility = JavaVersion.VERSION_11 java.targetCompatibility = JavaVersion.VERSION_11 dependencies { - api project(":commonDependencyVersionConstraints") - implementation group: 'org.slf4j', name: 'slf4j-api' testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api'