summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan Yang <yangyanyj@chinamobile.com>2018-08-01 01:24:11 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-01 01:24:11 +0000
commit0fac82ebe9db2e49eb55c9fe38a75bf520c6eb5f (patch)
treee75af20dccc360af4a4fe1e90c97f343c804c4e8
parentd8c65c04ad3379b414da8d07722cf6a5d279750e (diff)
parenta7e76779bf2e95091688753fb47535b8960ea6dd (diff)
Merge "Fix invalid versions in pom.xml"
-rw-r--r--nokiav2/deployment/pom.xml2
-rw-r--r--nokiav2/driver/pom.xml4
-rw-r--r--nokiav2/driverwar/pom.xml4
-rw-r--r--nokiav2/generatedapis/pom.xml2
-rw-r--r--nokiav2/pom.xml1
5 files changed, 6 insertions, 7 deletions
diff --git a/nokiav2/deployment/pom.xml b/nokiav2/deployment/pom.xml
index 94118071..2f300e76 100644
--- a/nokiav2/deployment/pom.xml
+++ b/nokiav2/deployment/pom.xml
@@ -17,7 +17,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>deployment</artifactId>
- <version>${driver.version}</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/deployment</name>
<description>Nokia SVNFM driver deployment files</description>
diff --git a/nokiav2/driver/pom.xml b/nokiav2/driver/pom.xml
index 1c436a55..956ef957 100644
--- a/nokiav2/driver/pom.xml
+++ b/nokiav2/driver/pom.xml
@@ -17,7 +17,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>driver</artifactId>
- <version>${driver.version}</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/driver</name>
<description>svnfm vnfm driver</description>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients</artifactId>
- <version>${driver.version}</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/nokiav2/driverwar/pom.xml b/nokiav2/driverwar/pom.xml
index 10f12e0a..7215e3f8 100644
--- a/nokiav2/driverwar/pom.xml
+++ b/nokiav2/driverwar/pom.xml
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>driverwar</artifactId>
- <version>${driver.version}</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/driverwar</name>
<description>svnfm vnfm driver</description>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>driver</artifactId>
- <version>${driver.version}</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/nokiav2/generatedapis/pom.xml b/nokiav2/generatedapis/pom.xml
index 9b953d1a..294158c5 100644
--- a/nokiav2/generatedapis/pom.xml
+++ b/nokiav2/generatedapis/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2-clients</artifactId>
- <version>${driver.version}</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/generatedapis</name>
<properties>
diff --git a/nokiav2/pom.xml b/nokiav2/pom.xml
index 4407b882..52a368e7 100644
--- a/nokiav2/pom.xml
+++ b/nokiav2/pom.xml
@@ -29,7 +29,6 @@
<properties>
<jacoco.version>0.8.0</jacoco.version>
<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
- <driver.version>1.1.1-SNAPSHOT</driver.version>
</properties>
<!-- used to test dependency convergence locally
<build>