Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Replace architecture image in the docs
[sdc.git] / catalog-model / pom.xml
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index 59f499f..3752d79 100644 (file)
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -6,186 +6,101 @@
        <groupId>org.openecomp.sdc.be</groupId>
        <artifactId>catalog-model</artifactId>
 
-       
        <parent>
                <groupId>org.openecomp.sdc</groupId>
                <artifactId>sdc-main</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
-       
-       
 
        <dependencies>
 
+               <!-- Common of SDC -->
                <dependency>
-                       <groupId>commons-logging</groupId>
-                       <artifactId>commons-logging</artifactId>
-                       <version>1.2.1-SNAPSHOT</version>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
-                       <version>2.0-SNAPSHOT</version>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-core</artifactId>
-                       <version>${spring.version}</version>
+                       <groupId>org.openecomp.sdc</groupId>
+                       <artifactId>common-app-api</artifactId>
+                       <version>${project.version}</version>
                        <scope>provided</scope>
                </dependency>
-
+               
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-beans</artifactId>
-                       <version>${spring.version}</version>
+                       <groupId>org.openecomp.sdc.be</groupId>
+                       <artifactId>common-be</artifactId>
+                       <version>${project.version}</version>
                        <scope>provided</scope>
                </dependency>
 
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-                       <version>${spring.version}</version>
+                       <groupId>ch.qos.logback</groupId>
+                       <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
                        <scope>provided</scope>
                </dependency>
 
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context-support</artifactId>
-                       <version>${spring.version}</version>
+                       <groupId>ch.qos.logback</groupId>
+                       <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
                        <scope>provided</scope>
                </dependency>
 
+               <!-- catalog dao -->
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-messaging</artifactId>
-                       <version>${spring.version}</version>
+                       <groupId>org.openecomp.sdc.be</groupId>
+                       <artifactId>catalog-dao</artifactId>
+                       <version>${project.version}</version>
                        <scope>provided</scope>
                </dependency>
 
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-web</artifactId>
-                       <version>${spring.version}</version>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+                       <version>${guava.version}</version><!--$NO-MVN-MAN-VER$ -->
                        <scope>provided</scope>
                </dependency>
 
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-webmvc</artifactId>
-                       <version>${spring.version}</version>
+                       <groupId>org.functionaljava</groupId>
+                       <artifactId>functionaljava</artifactId>
+                       <version>${functionaljava.version}</version>
                        <scope>provided</scope>
                </dependency>
 
+               <!-- spring -->
                <dependency>
                        <groupId>org.springframework</groupId>
-                       <artifactId>spring-aop</artifactId>
+                       <artifactId>spring-beans</artifactId>
                        <version>${spring.version}</version>
                        <scope>provided</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.springframework</groupId>
-                       <artifactId>spring-aspects</artifactId>
+                       <artifactId>spring-context</artifactId>
                        <version>${spring.version}</version>
                        <scope>provided</scope>
                </dependency>
 
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-test</artifactId>
-                       <version>${spring.version}</version>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-expression</artifactId>
-                       <version>${spring.version}</version>
-                       <scope>test</scope>
-               </dependency>
-
-
-               <!-- Common of SD&C -->
-               <dependency>
-                       <groupId>org.openecomp.sdc</groupId>
-                       <artifactId>common-app-api</artifactId>
-                       <version>${common-app-api.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.openecomp.sdc.be</groupId>
-                       <artifactId>common-be</artifactId>
-                       <version>${common-be.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               
-               <dependency>
-                       <groupId>ch.qos.logback</groupId>
-                       <artifactId>logback-classic</artifactId>
-                       <scope>provided</scope>
+                       <groupId>javax.validation</groupId>
+                       <artifactId>validation-api</artifactId>
+                       <version>1.1.0.Final</version>
                </dependency>
 
                <dependency>
-                       <groupId>ch.qos.logback</groupId>
-                       <artifactId>logback-core</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-               
-               <!--  catalog dao -->
-               <dependency>
-                       <groupId>org.openecomp.sdc.be</groupId>
-                       <artifactId>catalog-dao</artifactId>
-                       <version>${catalog-dao.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               
-               <!--  -->
-               <dependency>    
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>${guava.version}</version><!--$NO-MVN-MAN-VER$-->
-                       <scope>provided</scope>
-               </dependency>
-               
-                <dependency>
-               <groupId>org.functionaljava</groupId>
-                       <artifactId>functionaljava</artifactId>
-               <scope>provided</scope> 
-                </dependency>
-               
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-               
-               <!-- spring -->
-               
-                <dependency>
-               <groupId>javax.validation</groupId>
-               <artifactId>validation-api</artifactId>
-               <version>1.1.0.Final</version>
+                       <groupId>org.hibernate</groupId>
+                       <artifactId>hibernate-validator</artifactId>
+                       <version>5.0.1.Final</version>
                </dependency>
 
+               <!-- Gson -->
                <dependency>
-               <groupId>org.hibernate</groupId>
-                       <artifactId>hibernate-validator</artifactId>
-               <version>5.3.4.Final</version>
-       </dependency> 
-
-               <!-- Gson -->
-               <dependency>
                        <groupId>com.google.code.gson</groupId>
                        <artifactId>gson</artifactId>
-                       <version>2.3.1</version>
+                       <version>${gson.version}</version>
                        <scope>provided</scope>
                </dependency>
-       
-               <!-- TITAN -->
+
+               <!-- TITAN -->
                <dependency>
                        <groupId>com.thinkaurelius.titan</groupId>
                        <artifactId>titan-core</artifactId>
@@ -204,8 +119,8 @@
                </dependency>
 
                <dependency>
-                       <groupId>com.thinkaurelius.titan</groupId>
-                       <artifactId>titan-cassandra</artifactId>
+                       <groupId>org.openecomp.sdc.sdc-titan-cassandra</groupId>
+                       <artifactId>sdc-titan-cassandra</artifactId>
                        <version>${titan.version}</version>
                        <scope>provided</scope>
                        <exclusions>
@@ -215,27 +130,30 @@
                                </exclusion>
                        </exclusions>
                </dependency>
-               <!-- TITAN END-->
-               
-               <dependency>
+               <!-- TITAN END -->
+
+               <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-lang3</artifactId>
+                       <version>${lang3.version}</version>
                        <scope>provided</scope>
                </dependency>
-               
-                <!--  http client -->
+
+               <!-- http client -->
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
                        <scope>provided</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpcore</artifactId>
+            <version>${httpcore.version}</version>
                        <scope>provided</scope>
                </dependency>
-               
+
                <!-- CASSANDRA -->
                <dependency>
                        <groupId>com.datastax.cassandra</groupId>
@@ -250,62 +168,75 @@
                        <scope>provided</scope>
                </dependency>
                <!-- CASSANDRA END -->
-               
-               <!-- test -->
-               
-               <!--dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
-                       <scope>test</scope>
-               </dependency-->
- 
-               
+
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
+                       <version>${junit.version}</version>
                        <scope>test</scope>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
+                       <version>${mockito.version}</version>
                        <scope>test</scope>
                </dependency>
 
                <dependency>
-                       <groupId>org.aspectj</groupId> 
-                       <artifactId>aspectjrt</artifactId> 
-                       <version>1.7.4</version>
-                       <scope>test</scope> 
-               </dependency>
-               
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-test</artifactId>
+                       <version>${spring.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
                <dependency>
-                       <groupId>org.aspectj</groupId> 
-                       <artifactId>aspectjweaver</artifactId> 
-                       <version>1.7.4</version>
-                       <scope>test</scope>
-               </dependency>
-               
+                       <groupId>org.aspectj</groupId>
+                       <artifactId>aspectjrt</artifactId>
+                       <version>${aspectj.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.aspectj</groupId>
+                       <artifactId>aspectjweaver</artifactId>
+                       <version>${aspectj.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-web</artifactId>
                        <version>${spring.version}</version>
                        <scope>test</scope>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-tx</artifactId>
                        <scope>test</scope>
                        <version>4.0.7.RELEASE</version>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-jci-core</artifactId>
+                       <version>${commons-jci-core.version}</version>
                        <scope>test</scope>
                </dependency>
-       </dependencies>
+        <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>
+    </dependencies>
        <build>
                <plugins>
                        <plugin>
@@ -318,27 +249,4 @@
                        </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>
-                                               <configuration>
-                                                       <source>1.8</source>
-                                                       <buildId>${project.parent.artifactId}</buildId>
-                                                       <toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
-                                               </configuration>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
 </project>
SDC Parent Project Catalog FE and BE