diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2018-02-15 13:17:10 +0100 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2018-02-15 13:54:46 +0100 |
commit | 8f7b2575f3482f7f202aa63a221d9280cfb0bce3 (patch) | |
tree | f8163a185055677967f99555c9596639fdb686e8 | |
parent | a9459ed9ebfc9d6513aa2ac1435fd76ee4ca60d4 (diff) |
Bump jvpp version from 18.01 to 18.01.1
Change-Id: I406e36fbd9fc039ef78e91dd09d98c1311132514
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rw-r--r-- | acl/acl-impl/pom.xml | 2 | ||||
-rw-r--r-- | ioam/impl/pom.xml | 4 | ||||
-rw-r--r-- | it/api-coverage/pom.xml | 2 | ||||
-rwxr-xr-x | jvpp/version | 2 | ||||
-rw-r--r-- | nat/nat2vpp/pom.xml | 2 | ||||
-rw-r--r-- | nsh/impl/pom.xml | 8 | ||||
-rw-r--r-- | release-notes/pom.xml | 10 | ||||
-rw-r--r-- | vpp-common/vpp-common-integration/pom.xml | 2 | ||||
-rw-r--r-- | vpp-common/vpp-impl-parent/pom.xml | 2 | ||||
-rw-r--r-- | vpp-integration/api-docs/core/pom.xml | 2 | ||||
-rw-r--r-- | vpp-integration/api-docs/scripts/pom.xml | 2 |
11 files changed, 22 insertions, 16 deletions
diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 93c15d156..9c99954ac 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -30,7 +30,7 @@ <version>1.18.01.1-SNAPSHOT</version> <properties> - <jvpp.acl.version>18.01</jvpp.acl.version> + <jvpp.acl.version>18.01.1</jvpp.acl.version> </properties> <dependencies> diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 710e95f80..7266e7009 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -30,8 +30,8 @@ <packaging>bundle</packaging> <properties> - <ioam.version>18.01</ioam.version> - <jvpp.version>18.01</jvpp.version> + <ioam.version>18.01.1</ioam.version> + <jvpp.version>18.01.1</jvpp.version> </properties> <dependencies> diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml index d8dc7ae48..461021b32 100644 --- a/it/api-coverage/pom.xml +++ b/it/api-coverage/pom.xml @@ -32,7 +32,7 @@ <name>${project.artifactId}</name> <properties> - <jvpp.version>18.01</jvpp.version> + <jvpp.version>18.01.1</jvpp.version> </properties> <dependencies> diff --git a/jvpp/version b/jvpp/version index 222eb62eb..16f87bbbe 100755 --- a/jvpp/version +++ b/jvpp/version @@ -5,4 +5,4 @@ # # Version should match the one used in pom files. # -echo 18.01 +echo 18.01.1 diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index f922b0833..91a9f0108 100644 --- a/nat/nat2vpp/pom.xml +++ b/nat/nat2vpp/pom.xml @@ -54,7 +54,7 @@ <dependency> <groupId>io.fd.vpp</groupId> <artifactId>jvpp-nat</artifactId> - <version>18.01</version> + <version>18.01.1</version> </dependency> <!-- Honeycomb infrastructure--> diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 9467c14d1..681530f60 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -89,12 +89,18 @@ <dependency> <groupId>io.fd.vpp</groupId> <artifactId>jvpp-registry</artifactId> - <version>18.01</version> + <version>18.01.1</version> </dependency> <dependency> <groupId>io.fd.nsh_sfc</groupId> <artifactId>nsh-sfc</artifactId> <version>18.01</version> + <exclusions> + <exclusion> + <groupId>io.fd.vpp</groupId> + <artifactId>jvpp-registry</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>io.fd.hc2vpp.common</groupId> diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 36e589fe7..4df6b642b 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -106,15 +106,15 @@ <!-- Attributes below are inlined into resulting documentation, making it much easier when bumping versions --> <project-version>${project.version}</project-version> - <project-public-version>18.01</project-public-version> + <project-public-version>18.01.1</project-public-version> <project-config-version>1-18-01</project-config-version> <project-version-in-jira>11002</project-version-in-jira> <project-branch>stable/1801</project-branch> <project-odl-version>nitrogen</project-odl-version> - <project-vpp-version>18.01</project-vpp-version> - <project-vpp-snapshot-version>18.01</project-vpp-snapshot-version> - <project-nat-version>18.01</project-nat-version> - <project-nat-snapshot-version>18.01</project-nat-snapshot-version> + <project-vpp-version>18.01.1</project-vpp-version> + <project-vpp-snapshot-version>18.01.1</project-vpp-snapshot-version> + <project-nat-version>18.01.1</project-nat-version> + <project-nat-snapshot-version>18.01.1</project-nat-snapshot-version> <project-git-web>https://git.fd.io/cgit/hc2vpp/tree</project-git-web> <project-infra-git-web>https://git.fd.io/cgit/honeycomb/tree</project-infra-git-web> </attributes> diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml index 66bf3dc37..9689d7b00 100644 --- a/vpp-common/vpp-common-integration/pom.xml +++ b/vpp-common/vpp-common-integration/pom.xml @@ -30,7 +30,7 @@ <properties> <honeycomb.min.distro.version>1.18.01.1-SNAPSHOT</honeycomb.min.distro.version> - <jvpp.version>18.01</jvpp.version> + <jvpp.version>18.01.1</jvpp.version> <hamcrest.version>1.3</hamcrest.version> </properties> diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml index c7af3f716..c5d350c7a 100644 --- a/vpp-common/vpp-impl-parent/pom.xml +++ b/vpp-common/vpp-impl-parent/pom.xml @@ -31,7 +31,7 @@ <packaging>pom</packaging> <properties> - <jvpp.version>18.01</jvpp.version> + <jvpp.version>18.01.1</jvpp.version> </properties> <dependencyManagement> diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml index 5360b6a24..4ff65c2ad 100644 --- a/vpp-integration/api-docs/core/pom.xml +++ b/vpp-integration/api-docs/core/pom.xml @@ -37,7 +37,7 @@ <asm.version>5.2</asm.version> <asciidoctorj.version>1.5.4</asciidoctorj.version> <slf4j-simple.version>1.7.25</slf4j-simple.version> - <jvpp.version>18.01</jvpp.version> + <jvpp.version>18.01.1</jvpp.version> <guava.version>19.0</guava.version> <reflections.version>0.9.11</reflections.version> diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml index d25d36347..ba28eb95f 100644 --- a/vpp-integration/api-docs/scripts/pom.xml +++ b/vpp-integration/api-docs/scripts/pom.xml @@ -29,7 +29,7 @@ <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version> <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version> - <jvpp.version>18.01</jvpp.version> + <jvpp.version>18.01.1</jvpp.version> <junit.version>4.12</junit.version> <reflections.version>0.9.11</reflections.version> <sonar.skip>true</sonar.skip> |