From 3605d0a0dc7a022059db0db6f0394f02cbf967fd Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 14 Jul 2021 17:52:12 +0100 Subject: Replace swagger doc gen with commmon approach The swagger documentation generation is moved to policy-parent. This commit removes the CLAMP swagger document generation and replaces it with the common handling. It also fixes the following bug: The current CLAMP build generates the swagger.json file using a unit test case. That file is used later in the build to generate a swagger.pdf and swagger.html file. If the tests are skipped, the swagger.json file is not generated and the build fails on the PDF/html generation step. This change adds a profile to the build that only does the PDF/html generation when the skipTests flag is off. Issue-ID: POLICY-3424 Change-Id: Id195fc600d8fca7bfa5d9003272520d57414d646 Signed-off-by: liamfallon --- runtime/pom.xml | 91 ++---------------------- runtime/src/main/resources/asciidoc/swagger.adoc | 4 -- 2 files changed, 4 insertions(+), 91 deletions(-) delete mode 100644 runtime/src/main/resources/asciidoc/swagger.adoc (limited to 'runtime') diff --git a/runtime/pom.xml b/runtime/pom.xml index 4c8bf24f9..d55c2cab8 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -97,6 +97,9 @@ ui-react ui-react-lib https://nexus3.onap.org/repository/npm.snapshot/ + + + post-integration-test @@ -152,6 +155,7 @@ + @@ -570,94 +574,7 @@ - - - io.github.swagger2markup - swagger2markup-maven-plugin - 1.3.3 - - - io.github.swagger2markup - swagger2markup-import-files-ext - 1.3.3 - - - io.github.swagger2markup - swagger2markup-spring-restdocs-ext - 1.3.3 - - - - ${project.build.directory}/swagger/swagger.json - ${project.build.directory}/asciidoc/generated - - ASCIIDOC - - - - - post-integration-test - - convertSwagger2markup - - - - - - - - org.asciidoctor - asciidoctor-maven-plugin - 1.5.7.1 - - - org.asciidoctor - asciidoctorj-pdf - 1.5.0-alpha.10.1 - - - - ${project.basedir}/src/main/resources/asciidoc - swagger.adoc - - book - left - 3 - - - - - ${project.build.directory}/asciidoc/generated - - - - - output-html - post-integration-test - - process-asciidoc - - - html5 - ${project.build.directory}/swagger - - - - output-pdf - post-integration-test - - process-asciidoc - - - pdf - ${project.build.directory}/swagger - - - - org.codehaus.groovy.maven gmaven-plugin diff --git a/runtime/src/main/resources/asciidoc/swagger.adoc b/runtime/src/main/resources/asciidoc/swagger.adoc deleted file mode 100644 index 6896747fd..000000000 --- a/runtime/src/main/resources/asciidoc/swagger.adoc +++ /dev/null @@ -1,4 +0,0 @@ -include::{generated}/overview.adoc[] -include::{generated}/paths.adoc[] -include::{generated}/security.adoc[] -include::{generated}/definitions.adoc[] \ No newline at end of file -- cgit 1.2.3-korg