From a7a8911735fe1c25189e74c1b0e86d06f15b08b7 Mon Sep 17 00:00:00 2001
From: vempo <vitaliy.emporopulo@amdocs.com>
Date: Mon, 18 Sep 2017 18:42:12 +0300
Subject: Fixed build and version of build-tools

Declared PMD dependencies under PMD Maven plugin.
Build-tools are now part of the onboarding profile.
Version is now aligned with the project version.

Change-Id: Ibba68c83b7a888c2adc39f9915de0a4003c63c0f
Issue-ID: SDC-348
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
---
 build-tools/pom.xml | 17 -----------------
 onboarding/pom.xml  | 13 ++++++++++++-
 pom.xml             |  1 +
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 952ebef380..24a6742b71 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -15,21 +15,4 @@
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <pmd.version>5.8.1</pmd.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-core</artifactId>
-            <version>${pmd.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.pmd</groupId>
-            <artifactId>pmd-java</artifactId>
-            <version>${pmd.version}</version>
-        </dependency>
-    </dependencies>
-
 </project>
\ No newline at end of file
diff --git a/onboarding/pom.xml b/onboarding/pom.xml
index b49b7801df..7c9b6267fd 100644
--- a/onboarding/pom.xml
+++ b/onboarding/pom.xml
@@ -96,7 +96,8 @@
         <zusammen.version>0.2.0</zusammen.version>
         <zusammen-state-store.version>0.2.1</zusammen-state-store.version>
         <skipSA>true</skipSA>
-        <build.tools.version>1.1.0-SNAPSHOT</build.tools.version>
+        <pmd.version>5.8.1</pmd.version>
+        <build.tools.version>${project.version}</build.tools.version>
     </properties>
 
     <build>
@@ -147,6 +148,16 @@
                         <artifactId>build-tools</artifactId>
                         <version>${build.tools.version}</version>
                     </dependency>
+                    <dependency>
+                        <groupId>net.sourceforge.pmd</groupId>
+                        <artifactId>pmd-core</artifactId>
+                        <version>${pmd.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>net.sourceforge.pmd</groupId>
+                        <artifactId>pmd-java</artifactId>
+                        <version>${pmd.version}</version>
+                    </dependency>
                 </dependencies>
             </plugin>
         </plugins>
diff --git a/pom.xml b/pom.xml
index 5256df7b05..2df87750f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -407,6 +407,7 @@
 				<activeByDefault>false</activeByDefault>
 			</activation>
 			<modules>
+				<module>build-tools</module>
 				<module>onboarding</module>
 			</modules>
 		</profile>
-- 
cgit