From 5336d58eb125b230bf5a3bfb6332077aaf9ebb77 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Thu, 22 Sep 2016 14:27:39 +0200
Subject: [PATCH] Change maven module names and remove enforcer

Change-Id: Id23b204d33367cf861f6548e6ef1fa386b82ca9b
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 distribution-karaf/pom.xml    |  2 +-
 features-distribution/pom.xml |  2 +-
 features-index/pom.xml        |  2 +-
 features-test/pom.xml         |  2 +-
 pom.xml                       | 25 +------------------------
 version/pom.xml               |  2 +-
 6 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index db7a2bde..b4b260c8 100644
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -11,7 +11,7 @@
     <artifactId>distribution-karaf</artifactId>
     <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>${project.groupId}:${project.artifactId}</name>
+    <name>distribution:${project.artifactId}</name>
     <description>The actual Karaf building sub-project.</description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
diff --git a/features-distribution/pom.xml b/features-distribution/pom.xml
index b8e747c2..d52c97b4 100644
--- a/features-distribution/pom.xml
+++ b/features-distribution/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <artifactId>features-distribution</artifactId>
     <packaging>jar</packaging>
-    <name>${project.groupId}:${project.artifactId}</name>
+    <name>distribution:${project.artifactId}</name>
     <description>Sub-project building features internal to distribution.</description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
diff --git a/features-index/pom.xml b/features-index/pom.xml
index cbd6a24d..0fdadb73 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <artifactId>features-integration-index</artifactId>
     <packaging>jar</packaging>
-    <name>${project.groupId}:${project.artifactId}</name>
+    <name>distribution:${project.artifactId}</name>
     <description>Sub-project gathering feature repositories of all ODL projects participating in distribution.</description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
diff --git a/features-test/pom.xml b/features-test/pom.xml
index 56dbc3c7..38712f81 100644
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <artifactId>features-integration-test</artifactId>
     <packaging>jar</packaging>
-    <name>${project.groupId}:${project.artifactId}</name>
+    <name>distribution:${project.artifactId}</name>
     <description>Sub-project building aggregate features used for feature compatibility testing.</description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
diff --git a/pom.xml b/pom.xml
index e1130c9f..b1ba7f1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <!-- <name> value is used by Sonar to set project name -->
-    <name>distribution</name>
+    <name>Integration/Distribution</name>
     <description>OpenDaylight Integration/Distribution project, used for creating complete Karaf distribution packages.</description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
@@ -95,27 +95,4 @@
         <module>features-test</module>
         <module>version</module>
     </modules>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>3.1.1</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/version/pom.xml b/version/pom.xml
index 16f60168..34983f87 100644
--- a/version/pom.xml
+++ b/version/pom.xml
@@ -11,7 +11,7 @@
     <artifactId>version</artifactId>
     <version>0.6.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>${project.groupId}:${project.artifactId}</name>
+    <name>distribution:${project.artifactId}</name>
     <description>Sub-project for ODL version(s) reporting mechanism.</description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
-- 
2.36.6