Force logback

Signed-off-by: Stephen Crawford <[email protected]>

build.gradle

@@ -90,6 +90,7 @@ configurations.all {
         force "org.apache.bcel:bcel:6.6.0" // This line should be removed once Spotbugs is upgraded to 4.7.4
         force "org.xerial.snappy:snappy-java:1.1.10.5"
         force "org.apache.zookeeper:zookeeper:3.9.1"
+        force "ch.qos.logback:logback-core:1.2.13"
         force "ch.qos.logback:logback-classic:1.2.13"
     }
 }
@@ -214,6 +215,7 @@ dependencies {
     testImplementation "org.apache.kafka:kafka-clients:${kafka_version}:test"
     compileOnly "org.opensearch:opensearch:${opensearch_version}"
 
+<<<<<<< HEAD
     integrationTestCompileOnly "org.opensearch:opensearch:${opensearch_version}"
     integrationTestImplementation "org.opensearch.plugin:reindex-client:${opensearch_version}"
     integrationTestImplementation "org.opensearch:opensearch-ssl-config:${opensearch_version}"
@@ -256,6 +258,16 @@ dependencies {
     integrationTestImplementation "org.apache.httpcomponents:fluent-hc:4.5.13"
     integrationTestImplementation "org.apache.httpcomponents:httpcore:4.4.16"
     integrationTestImplementation "org.apache.httpcomponents:httpasyncclient:4.1.5"
+=======
+
+
+configurations.runtimeClasspath {
+    // jackson-* is already included in OpenSearch
+    exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
+    exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-cbor'
+    exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-smile'
+    exclude group: 'com.fasterxml.jackson.dataformat', module: 'jackson-dataformat-yaml'
+>>>>>>> 131bb8da (Force logback)
 }
 
 group = 'org.opensearch'