X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=openecomp-be%2Ftools%2Fswagger-ui%2Fpom.xml;h=2fbdcafb24b49c1a260ea268f36c93c806b4c7a3;hb=38812c3d47f0426f1c4108145b696441da5a5c1f;hp=c64ce4940cb7c52f55302288fcd8d959680e09ba;hpb=94133cb583800ecd72ee0c736284c6ead18450c9;p=sdc.git

diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml
index c64ce4940c..2fbdcafb24 100644
--- a/openecomp-be/tools/swagger-ui/pom.xml
+++ b/openecomp-be/tools/swagger-ui/pom.xml
@@ -1,6 +1,6 @@
 <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/maven-v4_0_0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>api-docs</artifactId>
     <groupId>org.openecomp.sdc.onboarding</groupId>
@@ -8,14 +8,52 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>openecomp-sdc</artifactId>
-        <version>1.8.2-SNAPSHOT</version>
+        <version>1.13.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
-
+    <dependencies>
+        <dependency>
+            <groupId>org.openecomp.sdc</groupId>
+            <artifactId>catalog-be</artifactId>
+            <version>${project.version}</version>
+            <classifier>classes</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+                <exclusion>
+                    <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>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.functionaljava</groupId>
+                    <artifactId>functionaljava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
     <properties>
         <plugin.name>api-docs</plugin.name>
-        <rest.api.dir>${basedir}/../../api/openecomp-sdc-rest-webapp/onboarding-rest-war</rest.api.dir>
-        <api.json.file>api.json</api.json.file>
+        <rest.api.dir>${basedir}/../../api/openecomp-sdc-rest-webapp/onboarding-rest-war
+        </rest.api.dir>
+        <catalog-be.api.dir>${basedir}/../../../catalog-be</catalog-be.api.dir>
     </properties>
     <build>
         <plugins>
@@ -30,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>
@@ -39,16 +76,29 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
+                <version>${maven-antrun-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>copy</id>
                         <phase>package</phase>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <echo message="Copy api json files"/>
-                                <copy file="${rest.api.dir}/target/generated/swagger-ui/swagger.json" tofile="${basedir}/target/${plugin.name}/${api.json.file}"/>
-                            </tasks>
+                                <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/openapi/">
+                                        <include name="*.json"/>
+                                        <include name="*.yaml"/>
+                                    </fileset>
+                                </copy>
+                            </target>
                         </configuration>
                         <goals>
                             <goal>run</goal>
@@ -59,12 +109,12 @@
             <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>
                     <outputDirectory>${basedir}/target/${plugin.name}</outputDirectory>
-					<appendAssemblyId>false</appendAssemblyId>
+                    <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
                 <executions>
                     <execution>