Upversion gizmo on elalto

Issue-ID: AAI-2579
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I47659681d25d8d5a4715ae96d17fc85cdf3f26dd

diff --git a/pom.xml b/pom.xml
index e39acd3..e27155a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -31,15 +31,15 @@ limitations under the License.
 
     <groupId>org.onap.aai.gizmo</groupId>
     <artifactId>gizmo</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <name>aai-gizmo</name>
 
     <properties>
         <docker.location>${basedir}/target</docker.location>
         <version.org.onap.aai.aai-schema-ingest>1.4.1</version.org.onap.aai.aai-schema-ingest>
-        <version.org.onap.aai.aai-schema>1.5.0</version.org.onap.aai.aai-schema>
-        <version.org.onap.aai.aai-utils>1.5.1</version.org.onap.aai.aai-utils>
-        <version.org.onap.aai.aai-auth>1.5.1</version.org.onap.aai.aai-auth>
+        <version.org.onap.aai.aai-schema>1.5.1</version.org.onap.aai.aai-schema>
+        <version.org.onap.aai.aai-utils>1.5.3</version.org.onap.aai.aai-utils>
+        <version.org.onap.aai.aai-auth>1.5.3</version.org.onap.aai.aai-auth>
         <event.client.version>1.5.0</event.client.version>
         <!-- Minimum code coverage percentage. Please update this figure as coverage increases to prevent any drops in
          coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 -->
@@ -53,7 +53,7 @@ limitations under the License.
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>1.5.19.RELEASE</version>
+                <version>1.5.21.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java b/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java
index b28ba3a..5f9194f 100644 (file)
--- a/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java
+++ b/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java
@@ -19,9 +19,8 @@
  * ============LICENSE_END=========================================================
  */
 package org.onap.crud.event.response;
-
 import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -41,18 +40,22 @@ import org.onap.crud.OXMModelLoaderSetup;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class GraphEventResponseHandlerTest extends OXMModelLoaderSetup {
+    private static boolean setUpIsNotDone = true;
 
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        System.setProperty("CONFIG_HOME", "src/test/resources");
-        System.setProperty("AJSC_HOME", ".");
-        System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
-
-        OxmModelLoader.loadModels();
-        EdgeRulesLoader.loadModels();
+    @Before
+    public void setUpOnce() throws Exception {
+        if (setUpIsNotDone) { 
+            System.setProperty("CONFIG_HOME", "src/test/resources");
+            System.setProperty("AJSC_HOME", ".");
+            System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
+
+            OxmModelLoader.loadModels();
+            EdgeRulesLoader.loadModels();
+            setUpIsNotDone = false;
+        }
     }
 
     @Test

diff --git a/version.properties b/version.properties
index 99af342..f78f30b 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=5
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}