Fix Nexus IQ security issue

Update dependencies to latest versions.

Issue-ID: MSB-131
Change-Id: I3659a189b3b7b898970ae6efe8bb8e6a61804046
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>

1 files changed, 111 insertions, 117 deletions

diff --git a/sdclient/discovery-standalone/pom.xml b/sdclient/discovery-standalone/pom.xml
index f1cacd9..7152336 100644
--- a/sdclient/discovery-standalone/pom.xml
+++ b/sdclient/discovery-standalone/pom.xml
@@ -1,126 +1,120 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- Copyright 2016-2017 ZTE, Inc. and others. Licensed under the Apache 
+	License, Version 2.0 (the "License"); you may not use this file except in 
+	compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+	Unless required by applicable law or agreed to in writing, software distributed 
+	under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES 
+	OR CONDITIONS OF ANY KIND, either express or implied. See the License for 
+	the specific language governing permissions and limitations under the License. -->
+<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>
+		<groupId>org.onap.msb.discovery</groupId>
+		<artifactId>sdclient</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.onap.msb.discovery.sdclient</groupId>
+	<artifactId>discovery-standalone</artifactId>
+	<name>onap/msb/discovery/sdclient/discovery-standalone</name>
+	<packaging>pom</packaging>
+	<version>1.1.0-SNAPSHOT</version>
 
-    Copyright 2016-2017 ZTE, Inc. and others.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<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>
-      <groupId>org.onap.msb.discovery</groupId>
-      <artifactId>sdclient</artifactId>
-      <version>1.1.0-SNAPSHOT</version>        
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.onap.msb.discovery.sdclient</groupId>
-    <artifactId>discovery-standalone</artifactId>
-    <name>onap/msb/discovery/sdclient/discovery-standalone</name>
-    <packaging>pom</packaging>
-    <version>1.1.0-SNAPSHOT</version>
-
-    <properties>
-      <packageid>discovery-standalone</packageid>
-      <outputdir>target/assembly/</outputdir>
-    </properties>
+	<properties>
+		<packageid>discovery-standalone</packageid>
+		<outputdir>target/assembly/</outputdir>
+	</properties>
 
 	<dependencies>
-    <dependency>
-    <groupId>org.onap.msb.discovery.sdclient</groupId>
-    <artifactId>discovery-service</artifactId>
-    <version>${project.version}</version>
-    <optional>true</optional>
-    </dependency>
-  </dependencies>   
+		<dependency>
+			<groupId>org.onap.msb.discovery.sdclient</groupId>
+			<artifactId>discovery-service</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
 	<build>
-	
-	<plugins>    
-    <plugin>
-      <artifactId>maven-resources-plugin</artifactId>
-      <executions>
-  	    <execution>
-          <id>copy-resources</id>                 
-          <phase>process-resources</phase>
-          <goals>
-            <goal>copy-resources</goal>
-          </goals>
-          <configuration>
-            <outputDirectory>${outputdir}</outputDirectory>
-  		      <includeEmptyDirs>true</includeEmptyDirs>
-            <resources>		  
-              <resource>
-                <directory>src/assembly/resources/</directory>
-                <filtering>false</filtering>
-                <includes>
-                  <include>**/*</include>
-                </includes>
-              </resource>  
-            </resources>
-            <overwrite>true</overwrite>
-          </configuration>
-        </execution>
-      </executions>
-    </plugin>
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-dependency-plugin</artifactId>
-      <version>2.8</version>
-      <executions>                   
-          <execution>
-              <id>copy-jar</id>
-              <goals>
-                  <goal>copy</goal>
-              </goals>
-              <phase>prepare-package</phase>
-              <configuration>
-                  <artifactItems>
-                      <artifactItem>
-                          <groupId>org.onap.msb.discovery.sdclient</groupId>
-                          <artifactId>discovery-service</artifactId>
-                          <type>jar</type>
-                          <overWrite>true</overWrite>
-                          <outputDirectory>${outputdir}/discover/</outputDirectory>
-                          <destFileName>discovery-service.jar</destFileName>
-                      </artifactItem>                             
-                  </artifactItems>
-              </configuration>
-          </execution>
-      </executions>
-    </plugin>
-    
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-antrun-plugin</artifactId>
-      <executions>
-        <execution>
-            <id>distribution</id>
-            <phase>package</phase>
-            <goals>
-                <goal>run</goal>
-            </goals>
-            <configuration>
-                <target name="distribution">
-                    <zip destfile="${version.output}/${packageid}-${project.version}.zip" update="true">
-                      <zipfileset dir="target/assembly/" includes="**"/>
-                    </zip>
-                    <attachartifact file="${version.output}/${packageid}-${project.version}.zip" type="zip"/>
 
-                </target>
-            </configuration>
-        </execution>
-      </executions>
-    </plugin>
-	</plugins>
+		<plugins>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${outputdir}</outputDirectory>
+							<includeEmptyDirs>true</includeEmptyDirs>
+							<resources>
+								<resource>
+									<directory>src/assembly/resources/</directory>
+									<filtering>false</filtering>
+									<includes>
+										<include>**/*</include>
+									</includes>
+								</resource>
+							</resources>
+							<overwrite>true</overwrite>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.8</version>
+				<executions>
+					<execution>
+						<id>copy-jar</id>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<phase>prepare-package</phase>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.onap.msb.discovery.sdclient</groupId>
+									<artifactId>discovery-service</artifactId>
+									<type>jar</type>
+									<overWrite>true</overWrite>
+									<outputDirectory>${outputdir}/discover/</outputDirectory>
+									<destFileName>discovery-service.jar</destFileName>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>distribution</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target name="distribution">
+								<zip destfile="${version.output}/${packageid}-${project.version}.zip"
+									update="true">
+									<zipfileset dir="target/assembly/" includes="**" />
+								</zip>
+								<attachartifact
+									file="${version.output}/${packageid}-${project.version}.zip"
+									type="zip" />
+
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
 	</build>
 
 </project>