<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">
+ 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>
<artifactId>catalog-be</artifactId>
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<properties>
+ <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
</properties>
<dependencies>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
-
<dependency>
- <groupId>com.tinkerpop.blueprints</groupId>
- <artifactId>blueprints-sail-graph</artifactId>
- <version>2.5.0</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.onap.sdc.common</groupId>
+ <artifactId>onap-tosca-datatype</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.tinkerpop.blueprints</groupId>
- <artifactId>blueprints-graph-sail</artifactId>
- <version>2.5.0</version>
- <optional>true</optional>
+ <groupId>org.onap.sdc.common</groupId>
+ <artifactId>onap-generic-artifact-browser-service</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
</dependency>
<!-- Swagger Dependencies Start -->
</dependency>
-
<!-- CAMBRIA CLIENT for U-EB -->
<dependency>
<groupId>com.att.nsa</groupId>
<artifactId>gremlin-groovy</artifactId>
<version>3.0.1-incubating</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>groovy</artifactId>
+ <groupId>org.codehaus.groovy</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- CASSANDRA -->
<!-- Inserted for ECOMP Portal Integration -->
<dependency>
- <groupId>org.openecomp.ecompsdkos</groupId>
+ <groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-fw</artifactId>
<version>${ecomp.version}</version>
<scope>compile</scope>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>java-hamcrest</artifactId>
+ <version>${java-hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.4.8</version>
</dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.sdc.common</groupId>
+ <artifactId>onap-tosca-datatype</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons.collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.mapper.version}</version>
+ </dependency>
</dependencies>
<build>
</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>
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${project.parent.basedir}/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default</outputDirectory>
+ <outputDirectory>
+ ${project.parent.basedir}/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default
+ </outputDirectory>
<resources>
<resource>
- <directory>${project.parent.basedir}/catalog-be/src/main/resources/config</directory>
+ <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>
<outputDirectory>${project.parent.basedir}/asdctool/tosca</outputDirectory>
<resources>
<resource>
- <directory>${project.parent.basedir}/catalog-be/src/main/resources/import/tosca</directory>
+ <directory>${project.parent.basedir}/catalog-be/src/main/resources/import/tosca
+ </directory>
<filtering>true</filtering>
</resource>
</resources>
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default</outputDirectory>
+ <outputDirectory>
+ sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/files/default
+ </outputDirectory>
<resources>
<resource>
<directory>${project.parent.basedir}/catalog-be/target</directory>
<dockerFileDir>${project.basedir}/sdc-backend</dockerFileDir>
<tags>
<tag>${docker.tag}</tag>
- <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+ <tag>
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ </tag>
</tags>
</build>
</image>
<dockerFileDir>${project.basedir}/sdc-backend-init</dockerFileDir>
<tags>
<tag>${docker.tag}</tag>
- <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+ <tag>
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ </tag>
</tags>
</build>
</image>