Bump SDC version 1.6.6

[sdc.git] / catalog-model / pom.xml

diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index a4538fd..fb29ed3 100644 (file)
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -1,5 +1,5 @@
 <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>
 
@@ -9,11 +9,10 @@
        <parent>
                <groupId>org.openecomp.sdc</groupId>
                <artifactId>sdc-main</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.6.6-SNAPSHOT</version>
        </parent>
 
        <dependencies>
-
                <!-- Common of SDC -->
                <dependency>
                        <groupId>org.openecomp.sdc</groupId>
@@ -21,7 +20,7 @@
                        <version>${project.version}</version>
                        <scope>provided</scope>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.openecomp.sdc.be</groupId>
                        <artifactId>common-be</artifactId>
@@ -32,14 +31,20 @@
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
+                       <version>${logback.version}</version>
                        <scope>provided</scope>
                </dependency>
+               <dependency>
+                       <groupId>com.google.code.bean-matchers</groupId>
+                       <artifactId>bean-matchers</artifactId>
+                       <version>${bean-matcher.version}</version>
+                       <scope>test</scope>
+               </dependency>
 
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
+                       <version>${logback.version}</version>
                        <scope>provided</scope>
                </dependency>
 
@@ -66,6 +71,14 @@
                </dependency>
 
                <!-- spring -->
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-core</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>provided</scope>
+               </dependency>
+
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-beans</artifactId>
@@ -89,7 +102,7 @@
                <dependency>
                        <groupId>org.hibernate</groupId>
                        <artifactId>hibernate-validator</artifactId>
-                       <version>5.0.1.Final</version>
+                       <version>5.3.6.Final</version>
                </dependency>
 
                <!-- Gson -->
@@ -100,11 +113,10 @@
                        <scope>provided</scope>
                </dependency>
 
-               <!-- TITAN -->
                <dependency>
-                       <groupId>com.thinkaurelius.titan</groupId>
-                       <artifactId>titan-core</artifactId>
-                       <version>${titan.version}</version>
+                       <groupId>org.janusgraph</groupId>
+                       <artifactId>janusgraph-core</artifactId>
+                       <version>${janusgraph.version}</version>
                        <scope>provided</scope>
                        <exclusions>
                                <exclusion>
@@ -115,13 +127,25 @@
                                        <artifactId>slf4j-log4j12</artifactId>
                                        <groupId>org.slf4j</groupId>
                                </exclusion>
+                               <exclusion>
+                                       <artifactId>commons-collections</artifactId>
+                                       <groupId>commons-collections</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>groovy</artifactId>
+                                       <groupId>org.codehaus.groovy</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.apache.thrift</groupId>
+                                       <artifactId>libthrift</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
 
                <dependency>
-                       <groupId>com.thinkaurelius.titan</groupId>
-                       <artifactId>titan-cassandra</artifactId>
-                       <version>${titan.version}</version>
+                       <groupId>org.janusgraph</groupId>
+                       <artifactId>janusgraph-cassandra</artifactId>
+                       <version>${janusgraph.version}</version>
                        <scope>provided</scope>
                        <exclusions>
                                <exclusion>
@@ -130,7 +154,6 @@
                                </exclusion>
                        </exclusions>
                </dependency>
-               <!-- TITAN END -->
 
                <dependency>
                        <groupId>org.apache.commons</groupId>
@@ -143,14 +166,14 @@
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
+                       <version>${httpclient.version}</version>
                        <scope>provided</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpcore</artifactId>
-            <version>${httpcore.version}</version>
+                       <version>${httpcore.version}</version>
                        <scope>provided</scope>
                </dependency>
 
@@ -167,6 +190,11 @@
                        <version>${cassandra.driver.version}</version>
                        <scope>provided</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.apache.thrift</groupId>
+                       <artifactId>libthrift</artifactId>
+                       <version>${libthrift.version}</version>
+               </dependency>
                <!-- CASSANDRA END -->
 
                <dependency>
@@ -178,8 +206,19 @@
 
                <dependency>
                        <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
-                       <version>${mockito.version}</version>
+                       <artifactId>mockito-core</artifactId>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.jmockit</groupId>
+                       <artifactId>jmockit</artifactId>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.assertj</groupId>
+                       <artifactId>assertj-core</artifactId>
                        <scope>test</scope>
                </dependency>
 
@@ -224,40 +263,88 @@
                        <version>${commons-jci-core.version}</version>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-module-junit4</artifactId>
+                       <version>1.7.0RC4</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-api-mockito-common</artifactId>
+                       <version>1.6.5</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.codehaus.groovy</groupId>
+                       <artifactId>groovy</artifactId>
+               </dependency>
+
+               <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-all</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>commons-collections4</artifactId>
+                       <version>${commons.collections.version}</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>io.netty</groupId>
+                       <artifactId>netty-handler</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.projectlombok</groupId>
+                       <artifactId>lombok</artifactId>
+                       <version>${lombok.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>joda-time</groupId>
+                       <artifactId>joda-time</artifactId>
+                       <version>${joda.time.version}</version>
+               </dependency>
+
        </dependencies>
        <build>
                <plugins>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-deploy-plugin</artifactId>
-                               <version>2.7</version>
                                <configuration>
                                        <skip>true</skip>
                                </configuration>
                        </plugin>
-               </plugins>
-       </build>
-       <profiles>
-               <profile>
-                       <id>Fortify</id>
-                       <activation>
-                               <activeByDefault>false</activeByDefault>
-                       </activation>
-
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>com.fortify.ps.maven.plugin</groupId>
-                                               <artifactId>sca-maven-plugin</artifactId>
-                                               <version>4.30</version>
+                       <plugin>
+                               <groupId>com.github.sylvainlaurent.maven</groupId>
+                               <artifactId>yaml-json-validator-maven-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>validate</id>
+                                               <phase>validate</phase>
+                                               <goals>
+                                                       <goal>validate</goal>
+                                               </goals>
                                                <configuration>
-                                                       <source>1.8</source>
-                                                       <buildId>${project.parent.artifactId}</buildId>
-                                                       <toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
+                                                       <validationSets>
+                                                               <validationSet>
+                                                                       <includes>
+                                                                               <include>src/main/resources/**/*.y*ml</include>
+                                                                               <include>src/test/resources/**/*.y*ml</include>
+                                                                       </includes>
+                                                               </validationSet>
+                                                               <validationSet>
+                                                                       <includes>
+                                                                               <include>src/main/resources/**/*.json</include>
+                                                                               <include>src/test/resources/**/*.json</include>
+                                                                       </includes>
+                                                               </validationSet>
+                                                       </validationSets>
                                                </configuration>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-</project>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
\ No newline at end of file