Change maven module names and remove enforcer

Change-Id: Id23b204d33367cf861f6548e6ef1fa386b82ca9b
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index db7a2bde28995efe65fdcff28acaae39d96b7b23..b4b260c8871a135fe1af8ad541bc7a3711688495 100644 (file)
--- 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 b8e747c253b3a270118454a95c475006b2281529..d52c97b4d30b8d3c7e04f6f76407b620d036a94f 100644 (file)
--- 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 cbd6a24d761a3cbd4a279400e6be69dbdc204445..0fdadb73691999cdc42955160340ed01ba995050 100644 (file)
--- 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 56dbc3c7d88cf073f5ff6b202e92db543f08d776..38712f81f0d913f1b7355b975b8f39d5abd436d4 100644 (file)
--- 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 e1130c9f1ee518659317275530d788963295be99..b1ba7f1d4c0bd3f39e48e56867c5fbb8dfb0f4e9 100644 (file)
--- 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 16f6016822bca47517faea8b55e84d476acbf9d4..34983f8744323530ed704c7a3c138337fc01a963 100644 (file)
--- 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>