X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=openecomp-be%2Ftools%2Fswagger-ui%2Fpom.xml;h=e77ccdbac10e2e1356c4dcb6869664abab1ea8d4;hb=0560a3a55dd2ba8fe1af6aeed425dad09c7f7261;hp=8bacc056938c9d3e599c545db9997d584da438b4;hpb=7edf3d37320c593aa92d62338fe7fe2acb35b606;p=sdc.git

diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml
index 8bacc05693..e77ccdbac1 100644
--- a/openecomp-be/tools/swagger-ui/pom.xml
+++ b/openecomp-be/tools/swagger-ui/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>openecomp-sdc</artifactId>
-        <version>1.9.0-SNAPSHOT</version>
+        <version>1.13.6-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
     <dependencies>
@@ -26,6 +26,14 @@
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-servlets</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-server</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-core</artifactId>
@@ -34,6 +42,10 @@
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-web</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.functionaljava</groupId>
+                    <artifactId>functionaljava</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
@@ -56,7 +68,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>${mvn.jar.version}</version>
                 <executions>
                     <execution>
                         <id>default-jar</id>
@@ -78,11 +89,13 @@
                                 <copy todir="${basedir}/target/${plugin.name}/">
                                     <fileset dir="${rest.api.dir}/target/generated/swagger-ui/">
                                         <include name="*.json"/>
+                                        <include name="*.yaml"/>
                                     </fileset>
                                 </copy>
                                 <copy todir="${basedir}/target/${plugin.name}/">
-                                    <fileset dir="${catalog-be.api.dir}/target/generated/swagger/">
+                                    <fileset dir="${catalog-be.api.dir}/target/generated/openapi/">
                                         <include name="*.json"/>
+                                        <include name="*.yaml"/>
                                     </fileset>
                                 </copy>
                             </target>
@@ -96,7 +109,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>${mvn.assembly.version}</version>
+                <version>2.6</version>
                 <configuration>
                     <descriptor>assembly/swagger.xml</descriptor>
                     <finalName>${plugin.name}</finalName>