summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2019-12-05 14:12:45 -0500
committerSingal, Kapil (ks220y) <ks220y@att.com>2019-12-05 14:12:45 -0500
commit17d2d577b8abeebfc9fa3355603cac544d76c724 (patch)
tree7b2b21a031ebfd0a5de2ec4173d78776dff5d1c4
parente7a2e749c1c395dc66dd496efe7925cb4434cc14 (diff)
Reverting project.version for dependency-bom
If it's project.version then it will be resolved with child module version Issue-ID: CCSDK-1978 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I6d843de0840524bf49085e6cec60d0b3825d4346
-rw-r--r--odlparent/binding-parent/pom.xml2
-rw-r--r--odlparent/bundle-parent/pom.xml2
-rw-r--r--odlparent/feature-repo-parent/pom.xml2
-rw-r--r--odlparent/karaf4-parent/pom.xml2
-rw-r--r--odlparent/mdsal-it-parent/pom.xml2
-rw-r--r--odlparent/odlparent-lite/pom.xml2
-rw-r--r--odlparent/odlparent/pom.xml2
-rwxr-xr-xodlparent/setup/src/main/resources/pom-template.xml2
-rw-r--r--odlparent/single-feature-parent/pom.xml2
-rwxr-xr-xspringboot/springboot1/pom.xml2
-rwxr-xr-xspringboot/springboot2/pom.xml5
11 files changed, 12 insertions, 13 deletions
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index bd8871de..3cef1030 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>${project.version}</version>
+ <version>1.5.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 5f2e6102..8617388d 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>${project.version}</version>
+ <version>1.5.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 7ac7f925..ebcbb961 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>${project.version}</version>
+ <version>1.5.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 7cf0bd0b..b0aaa8f5 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>${project.version}</version>
+ <version>1.5.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index d1c35ad4..cd4ed7fa 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>${project.version}</version>
+ <version>1.5.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index c10b3dbc..8f01777c 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>${project.version}</version>
+ <version>1.5.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index da76289b..ee71fd37 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>${project.version}</version>
+ <version>1.5.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index ac691ac8..33acb80e 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>\${project.version}</version>
+ <version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 4f6e614e..67328800 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-odl-bom</artifactId>
- <version>${project.version}</version>
+ <version>1.5.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 503a765e..2608b07c 100755
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -107,7 +107,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>${project.version}</version>
+ <version>1.5.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 84346635..604db2d1 100755
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -106,7 +106,7 @@
<kotlin.version>1.3.50</kotlin.version>
<kotlin.maven.version>1.3.50</kotlin.maven.version>
<kotlin.couroutines.version>1.3.2</kotlin.couroutines.version>
- <kotlinpoet.version>1.3.0</kotlinpoet.version>
+ <kotlinpoet.version>1.4.4</kotlinpoet.version>
<kroto-plus.version>0.5.0</kroto-plus.version>
<mockk.version>1.9.3</mockk.version>
@@ -127,7 +127,6 @@
<slf4j.version>1.7.25</slf4j.version>
<testng.version>6.11</testng.version>
<tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
-
</properties>
<dependencyManagement>
@@ -135,7 +134,7 @@
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>${project.version}</version>
+ <version>1.5.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>