Cherry pick 105924 to frankfurt

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

4 files changed, 40 insertions, 12 deletions

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 6ecc0fb9..fe52a664 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
 ============LICENSE_START======================================================
 org.onap.aai
 ===============================================================================
@@ -9,16 +8,15 @@ Copyright © 2019 AT&T Intellectual Property. All rights reserved.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
-
+		
 http://www.apache.org/licenses/LICENSE-2.0
-
+		
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ===========LICENSE_END=========================================================
-
 -->
 <project
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
@@ -98,7 +96,7 @@ limitations under the License.
 				<version>2.8</version>
 			</plugin>
 			<plugin>
-				<!-- explicitly define maven-deploy-plugin after other to force exec
+				<!-- explicitly define maven-deploy-plugin after other to force exec 
 					order -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
@@ -135,11 +133,12 @@ limitations under the License.
 		<dependency>
 			<groupId>com.att.eelf</groupId>
 			<artifactId>eelf-core</artifactId>
-			<exclusions><!-- excluding transitive dependency coming from this artifact, as we would need powermock-api-mockito2-->
-						<exclusion>
-								<groupId>org.powermock</groupId>
-								<artifactId>powermock-api-mockito</artifactId>
-						</exclusion>
+			<exclusions><!-- excluding transitive dependency coming from this artifact, 
+					as we would need powermock-api-mockito2 -->
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-api-mockito</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -206,6 +205,14 @@ limitations under the License.
 			<artifactId>jaxb-api</artifactId>
 		</dependency>
 		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-core</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>eclipselink</artifactId>
 		</dependency>
diff --git a/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationTest.java b/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationTest.java
index 3bb017d6..8753b1b8 100644
--- a/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationTest.java
+++ b/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationTest.java
@@ -21,6 +21,7 @@
 package org.onap.aai.rest;
 
 import static junit.framework.TestCase.fail;
+
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -51,7 +52,9 @@ import org.onap.aai.PayloadUtil;
 import org.onap.aai.dbmap.AAIGraph;
 import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.setup.SchemaVersion;
+import org.springframework.test.annotation.DirtiesContext;
 
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 @RunWith(value = Parameterized.class)
 public class PrivateEdgeIntegrationTest extends AAISetup {
 
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java
index e128c2f6..33b2dab6 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java
@@ -44,6 +44,7 @@ import org.onap.aai.serialization.queryformats.exceptions.AAIFormatQueryResultFo
 import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
 import org.onap.aai.setup.SchemaVersion;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
 
 import java.util.Arrays;
 import java.util.List;
@@ -52,6 +53,10 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+
+
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
+
 public class CountQuerySupportTest extends AAISetup {
 
     @Autowired
diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index 6faf6b7b..072200a9 100644
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -72,7 +72,8 @@ limitations under the License.
     <jackson.bom.version>2.10.1</jackson.bom.version>
     <janusgraph.version>0.2.3</janusgraph.version>
     <javatuples.version>1.2</javatuples.version>
-    <jaxb.version>2.2.12</jaxb.version>
+    <jaxb.version>2.3.1</jaxb.version>
+    <old.jaxb.version>2.3.0.1</old.jaxb.version>
     <jaxrs.version>2.0.1</jaxrs.version>
     <jcommander.version>1.78</jcommander.version>
     <jersey.version>1.19.4</jersey.version>
@@ -502,7 +503,19 @@ limitations under the License.
       <dependency>
         <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-xjc</artifactId>
-        <version>${jaxb.version}</version>
+        <version>${old.jaxb.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>${old.jaxb.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-core</artifactId>
+        <version>${old.jaxb.version}</version>
       </dependency>
 
       <dependency>