From 0cbb237e7b5ed827c7d04f41dd1da157b91da3e5 Mon Sep 17 00:00:00 2001
From: VelinYordanov <velin.iordanov@gmail.com>
Date: Sun, 10 Dec 2017 02:04:42 +0200
Subject: [PATCH] Changed the poms hierarchy (#225)

Signed-off-by: VelinYordanov <velin.iordanov@gmail.com>
---
 bundles/pom.xml        |  6 +++---
 features/pom.xml       |  6 +++---
 pom.xml                | 29 +++++++++++++----------------
 poms/pom.xml           | 20 ++++++++++++++++++--
 targetplatform/pom.xml |  6 +++---
 5 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 43593b315..4ef451020 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -2,10 +2,10 @@
 <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.openhab</groupId>
-    <artifactId>pom-tycho</artifactId>
+    <groupId>org.openhab.core</groupId>
+    <artifactId>pom</artifactId>
     <version>2.2.0-SNAPSHOT</version>
-    <relativePath>../poms/tycho/pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/features/pom.xml b/features/pom.xml
index 0df090a6e..b1be441c6 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -2,10 +2,10 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-    <groupId>org.openhab</groupId>
-    <artifactId>pom-tycho</artifactId>
+    <groupId>org.openhab.core</groupId>
+    <artifactId>pom</artifactId>
     <version>2.2.0-SNAPSHOT</version>
-    <relativePath>../poms/tycho/pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 8634f16ea..a4cecd216 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
+	
+    <parent>
+        <groupId>org.openhab</groupId>
+        <artifactId>pom-tycho</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath>poms/tycho/pom.xml</relativePath>
+    </parent>
+	
     <groupId>org.openhab.core</groupId>
     <artifactId>pom</artifactId>
     <version>2.2.0-SNAPSHOT</version>
@@ -58,22 +65,12 @@
 
 
     <build>
-        <pluginManagement>
-          <plugins>
+        <plugins>
             <plugin>
-              <groupId>com.itemis.maven.plugins</groupId>
-              <artifactId>unleash-maven-plugin</artifactId>
-              <version>2.7.2</version>
-              <dependencies>
-                <dependency>
-                  <groupId>com.itemis.maven.plugins</groupId>
-                  <artifactId>unleash-scm-provider-git</artifactId>
-                  <version>2.1.0</version>
-                </dependency>
-              </dependencies>
+                <groupId>org.commonjava.maven.plugins</groupId>
+                <artifactId>directory-maven-plugin</artifactId>
             </plugin>
-          </plugins>
-        </pluginManagement>
-     </build>
+        </plugins>
+    </build>
 
 </project>
diff --git a/poms/pom.xml b/poms/pom.xml
index 858de5da4..60702c4e7 100644
--- a/poms/pom.xml
+++ b/poms/pom.xml
@@ -78,9 +78,25 @@
     <packaging>pom</packaging>
 
     <build>
-
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.commonjava.maven.plugins</groupId>
+                    <artifactId>directory-maven-plugin</artifactId>
+                    <version>0.2</version>
+                    <executions>
+                        <execution>
+                            <id>directories</id>
+                            <goals>
+                                <goal>highest-basedir</goal>
+                            </goals>
+                            <phase>initialize</phase>
+                            <configuration>
+                                <property>basedirRoot</property>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.karaf.tooling</groupId>
                     <artifactId>karaf-maven-plugin</artifactId>
@@ -281,7 +297,7 @@
           <plugin>
               <groupId>org.openhab.tools</groupId>
               <artifactId>static-code-analysis</artifactId>
-              <version>${sat.version}</version>              
+              <version>${sat.version}</version>
           </plugin>
         </plugins>
       </build>
diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
index 11f0e88ee..a2854c80f 100644
--- a/targetplatform/pom.xml
+++ b/targetplatform/pom.xml
@@ -3,10 +3,10 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab</groupId>
-    <artifactId>pom-tycho</artifactId>
+    <groupId>org.openhab.core</groupId>
+    <artifactId>pom</artifactId>
     <version>2.2.0-SNAPSHOT</version>
-    <relativePath>../poms/tycho/pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>org.openhab.core</groupId>