summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Cmarada <mcmarada@cisco.com>2019-05-09 14:48:12 +0200
committerMichal Cmarada <mcmarada@cisco.com>2019-05-23 09:12:37 +0200
commite0a2498c90a3b7c3ca74783f2f38d3d2048e49eb (patch)
tree2c30b2af91f9966ffd37290a5f343eaabf237489
parent824c740124a9a73f567ff600ab6b388292cfcdd9 (diff)
unify jvpp variables
When bumping jvpp a lot of variables need to be changed. This is useles because all of them have the same value, unifying them will simplify the bump process. Change-Id: Ie62c4bef0b899acc463f9b855cbb4d5e7e302667 Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
-rw-r--r--acl/acl-impl/pom.xml6
-rw-r--r--common/hc2vpp-parent/pom.xml1
-rw-r--r--ioam/impl/pom.xml11
-rw-r--r--ipsec/ipsec-impl/pom.xml4
-rw-r--r--it/api-coverage/pom.xml4
-rw-r--r--it/jvpp-benchmark/pom.xml1
-rw-r--r--vpp-common/vpp-common-integration/pom.xml1
-rw-r--r--vpp-common/vpp-impl-parent/pom.xml4
-rw-r--r--vpp-integration/api-docs/core/pom.xml1
9 files changed, 5 insertions, 28 deletions
diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 0b3139044..fb4759f0b 100644
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -29,10 +29,6 @@
<artifactId>acl-impl</artifactId>
<version>1.19.08-SNAPSHOT</version>
- <properties>
- <jvpp.acl.version>19.08-SNAPSHOT</jvpp.acl.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>io.fd.honeycomb</groupId>
@@ -48,7 +44,7 @@
<dependency>
<groupId>io.fd.jvpp</groupId>
<artifactId>jvpp-acl</artifactId>
- <version>${jvpp.acl.version}</version>
+ <version>${jvpp.version}</version>
</dependency>
<!-- DI -->
diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml
index 47f2158fd..edd52aff9 100644
--- a/common/hc2vpp-parent/pom.xml
+++ b/common/hc2vpp-parent/pom.xml
@@ -19,5 +19,6 @@
<properties>
<honeycomb.version>1.19.08-SNAPSHOT</honeycomb.version>
+ <jvpp.version>19.08-SNAPSHOT</jvpp.version>
</properties>
</project> \ No newline at end of file
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index 0bd3ee627..d92b800a3 100644
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -29,11 +29,6 @@
<version>1.19.08-SNAPSHOT</version>
<packaging>bundle</packaging>
- <properties>
- <ioam.version>19.08-SNAPSHOT</ioam.version>
- <jvpp.version>19.08-SNAPSHOT</jvpp.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -88,17 +83,17 @@
<dependency>
<groupId>io.fd.jvpp</groupId>
<artifactId>jvpp-ioamtrace</artifactId>
- <version>${ioam.version}</version>
+ <version>${jvpp.version}</version>
</dependency>
<dependency>
<groupId>io.fd.jvpp</groupId>
<artifactId>jvpp-ioampot</artifactId>
- <version>${ioam.version}</version>
+ <version>${jvpp.version}</version>
</dependency>
<dependency>
<groupId>io.fd.jvpp</groupId>
<artifactId>jvpp-ioamexport</artifactId>
- <version>${ioam.version}</version>
+ <version>${jvpp.version}</version>
</dependency>
<dependency>
<groupId>io.fd.hc2vpp.common</groupId>
diff --git a/ipsec/ipsec-impl/pom.xml b/ipsec/ipsec-impl/pom.xml
index e843fb7df..6f0582fe8 100644
--- a/ipsec/ipsec-impl/pom.xml
+++ b/ipsec/ipsec-impl/pom.xml
@@ -30,10 +30,6 @@
<version>1.19.08-SNAPSHOT</version>
<packaging>bundle</packaging>
- <properties>
- <jvpp.version>19.08-SNAPSHOT</jvpp.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml
index 9802528fc..cebeb310e 100644
--- a/it/api-coverage/pom.xml
+++ b/it/api-coverage/pom.xml
@@ -31,10 +31,6 @@
<version>1.19.08-SNAPSHOT</version>
<name>${project.artifactId}</name>
- <properties>
- <jvpp.version>19.08-SNAPSHOT</jvpp.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>io.fd.jvpp</groupId>
diff --git a/it/jvpp-benchmark/pom.xml b/it/jvpp-benchmark/pom.xml
index bf75e651c..47a4b2c4b 100644
--- a/it/jvpp-benchmark/pom.xml
+++ b/it/jvpp-benchmark/pom.xml
@@ -33,7 +33,6 @@
<properties>
<jmh.version>1.21</jmh.version>
- <jvpp.version>19.08-SNAPSHOT</jvpp.version>
</properties>
<dependencies>
diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml
index 8e2c3eac5..8ead44419 100644
--- a/vpp-common/vpp-common-integration/pom.xml
+++ b/vpp-common/vpp-common-integration/pom.xml
@@ -30,7 +30,6 @@
<name>${project.artifactId}</name>
<properties>
- <jvpp.version>19.08-SNAPSHOT</jvpp.version>
<hamcrest.version>2.1</hamcrest.version>
</properties>
diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml
index 5ba80e2e1..2014725ed 100644
--- a/vpp-common/vpp-impl-parent/pom.xml
+++ b/vpp-common/vpp-impl-parent/pom.xml
@@ -30,10 +30,6 @@
<version>1.19.08-SNAPSHOT</version>
<packaging>pom</packaging>
- <properties>
- <jvpp.version>19.08-SNAPSHOT</jvpp.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml
index b26d561dd..98288e72c 100644
--- a/vpp-integration/api-docs/core/pom.xml
+++ b/vpp-integration/api-docs/core/pom.xml
@@ -37,7 +37,6 @@
<asm.version>7.0</asm.version>
<asciidoctorj.version>1.5.4</asciidoctorj.version>
<slf4j-simple.version>1.7.25</slf4j-simple.version>
- <jvpp.version>19.08-SNAPSHOT</jvpp.version>
<guava.version>23.6-jre</guava.version>
<reflections.version>0.9.11</reflections.version>