Update release note

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

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index fd25bc2..3f3e706 100644 (file)
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>sdc-main</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.8.5-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -364,6 +364,10 @@
             <version>${janusgraph.version}</version>
             <scope>compile</scope>
             <exclusions>
+                <exclusion>
+                    <artifactId>gremlin-groovy</artifactId>
+                    <groupId>org.apache.tinkerpop</groupId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.json</groupId>
                     <artifactId>json</artifactId>
@@ -497,6 +501,10 @@
                     <groupId>xerces</groupId>
                     <artifactId>xercesImpl</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -533,11 +541,24 @@
         </dependency>
 
         <!--Jetty Proxy-->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+            <version>${jetty.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-proxy</artifactId>
             <version>${jetty.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -545,6 +566,12 @@
             <artifactId>jetty-servlets</artifactId>
             <version>${jetty.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- System metrics -->
         <dependency>
@@ -630,6 +657,16 @@
             <version>${jersey-bom.version}</version>
             <type>pom</type>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-server</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-continuation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -643,6 +680,12 @@
             <artifactId>jetty-webapp</artifactId>
             <version>${jetty.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -736,7 +779,7 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>2.4.8</version>
+            <version>${groovy.version}</version>
         </dependency>
 
         <dependency>
@@ -801,7 +844,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkCount>1</forkCount>
+                    <forkCount>1C</forkCount>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
@@ -985,6 +1029,68 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>io.swagger.core.v3</groupId>
+                <artifactId>swagger-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>sdce-2-sdce-5</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>resolve</goal>
+                        </goals>
+                        <configuration>
+                            <contextId>sdce-2-sdce-5</contextId>
+                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
+                            <outputFileName>swagger-sdce-2-sdce-5</outputFileName>
+                            <outputFormat>JSON</outputFormat>
+                            <configurationFilePath>${project.basedir}/src/main/resources/swagger-config/sdce-2-sdce-5.yaml</configurationFilePath>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sdce-4</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>resolve</goal>
+                        </goals>
+                        <configuration>
+                            <contextId>sdce-4</contextId>
+                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
+                            <outputFileName>swagger-sdce-4</outputFileName>
+                            <outputFormat>JSON</outputFormat>
+                            <configurationFilePath>${project.basedir}/src/main/resources/swagger-config/sdce-4.yaml</configurationFilePath>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sdce-6</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>resolve</goal>
+                        </goals>
+                        <configuration>
+                            <contextId>sdce-6</contextId>
+                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
+                            <outputFileName>swagger-sdce-6</outputFileName>
+                            <outputFormat>JSON</outputFormat>
+                            <configurationFilePath>${project.basedir}/src/main/resources/swagger-config/sdce-6.yaml</configurationFilePath>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>sdce-7</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>resolve</goal>
+                        </goals>
+                        <configuration>
+                            <contextId>sdce-7</contextId>
+                            <outputPath>${project.build.directory}/generated/swagger</outputPath>
+                            <outputFileName>swagger-sdce-7</outputFileName>
+                            <outputFormat>JSON</outputFormat>
+                            <configurationFilePath>${project.basedir}/src/main/resources/swagger-config/sdce-7.yaml</configurationFilePath>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
 
         <pluginManagement>