Remove AAI rest-client dependency from aai-common

- the rest-client dependency is not used and contains eelf-core
- bump logback patch version (1.2.12 -> 1.2.13)

Issue-ID: AAI-4091
Change-Id: I9864700fe95cbe1534e96dc9c122480e99a573f8
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index f4933e3..865a8a7 100644 (file)
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -50,7 +50,7 @@ limitations under the License.
     <commons.beanutils.version>1.9.4</commons.beanutils.version>
     <commons.cli.version>1.5.0</commons.cli.version>
     <commons.compress.version>1.27.0</commons.compress.version>
-    <commons.configuration.version>1.10</commons.configuration.version>
+    <commons.configuration2.version>2.10.1</commons.configuration2.version>
     <commons.io.version>2.16.1</commons.io.version>
     <commons.lang3.version>3.15.0</commons.lang3.version>
     <commons.net.version>3.8.0</commons.net.version>
@@ -92,7 +92,7 @@ limitations under the License.
     <junit.version>4.12</junit.version>
     <httpclient.version>4.5.13</httpclient.version>
     <io.swagger.version>1.5.24</io.swagger.version>
-    <logback.version>1.2.12</logback.version>
+    <logback.version>1.2.13</logback.version>
     <slf4j.version>1.7.25</slf4j.version>
     <log4j.version>2.17.1</log4j.version>
     <mockito.all.version>3.4.0</mockito.all.version>
@@ -442,12 +442,6 @@ limitations under the License.
         <version>${commons.io.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.onap.aai</groupId>
-        <artifactId>rest-client</artifactId>
-        <version>${aai.rest.client.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>net.sf.jopt-simple</groupId>
         <artifactId>jopt-simple</artifactId>
@@ -514,6 +508,12 @@ limitations under the License.
         <version>${commons.compress.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-configuration2</artifactId>
+        <version>${commons.configuration2.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.reflections</groupId>
         <artifactId>reflections</artifactId>

diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml
index 6f497ed..3eb22df 100644 (file)
--- a/aai-schema-abstraction/pom.xml
+++ b/aai-schema-abstraction/pom.xml
@@ -66,10 +66,6 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.onap.aai</groupId>
-      <artifactId>rest-client</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-junit</artifactId>

diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderMsgs.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderMsgs.java
index b3b3257..575e2f9 100644 (file)
--- a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderMsgs.java
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderMsgs.java
@@ -24,14 +24,6 @@
 
 package org.onap.aai.schemaif;
 
-import com.att.eelf.i18n.EELFResourceManager;
-
-import org.onap.aai.cl.eelf.LogMessageEnum;
-
-public enum SchemaProviderMsgs implements LogMessageEnum {
+public enum SchemaProviderMsgs {
     SCHEMA_LOAD_ERROR, LOADED_SCHEMA_FILE, LOADED_DB_RULE_FILE;
-
-    static {
-        EELFResourceManager.loadMessageBundle("logging/SchemaProviderMsgs");
-    }
 }

diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java
index 71abdbc..f564a89 100644 (file)
--- a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java
@@ -33,7 +33,6 @@ import java.util.regex.Pattern;
 import org.eclipse.persistence.dynamic.DynamicType;
 import org.eclipse.persistence.internal.oxm.mappings.Descriptor;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
-import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.nodes.NodeIngestor;
 import org.onap.aai.schemaif.SchemaProviderException;
 import org.onap.aai.schemaif.SchemaProviderMsgs;