Resolve conflicts

Signed-off-by: Joshua Li <[email protected]>

Author: joshuali925

build.gradle

@@ -6,16 +6,9 @@
 
 buildscript {
     ext {
-<<<<<<< HEAD
-        opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
-        spring_version = "5.3.22"
-        jackson_version = "2.13.3"
-        jackson_databind_version = "2.13.3"
-=======
         opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
         spring_version = "5.3.22"
         jackson_version = "2.13.3"
->>>>>>> main
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         version_tokens = opensearch_version.tokenize('-')
@@ -143,11 +136,6 @@ subprojects {
                 "org.checkstyle.google.suppressionfilter.config": rootProject.file("config/checkstyle/suppressions.xml")]
         ignoreFailures = false
     }
-
-    configurations.all {
-        resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson_version}"
-        resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jackson_version}"
-    }
 }
 checkstyle {
     configFile file("config/checkstyle/checkstyle.xml")

integ-test/build.gradle

@@ -55,11 +55,7 @@ configurations.all {
     resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
     resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
-<<<<<<< HEAD
-    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
-=======
     resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
->>>>>>> main
 }
 
 dependencies {

legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java

@@ -148,21 +148,6 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
 
             Format format = SqlRequestParam.getFormat(request.params());
 
-<<<<<<< HEAD
-            // Route request to new query engine if it's supported already
-            SQLQueryRequest newSqlRequest = new SQLQueryRequest(sqlRequest.getJsonContent(),
-                sqlRequest.getSql(), request.path(), request.params());
-            RestChannelConsumer result = newSqlQueryHandler.prepareRequest(newSqlRequest, client);
-            if (result != RestSQLQueryAction.NOT_SUPPORTED_YET) {
-                LOG.info("[{}] Request is handled by new SQL query engine", QueryContext.getRequestId());
-                return result;
-            }
-            LOG.debug("[{}] Request {} is not supported and falling back to old SQL engine",
-                QueryContext.getRequestId(), newSqlRequest);
-
-            final QueryAction queryAction = explainRequest(client, sqlRequest, format);
-            return channel -> executeSqlRequest(request, queryAction, client, channel);
-=======
             return channel -> schedule(client, () -> {
                 try {
                     // Route request to new query engine if it's supported already
@@ -184,7 +169,6 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
                     reportError(channel, e, isClientError(e) ? BAD_REQUEST : SERVICE_UNAVAILABLE);
                 }
             });
->>>>>>> main
         } catch (Exception e) {
             logAndPublishMetrics(e);
             return channel -> reportError(channel, e, isClientError(e) ? BAD_REQUEST : SERVICE_UNAVAILABLE);

opensearch/build.gradle

@@ -33,11 +33,7 @@ dependencies {
     api group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
     implementation "io.github.resilience4j:resilience4j-retry:1.5.0"
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}"
-<<<<<<< HEAD
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_databind_version}"
-=======
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
->>>>>>> main
     implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}"
     implementation group: 'org.json', name: 'json', version:'20180813'
     compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"

plugin/build.gradle

@@ -87,11 +87,7 @@ configurations.all {
     resolutionStrategy.force 'commons-codec:commons-codec:1.13'
     resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
     resolutionStrategy.force "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson_version}"
-<<<<<<< HEAD
-    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
-=======
     resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
->>>>>>> main
 }
 compileJava {
     options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor'])

ppl/build.gradle

@@ -46,6 +46,7 @@ dependencies {
 
     implementation "org.antlr:antlr4-runtime:4.7.1"
     implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
+    api group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}"
     api group: 'org.json', name: 'json', version: '20180813'
     implementation group: 'org.springframework', name: 'spring-context', version: "${spring_version}"
     implementation group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"

protocol/build.gradle

@@ -31,11 +31,7 @@ plugins {
 dependencies {
     implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jackson_version}"
-<<<<<<< HEAD
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_databind_version}"
-=======
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
->>>>>>> main
     implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: "${jackson_version}"
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation project(':core')
@@ -48,11 +44,7 @@ dependencies {
 }
 
 configurations.all {
-<<<<<<< HEAD
-    resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_databind_version}"
-=======
     resolutionStrategy.force "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
->>>>>>> main
 }
 
 test {

sql-jdbc/build.gradle

@@ -45,13 +45,8 @@ repositories {
 }
 
 dependencies {
-<<<<<<< HEAD
-    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3'
-=======
     implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.13.3"
->>>>>>> main
     implementation group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.452'
 
     testImplementation('org.junit.jupiter:junit-jupiter-api:5.3.1')