Bump resteasy-jackson2-provider from 3.0.26.Final to 6.2.4.Final in…

… /qa/wildfly Signed-off-by: Thomas Farr <tsfarr@amazon.com>
opensearch-project · Jun 21, 2023 · d72a42a · d72a42a
1 parent 68c1c86
commit d72a42a
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -108,6 +108,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.netflix.nebula:gradle-info-plugin` from 12.1.3 to 12.1.4 (#8139)
 - Bump `commons-io:commons-io` from 2.12.0 to 2.13.0 in /plugins/discovery-azure-classic ([#8140](https://github.com/opensearch-project/OpenSearch/pull/8140))
 - Bump `mockito` from 5.2.0 to 5.4.0 ([#8181](https://github.com/opensearch-project/OpenSearch/pull/8181))
+- Bump `org.jboss.resteasy:resteasy-jackson2-provider` from 3.0.26.Final to 6.2.4.Final in /qa/wildfly ([#](https://github.com/opensearch-project/OpenSearch/pull/))
 
 ### Changed
 - Replace jboss-annotations-api_1.2_spec with jakarta.annotation-api ([#7836](https://github.com/opensearch-project/OpenSearch/pull/7836))

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -64,3 +64,5 @@ jmh               = 1.35
 zstd              = 1.5.5-3
 
 jzlib             = 1.1.3
+
+resteasy          = 6.2.4.Final
diff --git a/qa/wildfly/build.gradle b/qa/wildfly/build.gradle
@@ -40,25 +40,32 @@ apply plugin: 'opensearch.internal-distribution-download'
 testFixtures.useFixture()
 
 dependencies {
-  providedCompile 'javax.enterprise:cdi-api:2.0'
-  providedCompile "jakarta.annotation:jakarta.annotation-api:${versions.jakarta_annotation}"
-  providedCompile 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.3'
-  api('org.jboss.resteasy:resteasy-jackson2-provider:3.0.26.Final') {
-    exclude module: 'jackson-annotations'
-    exclude module: 'jackson-core'
-    exclude module: 'jackson-databind'
-    exclude module: 'jackson-jaxrs-json-provider'
+  providedCompile('jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1') {
+    exclude module: 'jakarta.annotation-api'
+  }
+  providedCompile 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
+  providedCompile "org.jboss.resteasy:resteasy-core:${versions.resteasy}"
+  providedCompile "org.jboss.resteasy:resteasy-core-spi:${versions.resteasy}"
+  api("org.jboss.resteasy:resteasy-jackson2-provider:${versions.resteasy}") {
+    exclude module: 'jakarta.activation-api'
+    exclude group: 'com.fasterxml.jackson'
+    exclude group: 'com.fasterxml.jackson.core'
+    exclude group: 'com.fasterxml.jackson.dataformat'
+    exclude group: 'com.fasterxml.jackson.module'
   }
   api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
-  api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
-  api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
-  api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}"
-  api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:${versions.jackson}"
-  api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.jackson}"
+  api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
+  api "com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:${versions.jackson}"
+  api "com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:${versions.jackson}"
+  api "com.github.fge:json-patch:1.9"
   api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
   api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
-  api project(path: ':client:rest-high-level')
-  testImplementation project(':test:framework')
+  api(project(path: ':client:rest-high-level')) {
+    exclude module: 'jakarta.annotation-api'
+  }
+  testImplementation(project(':test:framework')) {
+    exclude module: 'jakarta.annotation-api'
+  }
 }
 
 war {

diff --git a/qa/wildfly/docker-compose.yml b/qa/wildfly/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.7'
 services:
 
   wildfly:
-    image: jboss/wildfly:18.0.1.Final
+    image: quay.io/wildfly/wildfly:28.0.1.Final-jdk11
     environment:
       JAVA_OPTS: -Dopensearch.uri=opensearch:9200 -Djboss.http.port=8080 -Djava.net.preferIPv4Stack=true
     volumes:

diff --git a/qa/wildfly/src/main/java/org/opensearch/wildfly/model/Employee.java b/qa/wildfly/src/main/java/org/opensearch/wildfly/model/Employee.java
@@ -34,12 +34,8 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
 import java.util.List;
 
-@Consumes(MediaType.APPLICATION_JSON)
 public class Employee {
 
     @JsonProperty(value = "first_name")

diff --git a/qa/wildfly/src/main/java/org/opensearch/wildfly/transport/RestHighLevelClientActivator.java b/qa/wildfly/src/main/java/org/opensearch/wildfly/transport/RestHighLevelClientActivator.java
@@ -32,18 +32,10 @@
 
 package org.opensearch.wildfly.transport;
 
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
-
-import java.util.Collections;
-import java.util.Set;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
 
 @ApplicationPath("/transport")
 public class RestHighLevelClientActivator extends Application {
 
-    @Override
-    public Set<Class<?>> getClasses() {
-        return Collections.singleton(RestHighLevelClientEmployeeResource.class);
-    }
-
 }
diff --git a/...y/src/main/java/org/opensearch/wildfly/transport/RestHighLevelClientEmployeeResource.java b/...y/src/main/java/org/opensearch/wildfly/transport/RestHighLevelClientEmployeeResource.java
@@ -32,6 +32,15 @@
 
 package org.opensearch.wildfly.transport;
 
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import org.opensearch.action.get.GetRequest;
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.action.index.IndexRequest;
@@ -41,14 +50,6 @@
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.wildfly.model.Employee;
 
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -88,6 +89,7 @@ public Response getEmployeeById(final @PathParam("id") Long id) throws IOExcepti
 
     @PUT
     @Path("/{id}")
+    @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public Response putEmployeeById(final @PathParam("id") Long id, final Employee employee) throws URISyntaxException, IOException {
         Objects.requireNonNull(id);

diff --git a/qa/wildfly/src/main/java/org/opensearch/wildfly/transport/RestHighLevelClientProducer.java b/qa/wildfly/src/main/java/org/opensearch/wildfly/transport/RestHighLevelClientProducer.java
@@ -32,14 +32,13 @@
 
 package org.opensearch.wildfly.transport;
 
+import jakarta.enterprise.inject.Produces;
 import org.apache.hc.core5.http.HttpHost;
 import org.opensearch.client.RestClient;
 import org.opensearch.client.RestHighLevelClient;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.io.PathUtils;
 
-import javax.enterprise.inject.Produces;
-
 import java.net.URISyntaxException;
 import java.nio.file.Path;
 

diff --git a/...dfly/src/main/java/org/opensearch/wildfly/transport/RestHighLevelJacksonJsonProvider.java b/...dfly/src/main/java/org/opensearch/wildfly/transport/RestHighLevelJacksonJsonProvider.java
@@ -34,7 +34,7 @@
 
 import org.jboss.resteasy.plugins.providers.jackson.ResteasyJackson2Provider;
 
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.Provider;
 
 @Provider
 public class RestHighLevelJacksonJsonProvider extends ResteasyJackson2Provider {

diff --git a/qa/wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/qa/wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -1,9 +1,6 @@
 <jboss-deployment-structure>
     <deployment>
         <exclusions>
-            <module name="com.fasterxml.jackson.core.jackson-core" />
-            <module name="com.fasterxml.jackson.core.jackson-databind" />
-            <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />
             <module name="org.jboss.resteasy.resteasy-jackson2-provider" />
         </exclusions>
     </deployment>