Remove unneded line

Signed-off-by: Daniel Widdis <widdis@gmail.com>

build.gradle

@@ -36,8 +36,7 @@ buildscript {
 
         isSameMajorVersion = opensearch_version.split("\\.")[0] == bwcVersionShort.split("\\.")[0]
         swaggerVersion = "2.1.24"
-        swaggerCoreVersion = "2.2.27"
-
+        swaggerCoreVersion = "2.2.28"
     }
 
     repositories {
@@ -101,8 +100,6 @@ allprojects {
     // Default to the apache license
     project.ext.licenseName = 'The Apache Software License, Version 2.0'
     project.ext.licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-    // Get OpenSearch version catalog
-    project.getExtensions().getExtraProperties().set("versions", VersionProperties.getVersions())
 }
 
 publishing {
@@ -204,12 +201,7 @@ dependencies {
 
     configurations.all {
         resolutionStrategy {
-<<<<<<< HEAD
             force("com.google.guava:guava:33.4.0-jre") // CVE for 31.1, keep to force transitive dependencies
-            force("com.fasterxml.jackson.core:jackson-core:${jacksonVersion}") // Dependency Jar Hell
-=======
-            force("com.google.guava:guava:33.3.1-jre") // CVE for 31.1, keep to force transitive dependencies
->>>>>>> e54a44d (Change Jackson dependency to get version from core to avoid jar hell)
             force("org.apache.httpcomponents.core5:httpcore5:5.3.2") // Dependency Jar Hell
         }
     }