aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-10-01 16:54:33 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-01 16:54:33 +0000
commit6df92161cb1ec6f71fcc97e99c159d23296a39e8 (patch)
tree2710e9eb8dee7ceae007293c535e4a74d4bc35a4
parent219e6397500f951bdee70b926ab49fc65a7c86cd (diff)
parenta7a8911735fe1c25189e74c1b0e86d06f15b08b7 (diff)
Merge "Fixed build and version of build-tools" into release-1.1.0
-rw-r--r--build-tools/pom.xml17
-rw-r--r--onboarding/pom.xml13
-rw-r--r--pom.xml1
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>