From b7c6e957f6a22188daf7026138c3ea0faf940b48 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 2 Mar 2018 11:06:06 -0800
Subject: Fix NexusIQ policy violations in oparent-python

Bump version of maven-python-distribute-plugin.
The latest version of maven-python-distribute-plugin
still includes dependencies that have NexusIQ
policy violations, so removed the plugin from
the build dependencies section since this plugin
is only used at build time, not at runtime.

Change-Id: I1cf8515a6955e0d9d6236e10f9cfa2d8d4971646
Issue-ID: INT-435
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 oparent-python/pom.xml | 284 ++++++++++++++++++++++++-------------------------
 1 file changed, 137 insertions(+), 147 deletions(-)

diff --git a/oparent-python/pom.xml b/oparent-python/pom.xml
index 5236c6a..055466e 100644
--- a/oparent-python/pom.xml
+++ b/oparent-python/pom.xml
@@ -1,150 +1,140 @@
 <?xml version="1.0"?>
-<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">
-	<modelVersion>4.0.0</modelVersion>
-	<packaging>pom</packaging>
-	<groupId>org.onap.oparent</groupId>
-	<artifactId>oparent-python</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
-	<name>oparent/oparent-python</name>
-	<description>parent/oparent-python</description>
-	<parent>
-		<groupId>org.onap.oparent</groupId>
-		<artifactId>oparent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-		<relativePath>../oparent</relativePath>
-	</parent>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<repositories>
-		<repository>
-		    <id>jitpack.io</id>
-		    <url>https://jitpack.io</url>
-		</repository>
-	</repositories>	
-    <pluginRepositories>
-        <pluginRepository>
-                <id>jitpack.io</id>
-                <url>https://jitpack.io</url>
-        </pluginRepository>
-    </pluginRepositories>	
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>build-helper-maven-plugin</artifactId>
-					<version>3.0.0</version>
-					<executions>
-						<execution>
-							<id>write-python-version</id>
-							<goals>
-								<goal>regex-property</goal>
-							</goals>
-							<phase>initialize</phase>
-							<configuration>
-								<name>python_version</name>
-								<regex>-SNAPSHOT</regex>
-								<value>${project.version}</value>
-								<replacement>\.dev0</replacement>
-								<failIfNoMatch>false</failIfNoMatch>
-							</configuration>
-						</execution>
-						<execution>
-							<id>attach-artifacts</id>
-							<phase>package</phase>
-							<goals>
-								<goal>attach-artifact</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>com.github.UltimateDogg</groupId>
-					<artifactId>maven-python-distribute-plugin</artifactId>
-					<version>0.2.0</version>
-					<configuration>
-						<packageVersion>${python_version}</packageVersion>
-						<distributionType>wheel</distributionType>
-					</configuration>
-					<executions>
-						<execution>
-							<id>package</id>
-							<phase>prepare-package</phase>
-							<goals>
-								<goal>package</goal>
-							</goals>
-						</execution>
-						<execution>
-							<id>process</id>
-							<phase>process-sources</phase>
-							<goals>
-								<goal>process-sources</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<artifactId>exec-maven-plugin</artifactId>
-					<groupId>org.codehaus.mojo</groupId>
-					<version>1.1.1</version>
-					<executions>
-						<execution>
-							<id>tox-test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>exec</goal>
-							</goals>
-							<configuration>
-								<executable>tox</executable>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<id>write-python-version</id>
-						<goals>
-							<goal>regex-property</goal>
-						</goals>
-						<phase>initialize</phase>
-						<configuration>
-							<name>python_version</name>
-							<regex>-SNAPSHOT</regex>
-							<value>${project.version}</value>
-							<replacement>\.dev0</replacement>
-							<failIfNoMatch>false</failIfNoMatch>
-						</configuration>
-					</execution>
-					<execution>
-						<id>attach-artifacts</id>
-						<phase>package</phase>
-						<goals>
-							<goal>attach-artifact</goal>
-						</goals>
-						<configuration>
-							<artifacts>
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.oparent</groupId>
+    <artifactId>oparent</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <relativePath>../oparent</relativePath>
+  </parent>
+  <packaging>pom</packaging>
+  <artifactId>oparent-python</artifactId>
+  <name>oparent/oparent-python</name>
+  <description>parent/oparent-python</description>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <repositories>
+    <repository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+    </pluginRepository>
+  </pluginRepositories>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>3.0.0</version>
+          <executions>
+            <execution>
+              <id>write-python-version</id>
+              <goals>
+                <goal>regex-property</goal>
+              </goals>
+              <phase>initialize</phase>
+              <configuration>
+                <name>python_version</name>
+                <regex>-SNAPSHOT</regex>
+                <value>${project.version}</value>
+                <replacement>\.dev0</replacement>
+                <failIfNoMatch>false</failIfNoMatch>
+              </configuration>
+            </execution>
+            <execution>
+              <id>attach-artifacts</id>
+              <phase>package</phase>
+              <goals>
+                <goal>attach-artifact</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>com.github.UltimateDogg</groupId>
+          <artifactId>maven-python-distribute-plugin</artifactId>
+          <version>0.2.5</version>
+          <configuration>
+            <packageVersion>${python_version}</packageVersion>
+            <distributionType>wheel</distributionType>
+          </configuration>
+          <executions>
+            <execution>
+              <id>package</id>
+              <phase>prepare-package</phase>
+              <goals>
+                <goal>package</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>process</id>
+              <phase>process-sources</phase>
+              <goals>
+                <goal>process-sources</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <artifactId>exec-maven-plugin</artifactId>
+          <groupId>org.codehaus.mojo</groupId>
+          <version>1.1.1</version>
+          <executions>
+            <execution>
+              <id>tox-test</id>
+              <phase>test</phase>
+              <goals>
+                <goal>exec</goal>
+              </goals>
+              <configuration>
+                <executable>tox</executable>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>write-python-version</id>
+            <goals>
+              <goal>regex-property</goal>
+            </goals>
+            <phase>initialize</phase>
+            <configuration>
+              <name>python_version</name>
+              <regex>-SNAPSHOT</regex>
+              <value>${project.version}</value>
+              <replacement>\.dev0</replacement>
+              <failIfNoMatch>false</failIfNoMatch>
+            </configuration>
+          </execution>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
 							</artifacts>
-							<skipAttach>true</skipAttach>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>com.github.UltimateDogg</groupId>
-			<artifactId>maven-python-distribute-plugin</artifactId>
-			<version>0.2.0</version>
-		</dependency>
-	</dependencies>
+              <skipAttach>true</skipAttach>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
-- 
cgit 1.2.3-korg