-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</parent>
<properties>
<java-hamcrest.version>2.0.0.0</java-hamcrest.version>
+ <swagger.version>2.0.8</swagger.version>
+ <swagger.jaxrs.version>1.5.22</swagger.jaxrs.version>
</properties>
<dependencies>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>security-utils</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.sdc.common</groupId>
- <artifactId>onap-tosca-datatype</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
<dependency>
<groupId>org.onap.sdc.common</groupId>
<artifactId>onap-generic-artifact-browser-service</artifactId>
</dependency>
<!-- Swagger Dependencies Start -->
+ <dependency>
+ <groupId>io.swagger.core.v3</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
- <scope>compile</scope>
- <version>1.5.15</version>
+ <version>${swagger.jaxrs.version}</version>
</dependency>
<!-- Swagger Dependencies End -->
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.openecomp.sdc.be</groupId>
+ <artifactId>common-be</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.openecomp.sdc.be</groupId>
<artifactId>catalog-dao</artifactId>
<scope>compile</scope>
</dependency>
+ <!-- Spring integration (optional) -->
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <scope>compile</scope>
+ <groupId>org.togglz</groupId>
+ <artifactId>togglz-spring-web</artifactId>
+ <version>${togglz.version}</version>
</dependency>
<dependency>
<artifactId>commons-collections</artifactId>
<groupId>commons-collections</groupId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<version>${cassandra.driver.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>${libthrift.version}</version>
+ </dependency>
<!-- CASSANDRA END -->
<!-- Inserted for ECOMP Portal Integration -->
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>powermock-api-mockito</artifactId>
+ <groupId>org.powermock</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId> org.onap.aaf.authz</groupId>
+ <artifactId> aaf-cadi-aaf</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>aaf-cadi-core</artifactId>
+ <groupId>org.onap.aaf.authz</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-codec</artifactId>
+ <groupId>commons-codec</groupId>
+ </exclusion>
</exclusions>
</dependency>
<scope>provided</scope>
</dependency>
+ <!-- CADI -->
+ <dependency>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-aaf</artifactId>
+ <version>${cadi.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.datastax.cassandra</groupId>
+ <artifactId>cassandra-driver-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- TEST -->
<dependency>
<groupId>org.assertj</groupId>
<version>${jackson.mapper.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>${commons.collections.version}</version>
+ <groupId>org.onap.sdc.sdc-be-common</groupId>
+ <artifactId>security-util-lib</artifactId>
+ <version>${security.util.lib.version}</version>
</dependency>
</dependencies>
<include>src/main/resources/**/*.y*ml</include>
<include>src/test/resources/**/*.y*ml</include>
</includes>
+ <excludes>
+ <exclude>src/test/resources/artifacts/pnfSoftwareInformation/**</exclude>
+ </excludes>
</validationSet>
<validationSet>
<includes>
</directory>
<followSymlinks>false</followSymlinks>
<includes>
+ <include>Artifact-Generator.properties</include>
<include>error-configuration.yaml</include>
<include>ecomp-error-configuration.yaml</include>
<include>logback.xml</include>
<directory>${project.parent.basedir}/catalog-be/src/main/resources/config
</directory>
<includes>
+ <include>Artifact-Generator.properties</include>
<include>error-configuration.yaml</include>
<include>ecomp-error-configuration.yaml</include>
<include>logback.xml</include>
<springmvc>false</springmvc>
<schemes>http</schemes>
<basePath>/sdc</basePath>
- <locations>io.swagger.jaxrs.json;org.openecomp.sdc.be.externalapi.servlet;org.openecomp.sdc.be.distribution.servlet;org.openecomp.normative.api</locations>
+ <locations>
+ io.swagger.jaxrs.json;org.openecomp.sdc.be.externalapi.servlet;org.openecomp.sdc.be.distribution.servlet;org.openecomp.normative.api
+ </locations>
<info>
<title>External Rest API</title>
<version>v1.0</version>