X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fpom.xml;h=f78ff11e90cf7f82789e015b9fa26e380658cc2f;hb=22b57cf9313f0b21a1dca090088b811eec8cca6a;hp=a68174cd3bb00448e0a4161d9822ca8524636144;hpb=4bf6e7f32c573b9c5096b84f6dd11674f2a53ad9;p=sdc.git

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index a68174cd3b..f78ff11e90 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -1,4 +1,5 @@
-<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>
 
@@ -8,11 +9,13 @@
     <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>
@@ -31,19 +34,6 @@
             <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>
@@ -52,11 +42,15 @@
         </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 -->
 
@@ -73,6 +67,13 @@
             <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>
@@ -274,10 +275,11 @@
             <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>
@@ -319,6 +321,10 @@
                     <artifactId>commons-collections</artifactId>
                     <groupId>commons-collections</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.thrift</groupId>
+                    <artifactId>libthrift</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -419,6 +425,11 @@
             <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 -->
@@ -436,6 +447,22 @@
                     <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>
 
@@ -485,6 +512,23 @@
             <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>
@@ -604,9 +648,9 @@
             <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>
 
@@ -659,6 +703,9 @@
                                         <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>
@@ -722,6 +769,7 @@
                                     </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>
@@ -787,6 +835,7 @@
                                     <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>
@@ -825,7 +874,9 @@
                             <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>