Merge pull request #605 from peternied/centralized-dependencies

opensearch-project · May 10, 2024 · cb5e73d · cb5e73d
2 parents 7514991 + 38cfe19
commit cb5e73d
Show file tree

Hide file tree

Showing 18 changed files with 273 additions and 289 deletions.
diff --git a/TrafficCapture/build.gradle b/TrafficCapture/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'jacoco'
     id 'org.owasp.dependencycheck' version '8.2.1'
+    id 'io.freefair.lombok' version '8.6' apply false
 }
 
 allprojects {

diff --git a/TrafficCapture/captureKafkaOffloader/build.gradle b/TrafficCapture/captureKafkaOffloader/build.gradle
@@ -1,38 +1,30 @@
 
 plugins {
     id 'org.opensearch.migrations.java-library-conventions'
-    id("io.freefair.lombok") version "8.0.1"
+    id 'io.freefair.lombok'
 }
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
+    api project(":trafficCaptureDependencies")
     implementation project(':captureOffloader')
     implementation project(':coreUtilities')
-    implementation group: 'com.google.protobuf', name:'protobuf-java', version:'3.22.2'
-    api            group:'io.netty', name:'netty-buffer', version: '4.1.100.Final'
-    implementation group: 'org.projectlombok', name:'lombok', version:'1.18.26'
-    implementation group: 'org.apache.kafka', name:'kafka-clients', version:'3.6.0'
-    implementation group: 'org.slf4j', name:'slf4j-api', version:'2.0.7'
-    implementation group: 'software.amazon.msk', name:'aws-msk-iam-auth', version:'2.0.3'
+    implementation group: 'com.google.protobuf', name:'protobuf-java'
+    api            group:'io.netty', name:'netty-buffer'
+    implementation group: 'org.projectlombok', name:'lombok'
+    implementation group: 'org.apache.kafka', name:'kafka-clients'
+    implementation group: 'org.slf4j', name:'slf4j-api'
+    implementation group: 'software.amazon.msk', name:'aws-msk-iam-auth'
 
     testImplementation project(':captureProtobufs')
     testImplementation testFixtures(project(path: ':coreUtilities'))
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.20.0'
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.20.0'
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.20.0'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.6.1'
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '4.6.1'
-    testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl'
+    testImplementation group: 'org.mockito', name: 'mockito-core'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter'
+    testImplementation group: 'org.slf4j', name: 'slf4j-api'
 }
-
-
-configurations.all {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        if (details.requested.group == 'io.netty') {
-            details.useVersion '4.1.100.Final'
-        }
-    }
-}
diff --git a/TrafficCapture/captureOffloader/build.gradle b/TrafficCapture/captureOffloader/build.gradle
@@ -4,7 +4,7 @@
 
 plugins {
     id 'org.opensearch.migrations.java-library-conventions'
-    id("io.freefair.lombok") version "8.0.1"
+    id 'io.freefair.lombok'
     id 'java-test-fixtures'
 }
 
@@ -20,22 +20,23 @@ sourceSets {
     }
 }
 dependencies {
-    api group: 'io.netty', name: 'netty-buffer', version: '4.1.100.Final'
+    api project(":trafficCaptureDependencies")
+    api group: 'io.netty', name: 'netty-buffer'
 
     implementation project(':captureProtobufs')
     implementation project(':coreUtilities')
-    implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.22.2'
-    implementation group: 'org.projectlombok', name: 'lombok', version: '1.18.26'
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
+    implementation group: 'com.google.protobuf', name: 'protobuf-java'
+    implementation group: 'org.projectlombok', name: 'lombok'
+    implementation group: 'org.slf4j', name: 'slf4j-api'
 
     testImplementation testFixtures(project(path: ':testUtilities'))
     testImplementation project(':coreUtilities')
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.20.0'
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.20.0'
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.20.0'
-    testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl'
+    testImplementation group: 'org.slf4j', name: 'slf4j-api'
 
     testFixturesImplementation project(':captureProtobufs')
     testFixturesImplementation project(':coreUtilities')
-    testFixturesImplementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.22.2'
+    testFixturesImplementation group: 'com.google.protobuf', name: 'protobuf-java'
 }
diff --git a/TrafficCapture/captureProtobufs/build.gradle b/TrafficCapture/captureProtobufs/build.gradle
@@ -12,7 +12,8 @@ repositories {
 }
 
 dependencies {
-    api "com.google.protobuf:protobuf-java:3.22.2"
+    api project(":trafficCaptureDependencies")
+    api group: 'com.google.protobuf', name: 'protobuf-java', version: '3.22.2'
 }
 
 protobuf {

diff --git a/TrafficCapture/coreUtilities/build.gradle b/TrafficCapture/coreUtilities/build.gradle
@@ -18,65 +18,44 @@ buildscript {
 
 plugins {
     id 'org.opensearch.migrations.java-library-conventions'
-//    id "com.github.spotbugs" version "4.7.3"
-//    id 'checkstyle'
-    id "io.freefair.lombok" version "8.0.1"
+    id 'io.freefair.lombok'
     id 'java'
     id 'java-test-fixtures'
 }
 
-//spotbugs {
-//    includeFilter = new File(rootDir, 'config/spotbugs/spotbugs-include.xml')
-//}
-
-//checkstyle {
-//    toolVersion = '10.12.3'
-//    configFile = new File(rootDir, 'config/checkstyle/checkstyle.xml')
-//    System.setProperty('checkstyle.cache.file', String.format('%s/%s',
-//            buildDir, 'checkstyle.cachefile'))
-//}
-
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    api platform("io.opentelemetry:opentelemetry-bom:1.34.1")
+    api project(":trafficCaptureDependencies")
 
     implementation project(':captureProtobufs')
 
-    implementation "com.google.protobuf:protobuf-java:3.22.2"
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
+    implementation group: "com.google.protobuf", name: "protobuf-java"
+    implementation group: 'org.slf4j', name: 'slf4j-api'
 
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.20.0'
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.20.0'
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.20.0'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl'
 
     // Log4j
-    implementation(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
     implementation group: 'org.apache.logging.log4j', name: 'log4j-api'
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.20.0'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl'
 
     // OpenTelemetry core
     api group: 'io.opentelemetry', name: 'opentelemetry-api'
     api group: 'io.opentelemetry', name: 'opentelemetry-sdk'
     implementation group: 'io.opentelemetry', name: 'opentelemetry-exporter-otlp'
-    implementation group: 'io.opentelemetry.semconv', name: 'opentelemetry-semconv', version: '1.23.1-alpha'
+    implementation group: 'io.opentelemetry.semconv', name: 'opentelemetry-semconv'
 
     testFixturesApi group: 'io.opentelemetry', name: 'opentelemetry-api'
     testFixturesApi group: 'io.opentelemetry', name: 'opentelemetry-sdk'
     testFixturesApi group: 'io.opentelemetry', name: 'opentelemetry-sdk-testing'
-    testFixturesImplementation platform("io.opentelemetry:opentelemetry-bom:1.34.1")
     testFixturesImplementation group: 'io.opentelemetry', name: 'opentelemetry-api'
     testFixturesImplementation group: 'io.opentelemetry', name: 'opentelemetry-sdk-testing'
-    testFixturesImplementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
-}
-
-configurations.all {
-    resolutionStrategy {
-        force 'com.squareup.okio:okio-jvm:3.4.0'
-    }
+    testFixturesImplementation group: 'org.slf4j', name: 'slf4j-api'
 }
 
 tasks.named('test') {

diff --git a/TrafficCapture/nettyWireLogging/build.gradle b/TrafficCapture/nettyWireLogging/build.gradle
@@ -4,29 +4,29 @@
 
 plugins {
     id 'org.opensearch.migrations.java-library-conventions'
-    id("io.freefair.lombok") version "8.0.1"
+    id 'io.freefair.lombok'
 }
 
 dependencies {
-    implementation platform("io.netty:netty-bom:4.1.100.Final")
+    api project(":trafficCaptureDependencies")
 
     implementation project(':captureOffloader')
     implementation project(':coreUtilities')
-    api            group: 'io.netty', name: 'netty-buffer', version: '4.1.100.Final'
-    api            group: 'io.netty', name: 'netty-codec-http', version: '4.1.108.Final'
-    api            group: 'io.netty', name: 'netty-handler', version: '4.1.100.Final'
+    api            group: 'io.netty', name: 'netty-buffer'
+    api            group: 'io.netty', name: 'netty-codec-http'
+    api            group: 'io.netty', name: 'netty-handler'
 
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
+    implementation group: 'org.slf4j', name: 'slf4j-api'
 
     testImplementation project(':captureProtobufs')
-    testImplementation group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
-    testImplementation group: 'com.google.protobuf', name: 'protobuf-java', version:'3.22.2'
+    testImplementation group: 'com.google.guava', name: 'guava'
+    testImplementation group: 'com.google.protobuf', name: 'protobuf-java'
     testImplementation group: 'io.opentelemetry', name: 'opentelemetry-sdk-testing'
-    testImplementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2.1'
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.20.0'
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.20.0'
-    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.20.0'
-    testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
+    testImplementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core'
+    testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl'
+    testImplementation group: 'org.slf4j', name: 'slf4j-api'
 
     testImplementation testFixtures(project(path: ':testUtilities'))
     testImplementation testFixtures(project(path: ':coreUtilities'))

diff --git a/...pture/replayerPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformer/build.gradle b/...pture/replayerPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformer/build.gradle
@@ -5,18 +5,18 @@ buildscript {
 }
 
 plugins {
-    id("io.freefair.lombok") version "8.0.1"
+    id 'io.freefair.lombok'
 }
 
 dependencies {
     implementation project(':replayerPlugins:jsonMessageTransformers:jsonMessageTransformerInterface')
 
-    implementation group: 'io.burt', name: 'jmespath-core', version: '0.6.0'
-    implementation group: 'org.slf4j', name:"slf4j-api", version:"2.0.7"
+    implementation group: 'io.burt', name: 'jmespath-core'
+    implementation group: 'org.slf4j', name:"slf4j-api"
 
     testImplementation project(':trafficReplayer')
-    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-api', version:'5.9.3'
-    testRuntimeOnly group:'org.junit.jupiter', name:'junit-jupiter-engine', version:'5.x.x'
+    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-api'
+    testRuntimeOnly group:'org.junit.jupiter', name:'junit-jupiter-engine'
 }
 
 tasks.named('test') {

diff --git a/...playerPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformerProvider/build.gradle b/...playerPlugins/jsonMessageTransformers/jsonJMESPathMessageTransformerProvider/build.gradle
@@ -5,25 +5,25 @@ buildscript {
 }
 
 plugins {
-    id "io.freefair.lombok" version "8.0.1"
+    id 'io.freefair.lombok'
 }
 
 dependencies {
     implementation project(':replayerPlugins:jsonMessageTransformers:jsonMessageTransformerInterface')
     implementation project(':replayerPlugins:jsonMessageTransformers:jsonJMESPathMessageTransformer')
 
-    implementation group: 'io.burt', name: 'jmespath-core', version: '0.6.0'
+    implementation group: 'io.burt', name: 'jmespath-core'
 
     testImplementation project(':trafficReplayer')
     testImplementation testFixtures(project(path: ':testUtilities'))
     testImplementation testFixtures(project(path: ':trafficReplayer'))
 
-    testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.0'
-    testImplementation group: 'io.netty', name: 'netty-all', version: '4.1.100.Final'
-    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-api', version:'5.9.3'
-    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-params', version:'5.9.3'
-    testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
-    testRuntimeOnly group:'org.junit.jupiter', name:'junit-jupiter-engine', version:'5.x.x'
+    testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind'
+    testImplementation group: 'io.netty', name: 'netty-all'
+    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-api'
+    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-params'
+    testImplementation group: 'org.slf4j', name: 'slf4j-api'
+    testRuntimeOnly group:'org.junit.jupiter', name:'junit-jupiter-engine'
 }
 
 tasks.named('test') {

diff --git a/...icCapture/replayerPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/build.gradle b/...icCapture/replayerPlugins/jsonMessageTransformers/jsonJoltMessageTransformer/build.gradle
@@ -5,19 +5,20 @@ buildscript {
 }
 
 plugins {
-    id("io.freefair.lombok") version "8.0.1"
+    id 'io.freefair.lombok'
 }
 
 dependencies {
+    implementation project(":trafficCaptureDependencies")
     implementation project(':replayerPlugins:jsonMessageTransformers:jsonMessageTransformerInterface')
 
-    implementation group: 'com.bazaarvoice.jolt', name: 'jolt-core', version: '0.1.7'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.0'
-    implementation group: 'org.slf4j', name:"slf4j-api", version:"2.0.7"
+    implementation group: 'com.bazaarvoice.jolt', name: 'jolt-core'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind'
+    implementation group: 'org.slf4j', name:"slf4j-api"
 
     testImplementation project(':trafficReplayer')
-    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-api', version:'5.9.3'
-    testRuntimeOnly group:'org.junit.jupiter', name:'junit-jupiter-engine', version:'5.x.x'
+    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-api'
+    testRuntimeOnly group:'org.junit.jupiter', name:'junit-jupiter-engine'
 }
 
 tasks.named('test') {

diff --git a/...e/replayerPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/build.gradle b/...e/replayerPlugins/jsonMessageTransformers/jsonJoltMessageTransformerProvider/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 }
 
 plugins {
-    id "io.freefair.lombok" version "8.0.1"
+    id 'io.freefair.lombok'
 }
 
 dependencies {
@@ -19,12 +19,12 @@ dependencies {
     testImplementation testFixtures(project(path: ':testUtilities'))
     testImplementation testFixtures(project(path: ':trafficReplayer'))
 
-    testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.0'
-    testImplementation group: 'io.netty', name: 'netty-all', version: '4.1.100.Final'
-    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-api', version:'5.9.3'
-    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-params', version:'5.9.3'
-    testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
-    testRuntimeOnly group:'org.junit.jupiter', name:'junit-jupiter-engine', version:'5.x.x'
+    testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind'
+    testImplementation group: 'io.netty', name: 'netty-all'
+    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-api'
+    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-params'
+    testImplementation group: 'org.slf4j', name: 'slf4j-api'
+    testRuntimeOnly group:'org.junit.jupiter', name:'junit-jupiter-engine'
 }
 
 tasks.named('test') {

diff --git a/...ture/replayerPlugins/jsonMessageTransformers/jsonMessageTransformerInterface/build.gradle b/...ture/replayerPlugins/jsonMessageTransformers/jsonMessageTransformerInterface/build.gradle
@@ -19,14 +19,15 @@ buildscript {
 plugins {
     id 'org.opensearch.migrations.java-library-conventions'
     id 'org.owasp.dependencycheck' version '8.2.1'
-    id "io.freefair.lombok" version "8.0.1"
+    id 'io.freefair.lombok'
 }
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
+    api project(":trafficCaptureDependencies")
 }
 
 tasks.named('test') {

diff --git a/...yerPlugins/jsonMessageTransformers/openSearch23PlusTargetTransformerProvider/build.gradle b/...yerPlugins/jsonMessageTransformers/openSearch23PlusTargetTransformerProvider/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "io.freefair.lombok" version "8.0.1"
+    id 'io.freefair.lombok'
 }
 
 dependencies {
@@ -9,11 +9,11 @@ dependencies {
     testImplementation testFixtures(project(path: ':testUtilities'))
     testImplementation testFixtures(project(path: ':trafficReplayer'))
 
-    testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.0'
-    testImplementation group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
-    testImplementation group: 'io.netty', name: 'netty-all', version: '4.1.100.Final'
-    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-api', version:'5.9.3'
-    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-params', version:'5.9.3'
-    testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'
-    testRuntimeOnly group:'org.junit.jupiter', name:'junit-jupiter-engine', version:'5.x.x'
+    testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind'
+    testImplementation group: 'com.google.guava', name: 'guava'
+    testImplementation group: 'io.netty', name: 'netty-all'
+    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-api'
+    testImplementation group: 'org.junit.jupiter', name:'junit-jupiter-params'
+    testImplementation group: 'org.slf4j', name: 'slf4j-api'
+    testRuntimeOnly group:'org.junit.jupiter', name:'junit-jupiter-engine'
 }
diff --git a/TrafficCapture/settings.gradle b/TrafficCapture/settings.gradle
@@ -41,6 +41,8 @@ include('captureKafkaOffloader',
 )
 
 addSubProjects('', new File(rootProject.projectDir,'replayerPlugins'))
+addSubProjects('', new File(rootProject.projectDir,'trafficCaptureDependencies'))
+
 
 if (System.getenv().containsKey("OS_MIGRATIONS_GRADLE_SCAN_TOS_AGREE_AND_ENABLED")) {
     gradleEnterprise {