Merge "Migrate parent from springboot to oparent"

diff --combined pom.xml
index 6b18e58,2d9ed7f..30d19d5
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -7,8 -7,8 +7,8 @@@
        OR CONDITIONS OF ANY KIND, either express or implied. See the License for 
        the specific language governing permissions and limitations under the License. -->
  <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -  xmlns="http://maven.apache.org/POM/4.0.0"
 -  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 +         xmlns="http://maven.apache.org/POM/4.0.0"
 +         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
  
    <groupId>org.onap.externalapi-nbi</groupId>
@@@ -21,7 -21,7 +21,7 @@@
    <parent>
      <groupId>org.onap.oparent</groupId>
      <artifactId>oparent</artifactId>
-     <version>1.2.0</version>
+     <version>2.0.0</version>
    </parent>
  
    <properties>
@@@ -168,13 -168,6 +168,13 @@@
        <version>1.5.18</version>
      </dependency>
  
 +    <!-- swagger core -->
 +    <dependency>
 +      <groupId>io.swagger</groupId>
 +      <artifactId>swagger-core</artifactId>
 +      <version>1.5.18</version>
 +    </dependency>
 +
      <!-- jackson -->
  
      <dependency>
@@@ -188,6 -181,12 +188,12 @@@
        <groupId>org.onap.sdc.sdc-tosca</groupId>
        <artifactId>sdc-tosca</artifactId>
        <version>1.4.6</version>
+       <exclusions>
+         <exclusion>
+           <groupId>com.google.guava</groupId>
+           <artifactId>guava</artifactId>
+         </exclusion>
+       </exclusions>     
      </dependency>
  
      <!-- jolt -->
@@@ -278,6 -277,17 +284,17 @@@
        <groupId>org.onap.msb.java-sdk</groupId>
        <artifactId>msb-java-sdk</artifactId>
        <version>1.2.0</version>
+       <exclusions>
+         <exclusion>
+           <groupId>com.google.guava</groupId>
+           <artifactId>guava</artifactId>
+         </exclusion>
+       </exclusions>        
+     </dependency>
+     
+     <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
      </dependency>
  
      <!-- karate -->