diff options
Diffstat (limited to 'openecomp-be')
| -rw-r--r-- | openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml | 24 | ||||
| -rw-r--r-- | openecomp-be/tools/swagger-ui/pom.xml | 19 | ||||
| -rw-r--r-- | openecomp-be/tools/zusammen-tools/pom.xml | 11 |
3 files changed, 34 insertions, 20 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index e57029be2a..bf5696e83b 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.openecomp.sdc.onboarding</groupId> @@ -30,12 +30,12 @@ <artifactId>openecomp-sdc-notification-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.openecomp.sdc</groupId> <artifactId>openecomp-sdc-notification-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>vnf-repository-rest-services</artifactId> <version>${project.version}</version> @@ -231,17 +231,21 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> + <version>${maven-antrun-plugin.version}</version> <executions> <execution> <id>generate-sources</id> <phase>generate-sources</phase> <configuration> - <tasks> + <target> <property name="version" value="${project.version}"/> <mkdir dir="target/docs"/> - <echo file="target/docs/build-info.json">{"Version": "${project.version}"}</echo> - </tasks> + <echo file="target/docs/build-info.json">{"Version": + "${project.version}"} + </echo> + </target> </configuration> <goals> <goal>run</goal> @@ -252,11 +256,15 @@ <plugin> <groupId>io.swagger.core.v3</groupId> <artifactId>swagger-maven-plugin</artifactId> + <version>${swagger-core-mvn-plugin.version}</version> <configuration> <outputPath>${project.build.directory}/generated/swagger-ui</outputPath> <outputFileName>swagger-sdce-1</outputFileName> <outputFormat>JSON</outputFormat> - <configurationFilePath>${project.basedir}/src/main/resources/swagger-config.yaml</configurationFilePath> + <configurationFilePath> + ${project.basedir}/src/main/resources/swagger-config.yaml + </configurationFilePath> + <skip>${swagger.skip}</skip> </configuration> <executions> <execution> diff --git a/openecomp-be/tools/swagger-ui/pom.xml b/openecomp-be/tools/swagger-ui/pom.xml index 903dab706b..07391a615e 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> @@ -14,7 +14,8 @@ <properties> <plugin.name>api-docs</plugin.name> - <rest.api.dir>${basedir}/../../api/openecomp-sdc-rest-webapp/onboarding-rest-war</rest.api.dir> + <rest.api.dir>${basedir}/../../api/openecomp-sdc-rest-webapp/onboarding-rest-war + </rest.api.dir> <api.json.file>api.json</api.json.file> </properties> <build> @@ -39,16 +40,20 @@ </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-sdce-1.json" tofile="${basedir}/target/${plugin.name}/${api.json.file}"/> - </tasks> + <copy + file="${rest.api.dir}/target/generated/swagger-ui/swagger-sdce-1.json" + tofile="${basedir}/target/${plugin.name}/${api.json.file}"/> + </target> </configuration> <goals> <goal>run</goal> @@ -64,7 +69,7 @@ <descriptor>assembly/swagger.xml</descriptor> <finalName>${plugin.name}</finalName> <outputDirectory>${basedir}/target/${plugin.name}</outputDirectory> - <appendAssemblyId>false</appendAssemblyId> + <appendAssemblyId>false</appendAssemblyId> </configuration> <executions> <execution> diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index 15f8b716b7..a9a5f5f25c 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -15,8 +15,8 @@ --> <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"> + 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> <artifactId>openecomp-zusammen-tools</artifactId> @@ -175,15 +175,16 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> + <version>${maven-antrun-plugin.version}</version> <executions> <execution> <id>ant-test</id> <phase>package</phase> <configuration> - <tasks> + <target> <fixcrlf srcdir="./" eol="unix" - includes="zusammenMainTool.sh"/> - </tasks> + includes="zusammenMainTool.sh"/> + </target> </configuration> <goals> <goal>run</goal> |