From c07088ed74476d8f910f72151bd9b876b35a7e9c Mon Sep 17 00:00:00 2001
From: Ondra Chaloupka <ochaloup@redhat.com>
Date: Mon, 8 Feb 2021 12:35:47 +0100
Subject: [PATCH] [DEPENDENCY CLEANUP] removing the default dependencies from
 top-level LRA pom.xml

---
 rts/lra/client/pom.xml                            | 14 ++++++++++----
 rts/lra/coordinator/pom.xml                       |  6 ++++++
 rts/lra/pom.xml                                   | 15 +--------------
 rts/lra/service-base/pom.xml                      |  5 +++++
 .../io/narayana/lra/logging/lraI18NLogger.java    |  4 ++--
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/rts/lra/client/pom.xml b/rts/lra/client/pom.xml
index dae20bdaf4..ea9338e1ff 100644
--- a/rts/lra/client/pom.xml
+++ b/rts/lra/client/pom.xml
@@ -30,14 +30,20 @@
             <version>${version.microprofile.lra.api}</version>
         </dependency>
         <dependency>
-          <groupId>org.jboss.narayana.rts</groupId>
-          <artifactId>lra-service-base</artifactId>
-          <version>${project.version}</version>
+            <groupId>org.jboss.narayana.rts</groupId>
+            <artifactId>lra-service-base</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.json</groupId>
             <artifactId>jboss-json-api_1.0_spec</artifactId>
-            <version>1.0.0.Final</version>
+            <version>${version.jboss.json-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>${version.cdi-api}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/rts/lra/coordinator/pom.xml b/rts/lra/coordinator/pom.xml
index 76c810e133..01e6db14e2 100644
--- a/rts/lra/coordinator/pom.xml
+++ b/rts/lra/coordinator/pom.xml
@@ -68,6 +68,12 @@
             <version>${version.org.jboss.resteasy}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>${version.cdi-api}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.jboss.narayana.rts</groupId>
diff --git a/rts/lra/pom.xml b/rts/lra/pom.xml
index 7243dfbc4d..dcf33a5413 100644
--- a/rts/lra/pom.xml
+++ b/rts/lra/pom.xml
@@ -17,13 +17,13 @@
     <packaging>pom</packaging>
 
     <properties>
-        <version.json.api>1.1</version.json.api>
         <version.jackson>2.9.10.1</version.jackson>
 
         <version.jboss-interceptors>1.0.1.Final</version.jboss-interceptors>
         <version.cdi-api>2.0</version.cdi-api>
         <version.servlet-api>2.5</version.servlet-api>
         <version.jboss-modules>1.10.2.Final</version.jboss-modules>
+        <version.jboss.json-api>1.0.0.Final</version.jboss.json-api>
 
         <version.arquillian>1.2.1.Final</version.arquillian> <!-- cannot use the up-to-date Arquillian https://issues.jboss.org/browse/THORN-2090 -->
         <version.microprofile.lra.api>1.0</version.microprofile.lra.api>
@@ -79,19 +79,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <!-- for Intellij -->
-        <dependency>
-            <groupId>org.jboss.spec</groupId>
-            <artifactId>jboss-javaee-all-7.0</artifactId>
-            <version>1.0.3.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
-            <version>${version.javax.ws.rs-api}</version>
-        </dependency>
-
         <!-- for testing -->
         <dependency>
             <groupId>junit</groupId>
diff --git a/rts/lra/service-base/pom.xml b/rts/lra/service-base/pom.xml
index 2f44d965f5..d5fc6f243d 100644
--- a/rts/lra/service-base/pom.xml
+++ b/rts/lra/service-base/pom.xml
@@ -18,6 +18,11 @@
       <artifactId>microprofile-lra-api</artifactId>
       <version>${version.microprofile.lra.api}</version>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.spec.javax.ws.rs</groupId>
+      <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+      <version>${version.javax.ws.rs-api}</version>
+    </dependency>
 
     <!-- jboss logging -->
     <dependency>
diff --git a/rts/lra/service-base/src/main/java/io/narayana/lra/logging/lraI18NLogger.java b/rts/lra/service-base/src/main/java/io/narayana/lra/logging/lraI18NLogger.java
index 55f6f13b3d..c34d2e8aa7 100644
--- a/rts/lra/service-base/src/main/java/io/narayana/lra/logging/lraI18NLogger.java
+++ b/rts/lra/service-base/src/main/java/io/narayana/lra/logging/lraI18NLogger.java
@@ -31,8 +31,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import javax.json.JsonObject;
-
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
@@ -114,9 +112,11 @@ public interface lraI18NLogger {
     @Message(id = 25017, value = "Trying to aquire an in use connection for coordinator '%s'")
     void error_connectionInUse(URI coordinator);
 
+    /*
     @LogMessage(level = INFO)
     @Message(id = 25018, value = "Error parsing json LRAStatus from JSON '%s'")
     void warn_failedParsingStatusFromJson(JsonObject json, @Cause Throwable t);
+     */
 
     @LogMessage(level = ERROR)
     @Message(id = 25019, value = "Invalid query format '%s' to get lra statuses")