Update oparent in model-loader

- update oparent from 2.1.0 to latest 3.3.3
- remove:
  - org.json
  - jetty-security
  - jline
  dependencies as they are not used anywhere

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

diff --git a/pom.xml b/pom.xml
index 45f8a77..2ac1b3f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>2.1.0</version>
+               <version>3.3.3</version>
                <relativePath />
        </parent>
 
@@ -309,21 +309,6 @@
                        <artifactId>sdc-distribution-client</artifactId>
                        <version>${sdc-distribution-client.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.json</groupId>
-                       <artifactId>json</artifactId>
-                       <version>20131018</version>
-                       <!--$NO-MVN-MAN-VER$ -->
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.jetty</groupId>
-                       <artifactId>jetty-security</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>jline</groupId>
-                       <artifactId>jline</artifactId>
-                       <version>2.12.1</version>
-               </dependency>
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-compress</artifactId>

diff --git a/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java
index 4c39975..22367c6 100644 (file)
--- a/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java
+++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java
@@ -29,7 +29,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import jline.internal.Log;
+
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.modelloader.entity.Artifact;
 
 /**
@@ -39,6 +41,8 @@ import org.onap.aai.modelloader.entity.Artifact;
  */
 public class ModelSorter {
 
+    private static Logger logger = LoggerFactory.getInstance().getLogger(ModelSorter.class);
+
     /**
      * Wraps a Model object to form dependencies other Models using Edges.
      */
@@ -168,7 +172,7 @@ public class ModelSorter {
                     // create node
                     AbstractModelArtifact referencedModel = versionIdToModelMap.get(referencedModelId);
                     if (referencedModel == null) {
-                        Log.debug("ignoring " + referencedModelId);
+                        logger.debug("ignoring " + referencedModelId);
                         continue; // referenced model not supplied, no need to sort it
                     }
                     referencedNode = new Node(referencedModel);

diff --git a/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java b/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java
index b16c8a0..7a630b5 100644 (file)
--- a/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java
+++ b/src/test/java/org/onap/aai/modelloader/entity/model/TestModelArtifactHandler.java
@@ -22,7 +22,6 @@ package org.onap.aai.modelloader.entity.model;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasSize;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;