Merge "Update to spring-boot 1.5.21"

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index e1bcdc5..75aea62 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -263,7 +263,7 @@
         <dependency>
             <groupId>org.janusgraph</groupId>
             <artifactId>janusgraph-core</artifactId>
-            <version>0.2.0</version>
+            <version>0.2.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>

diff --git a/aai-core/src/test/java/org/onap/aai/AAISetup.java b/aai-core/src/test/java/org/onap/aai/AAISetup.java
index ade20f4..4bc30b8 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/AAISetup.java
+++ b/aai-core/src/test/java/org/onap/aai/AAISetup.java
@@ -22,7 +22,7 @@ package org.onap.aai;
 
 import java.util.Map;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.onap.aai.config.ConfigConfiguration;
@@ -88,8 +88,8 @@ public abstract class AAISetup {
 
     protected static final String SERVICE_NAME = "JUNIT";
 
-    @BeforeClass
-    public static void setupBundleconfig() throws Exception {
+    @Before
+    public void setupBundleconfig() throws Exception {
         System.setProperty("AJSC_HOME", ".");
         System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
         System.setProperty("aai.service.name", SERVICE_NAME);