From: Huabing Zhao <zhaohuabing@gmail.com>
Date: Thu, 11 Jul 2019 05:05:07 +0000 (+0800)
Subject: Fix API Gateway stage job
X-Git-Tag: 1.2.6~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=msb%2Fapigateway.git;a=commitdiff_plain;h=faabc5c70fd285d3698d45516841f99459a89bea

Fix API Gateway stage job

Issue-ID: MSB-338
Change-Id: I42c9787779a617da37fa7c1c7ca4d643eca791a5
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
---

diff --git a/apiroute/apiroute-service/dependency-reduced-pom.xml b/apiroute/apiroute-service/dependency-reduced-pom.xml
deleted file mode 100644
index dc31254..0000000
--- a/apiroute/apiroute-service/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-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/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>apiroute-parent</artifactId>
-    <groupId>org.onap.msb.apigateway.apiroute</groupId>
-    <version>1.2.4-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.onap.msb.apigateway.apiroute</groupId>
-  <artifactId>apiroute-service</artifactId>
-  <name>onap/msb/apigateway/apiroute/apiroute-service</name>
-  <version>1.2.4-SNAPSHOT</version>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <includes>
-          <include>**/*.properties</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <transformers>
-                <transformer />
-                <transformer>
-                  <mainClass>org.onap.msb.apiroute.ApiRouteApp</mainClass>
-                </transformer>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <createDependencyReducedPom>true</createDependencyReducedPom>
-          <filters>
-            <filter>
-              <artifact>*:*</artifact>
-              <excludes>
-                <exclude>META-INF/*.SF</exclude>
-                <exclude>META-INF/*.DSA</exclude>
-                <exclude>META-INF/*.RSA</exclude>
-              </excludes>
-            </filter>
-          </filters>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>properties-maven-plugin</artifactId>
-        <version>1.0.0</version>
-        <executions>
-          <execution>
-            <phase>initialize</phase>
-            <goals>
-              <goal>read-project-properties</goal>
-            </goals>
-            <configuration>
-              <files>
-                <file>${basedir}/src/main/resources/swagger.properties</file>
-              </files>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>com.github.kongchen</groupId>
-        <artifactId>swagger-maven-plugin</artifactId>
-        <version>3.1.4</version>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <apiSources>
-            <apiSource>
-              <locations>${api-rest-package}</locations>
-              <schemes>
-                <scheme>http</scheme>
-                <scheme>https</scheme>
-              </schemes>
-              <host>${api-host-ip}:${api-host-port}</host>
-              <basePath>${api-base-path}</basePath>
-              <info>
-                <title>${api-title}</title>
-                <version>${api-version}</version>
-                <description>${api-description}</description>
-                <license>
-                  <name>${api-license}</name>
-                </license>
-              </info>
-              <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
-            </apiSource>
-          </apiSources>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.3.1</version>
-        <executions>
-          <execution>
-            <id>install-file-id</id>
-            <phase>install</phase>
-            <goals>
-              <goal>install-file</goal>
-            </goals>
-            <configuration>
-              <file>${basedir}/src/main/resources/swagger.json</file>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>${project.artifactId}-swagger-schema</artifactId>
-              <version>${project.version}</version>
-              <packaging>json</packaging>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <id>ant-create-script</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <exportAntProperties>true</exportAntProperties>
-              <tasks>
-                <taskdef />
-                <condition>
-                  <os />
-                </condition>
-                <condition>
-                  <os />
-                </condition>
-                <if>
-                  <equals />
-                  <then>
-                    <property />
-                    <echo />
-                    <echo />
-                  </then>
-                  <else>
-                    <property />
-                    <echo />
-                    <echo />
-                    <chmod />
-                  </else>
-                </if>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>ant-contrib</groupId>
-            <artifactId>ant-contrib</artifactId>
-            <version>1.0b3</version>
-            <exclusions>
-              <exclusion>
-                <artifactId>ant</artifactId>
-                <groupId>ant</groupId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-codegen-maven-plugin</artifactId>
-        <version>2.2.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
-              <output>${project.build.directory}/generated-sources</output>
-              <language>java</language>
-              <configOptions>
-                <dateLibrary>joda</dateLibrary>
-              </configOptions>
-              <library>jersey2</library>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>${project.artifactId}</artifactId>
-              <artifactVersion>${project.version}</artifactVersion>
-              <modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
-              <apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
-              <invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <version>1.5.0</version>
-        <executions>
-          <execution>
-            <id>swagger-generate-sources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <version>3.0.0</version>
-        <executions>
-          <execution>
-            <id>clean-generated-files</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>${project.build.directory}/generated-sources</directory>
-                </fileset>
-              </filesets>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>hamcrest-core</artifactId>
-          <groupId>org.hamcrest</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <version>1.6.6</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>powermock-module-junit4-common</artifactId>
-          <groupId>org.powermock</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-      <version>1.6.6</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>mockito-core</artifactId>
-          <groupId>org.mockito</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>powermock-api-mockito-common</artifactId>
-          <groupId>org.powermock</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>hamcrest-core</artifactId>
-          <groupId>org.hamcrest</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-</project>
-
diff --git a/apiroute/apiroute-service/pom.xml b/apiroute/apiroute-service/pom.xml
index c0346a3..290bd27 100644
--- a/apiroute/apiroute-service/pom.xml
+++ b/apiroute/apiroute-service/pom.xml
@@ -177,196 +177,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<!-- JSON -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>properties-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<executions>
-					<execution>
-						<phase>initialize</phase>
-						<goals>
-							<goal>read-project-properties</goal>
-						</goals>
-						<configuration>
-							<files>
-								<file>${basedir}/src/main/resources/swagger.properties</file>
-							</files>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>com.github.kongchen</groupId>
-				<artifactId>swagger-maven-plugin</artifactId>
-				<version>3.1.4</version>
-				<configuration>
-					<apiSources>
-						<apiSource>
-							<locations>${api-rest-package}</locations>
-							<schemes>
-								<scheme>http</scheme>
-								<scheme>https</scheme>
-							</schemes>
-							<host>${api-host-ip}:${api-host-port}</host>
-							<basePath>${api-base-path}</basePath>
-							<info>
-								<title>${api-title}</title>
-								<version>${api-version}</version>
-								<description>${api-description}</description>
-								<license>
-									<name>${api-license}</name>
-								</license>
-							</info>
-							<swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
-						</apiSource>
-					</apiSources>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-install-plugin</artifactId>
-				<version>2.3.1</version>
-				<executions>
-					<execution>
-						<id>install-file-id</id>
-						<phase>install</phase>
-						<goals>
-							<goal>install-file</goal>
-						</goals>
-						<configuration>
-							<file>${basedir}/src/main/resources/swagger.json</file>
-							<groupId>${project.groupId}</groupId>
-							<artifactId>${project.artifactId}-swagger-schema</artifactId>
-							<version>${project.version}</version>
-							<packaging>json</packaging>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- SDK -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
-				<executions>
-					<execution>
-						<phase>initialize</phase>
-						<id>ant-create-script</id>
-						<configuration>
-							<exportAntProperties>true</exportAntProperties>
-							<tasks>
-								<taskdef resource="net/sf/antcontrib/antlib.xml"
-									classpathref="maven.plugin.classpath" />
-								<condition property="is_windows" value="true">
-									<os family="windows" />
-								</condition>
-								<condition property="isLinux" value="true">
-									<os family="unix" />
-								</condition>
-								<if>
-									<equals arg1="${is_windows}" arg2="true" />
-									<then>
-										<property name="swagger.sdk.script.file" value="generated-source-script.bat" />
-										<echo
-											file="${project.build.directory}${file.separator}generated-source-script.bat"
-											append="true"
-											message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-										<echo
-											file="${project.build.directory}${file.separator}generated-source-script.bat"
-											append="true"
-											message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-									</then>
-									<else>
-										<property name="swagger.sdk.script.file" value="generated-source-script.sh" />
-										<echo
-											file="${project.build.directory}${file.separator}generated-source-script.sh"
-											append="true"
-											message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-										<echo
-											file="${project.build.directory}${file.separator}generated-source-script.sh"
-											append="true"
-											message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-										<chmod
-											file="${project.build.directory}${file.separator}generated-source-script.sh"
-											perm="755" />
-									</else>
-								</if>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>ant-contrib</groupId>
-						<artifactId>ant-contrib</artifactId>
-						<version>1.0b3</version>
-						<exclusions>
-							<exclusion>
-								<artifactId>ant</artifactId>
-								<groupId>ant</groupId>
-							</exclusion>
-						</exclusions>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<groupId>io.swagger</groupId>
-				<artifactId>swagger-codegen-maven-plugin</artifactId>
-				<version>2.2.1</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
-							<output>${project.build.directory}/generated-sources</output>
-							<language>java</language>
-							<configOptions>
-								<dateLibrary>joda</dateLibrary>
-							</configOptions>
-							<library>jersey2</library>
-							<groupId>${project.groupId}</groupId>
-							<artifactId>${project.artifactId}</artifactId>
-							<artifactVersion>${project.version}</artifactVersion>
-							<modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
-							<apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
-							<invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>exec-maven-plugin</artifactId>
-				<groupId>org.codehaus.mojo</groupId>
-				<version>1.5.0</version>
-				<executions>
-					<execution>
-						<id>swagger-generate-sources</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>