From f2c2e5ddf02c23f01b5bd9728290d3290cf54916 Mon Sep 17 00:00:00 2001
From: Huabing Zhao <zhaohuabing@gmail.com>
Date: Mon, 8 Apr 2019 18:49:46 +0800
Subject: [PATCH] Solve nexus-iq security issue

Issue-ID: MSB-330
Change-Id: Ic013ec509961168fdb9881b3a0f104d591c1c209
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
---
 .../apiroute-service/dependency-reduced-pom.xml    | 308 ---------------------
 apiroute/apiroute-service/pom.xml                  |   8 +
 2 files changed, 8 insertions(+), 308 deletions(-)
 delete mode 100644 apiroute/apiroute-service/dependency-reduced-pom.xml

diff --git a/apiroute/apiroute-service/dependency-reduced-pom.xml b/apiroute/apiroute-service/dependency-reduced-pom.xml
deleted file mode 100644
index af5b3fe..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.1.0-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.1.0-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 74bea56..e5134c5 100644
--- a/apiroute/apiroute-service/pom.xml
+++ b/apiroute/apiroute-service/pom.xml
@@ -111,6 +111,14 @@
 					<groupId>org.slf4j</groupId>
 					<artifactId>slf4j-log4j12</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>commons-beanutils</groupId>
+                                        <artifactId>commons-beanutils</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-collections</groupId>
+                                        <artifactId>commons-collections</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
-- 
2.16.6