From 72d882f65031518e9d1b1a6d6e53c7d42ab8495f Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Wed, 30 Jun 2021 19:46:09 +0100
Subject: Restore swagger generation in CLAMP

THis patch restores the Swagger generation in CLAMP. It changes the
target directory for the swagger generation to be the target directory
rather than storing the generated Swagger files in the source
repository.

The reason for this is that it avolds the swagger.json, the
swagger.html, and the swagger.pdf files being generated each time a
build is done and being checked in multiple times. The swagger files
will be produced as an artifact from the build in a later review when
all the swagger documentation for CLAMP is consolidated.

Issue-ID: POLICY-3209
Change-Id: I6ccb446d01509232bbd4230b76bd7950858e1437
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 runtime/pom.xml | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'runtime/pom.xml')

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 0e458eabb..6efdec744 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -20,9 +20,8 @@
   ============LICENSE_END============================================
   ===================================================================
 -->
-<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">
+<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>
 
     <parent>
@@ -94,7 +93,7 @@
         <docker.skip.push>true</docker.skip.push>
         <docker.skip.tag>true</docker.skip.tag>
         <skip.staging.artifacts>false</skip.staging.artifacts>
-        <python.http.proxy.param/>
+        <python.http.proxy.param />
         <ui.react.src>ui-react</ui.react.src>
         <ui.react.lib.src>ui-react-lib</ui.react.lib.src>
         <npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
@@ -435,6 +434,13 @@
             <artifactId>docker-java</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Swagger models for swagger generation -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>${version.swagger}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -573,7 +579,7 @@
             </plugin>
             <!-- Read the swagger.json file and the definition from SwaggerConfig.java; generate
                 a list of .adoc files containing the APIs info in more structured way -->
-            <!-- plugin>
+            <plugin>
                 <groupId>io.github.swagger2markup</groupId>
                 <artifactId>swagger2markup-maven-plugin</artifactId>
                 <version>1.3.3</version>
@@ -590,7 +596,7 @@
                     </dependency>
                 </dependencies>
                 <configuration>
-                    <swaggerInput>${project.basedir}/docs/swagger/swagger.json</swaggerInput>
+                    <swaggerInput>${project.build.directory}/swagger/swagger.json</swaggerInput>
                     <outputDir>${project.build.directory}/asciidoc/generated</outputDir>
                     <config>
                         <swagger2markup.markupLanguage>ASCIIDOC</swagger2markup.markupLanguage>
@@ -604,11 +610,11 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin-->
+            </plugin>
 
             <!-- Run the generated asciidoc through Asciidoctor to generate other documentation
                 types, such as PDFs or HTML5 -->
-            <!-- plugin>
+            <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
                 <version>1.5.7.1</version>
@@ -643,8 +649,7 @@
                         </goals>
                         <configuration>
                             <backend>html5</backend>
-                            <outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
-                            <outputDirectory>${project.basedir}/src/main/resources/META-INF/resources/</outputDirectory>
+                            <outputDirectory>${project.build.directory}/swagger</outputDirectory>
                         </configuration>
                     </execution>
                     <execution>
@@ -655,11 +660,11 @@
                         </goals>
                         <configuration>
                             <backend>pdf</backend>
-                            <outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
+                            <outputDirectory>${project.build.directory}/swagger</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin-->
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.groovy.maven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
@@ -998,8 +1003,7 @@
                         <phase>post-integration-test</phase>
                         <configuration>
                             <fileSets>
-                                <fileSet
-                                        implementation="org.apache.maven.shared.model.fileset.FileSet">
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
                                     <directory>${project.build.directory}/coverage-reports</directory>
                                     <includes>
                                         <include>*.exec</include>
-- 
cgit 1.2.3-korg