Merge "Service Catalog - json schema reference"

diff --combined pom.xml
index 258e968,f3e0ab4..6b18e58
--- 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>
@@@ -19,17 -19,15 +19,17 @@@
    <name>externalapi-nbi</name>
  
    <parent>
 -    <groupId>org.springframework.boot</groupId>
 -    <artifactId>spring-boot-starter-parent</artifactId>
 -    <version>2.1.2.RELEASE</version>
 -    <relativePath/> <!-- lookup parent from repository -->
 +    <groupId>org.onap.oparent</groupId>
 +    <artifactId>oparent</artifactId>
 +    <version>1.2.0</version>
    </parent>
  
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 +    <maven.compiler.target>1.8</maven.compiler.target>
 +    <maven.compiler.source>1.8</maven.compiler.source>
 +    <start-class>org.onap.nbi.Application</start-class>
      <nexusproxy>https://nexus.onap.org</nexusproxy>
      <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
      <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
@@@ -95,28 -93,50 +95,28 @@@
      </license>
    </licenses>
  
 +  <dependencyManagement>
 +    <dependencies>
 +      <dependency>
 +        <groupId>org.springframework.boot</groupId>
 +        <artifactId>spring-boot-dependencies</artifactId>
 +        <version>2.1.3.RELEASE</version>
 +        <type>pom</type>
 +        <scope>import</scope>
 +      </dependency>
 +    </dependencies>
 +  </dependencyManagement>
 +
    <dependencies>
  
      <dependency>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-web</artifactId>
 -      <exclusions>
 -        <exclusion>
 -          <groupId>ch.qos.logback</groupId>
 -          <artifactId>logback-classic</artifactId>
 -        </exclusion>
 -        <exclusion>
 -          <groupId>com.fasterxml.jackson.core</groupId>
 -          <artifactId>jackson-databind</artifactId>
 -        </exclusion>
 -      </exclusions>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>com.fasterxml.jackson.core</groupId>
 -      <artifactId>jackson-databind</artifactId>
 -      <version>2.9.4</version>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>ch.qos.logback</groupId>
 -      <artifactId>logback-classic</artifactId>
 -      <version>1.2.3</version>
      </dependency>
  
      <dependency>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-data-jpa</artifactId>
 -      <exclusions>
 -        <exclusion>
 -          <groupId>org.springframework.data</groupId>
 -          <artifactId>spring-data-commons</artifactId>
 -        </exclusion>
 -      </exclusions>
 -    </dependency>
 -
 -    <dependency>
 -      <groupId>org.springframework.data</groupId>
 -      <artifactId>spring-data-commons</artifactId>
 -      <version>2.1.4.RELEASE</version>
      </dependency>
  
      <dependency>
@@@ -139,11 -159,13 +139,11 @@@
      <dependency>
        <groupId>javax.validation</groupId>
        <artifactId>validation-api</artifactId>
 -      <version>2.0.1.Final</version>
      </dependency>
  
      <dependency>
        <groupId>org.apache.commons</groupId>
        <artifactId>commons-lang3</artifactId>
 -      <version>3.4</version>
      </dependency>
  
      <!-- mongo -->
@@@ -158,6 -180,7 +158,6 @@@
      <dependency>
        <groupId>org.mariadb.jdbc</groupId>
        <artifactId>mariadb-java-client</artifactId>
 -      <version>1.1.7</version>
      </dependency>
  
      <!-- swagger -->
@@@ -168,11 -191,19 +168,18 @@@
        <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>
        <groupId>com.fasterxml.jackson.dataformat</groupId>
        <artifactId>jackson-dataformat-yaml</artifactId>
 -      <version>2.9.6</version>
      </dependency>
  
      <!-- sdc tosca parser -->
@@@ -228,6 -259,7 +235,6 @@@
      <dependency>
        <groupId>de.flapdoodle.embed</groupId>
        <artifactId>de.flapdoodle.embed.mongo</artifactId>
 -      <version>${embedded-mongo.version}</version>
        <scope>test</scope>
      </dependency>
  
@@@ -270,7 -302,13 +277,7 @@@
      <dependency>
        <groupId>org.onap.msb.java-sdk</groupId>
        <artifactId>msb-java-sdk</artifactId>
 -      <version>1.1.1</version>
 -      <exclusions>
 -        <exclusion>
 -          <groupId>com.fasterxml.jackson.core</groupId>
 -          <artifactId>jackson-databind</artifactId>
 -        </exclusion>
 -      </exclusions>
 +      <version>1.2.0</version>
      </dependency>
  
      <!-- karate -->
@@@ -281,7 -319,6 +288,7 @@@
        <version>0.9.0</version>
        <scope>test</scope>
      </dependency>
 +
      <dependency>
        <groupId>com.intuit.karate</groupId>
        <artifactId>karate-apache</artifactId>
@@@ -289,6 -326,7 +296,6 @@@
        <scope>test</scope>
      </dependency>
  
 -
    </dependencies>
  
    <build>
@@@ -307,16 -345,6 +314,16 @@@
        <plugin>
          <groupId>org.springframework.boot</groupId>
          <artifactId>spring-boot-maven-plugin</artifactId>
 +        <executions>
 +          <execution>
 +            <goals>
 +              <goal>repackage</goal>
 +            </goals>
 +            <configuration>
 +              <mainClass>org.onap.nbi.Application</mainClass>
 +            </configuration>
 +          </execution>
 +        </executions>
        </plugin>
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
@@@ -333,6 -361,7 +340,6 @@@
        <plugin>
          <groupId>org.sonatype.plugins</groupId>
          <artifactId>nexus-staging-maven-plugin</artifactId>
 -        <version>1.6.7</version>
          <extensions>true</extensions>
          <configuration>
            <nexusUrl>${nexusproxy}</nexusUrl>
@@@ -343,6 -372,7 +350,6 @@@
        <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-site-plugin</artifactId>
 -        <version>3.6</version>
          <dependencies>
            <dependency>
              <groupId>org.apache.maven.wagon</groupId>
@@@ -470,7 -500,7 +477,7 @@@
            <plugin>
              <groupId>io.fabric8</groupId>
              <artifactId>docker-maven-plugin</artifactId>
 -            <version>0.26.1</version>
 +            <version>0.28.0</version>
              <configuration>
                <verbose>true</verbose>
                <apiVersion>1.23</apiVersion>