Updates to versions across project
Change-Id: I3593d5d289d3149bea9644c7c09fa1ca753abfca
diff --git a/apps/openstackswitching/app/pom.xml b/apps/openstackswitching/app/pom.xml
index 5460fae..7d26f8f 100644
--- a/apps/openstackswitching/app/pom.xml
+++ b/apps/openstackswitching/app/pom.xml
@@ -31,7 +31,6 @@
<description>SONA Openstack Switching applications</description>
<properties>
- <onos.version>1.4.0-SNAPSHOT</onos.version>
<onos.app.name>org.onosproject.openstackswitching</onos.app.name>
<web.context>/onos/openstackswitching</web.context>
<api.version>1.0.0</api.version>
diff --git a/pom.xml b/pom.xml
index 23e42cf..c72a459 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@
<onos-build-conf.version>1.1</onos-build-conf.version>
<netty4.version>4.0.23.Final</netty4.version>
<copycat.version>0.5.0.onos</copycat.version>
+ <!-- FIXME update to release version before Emu release -->
<openflowj.version>0.9.2.onos-SNAPSHOT</openflowj.version>
<karaf.version>3.0.3</karaf.version>
<jersey.version>1.19</jersey.version>
@@ -88,7 +89,8 @@
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
-
+
+ <!-- FIXME remove before Emu release -->
<repositories>
<repository>
<id>snapshots</id>
diff --git a/providers/netcfghost/pom.xml b/providers/netcfghost/pom.xml
index 0784d90..15363c8 100644
--- a/providers/netcfghost/pom.xml
+++ b/providers/netcfghost/pom.xml
@@ -33,7 +33,6 @@
<url>http://onosproject.org</url>
<properties>
- <onos.version>1.4.0-SNAPSHOT</onos.version>
<onos.app.name>org.onosproject.netcfghostprovider</onos.app.name>
<onos.app.origin>ON.Lab</onos.app.origin>
</properties>
@@ -42,13 +41,11 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
- <version>${onos.version}</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
- <version>${onos.version}</version>
</dependency>
<dependency>
@@ -59,14 +56,6 @@
</dependency>
<dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onos-api</artifactId>
- <version>${onos.version}</version>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
-
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
diff --git a/tools/build/onos-change-version b/tools/build/onos-change-version
index a711742..b41255b 100755
--- a/tools/build/onos-change-version
+++ b/tools/build/onos-change-version
@@ -41,7 +41,7 @@
# Augment the version in archetypes tree.
mvn -f tools/package/archetypes/pom.xml versions:set -DnewVersion=$NEW_VERSION versions:commit
-for atype in api bundle cli ui; do
+for atype in api bundle cli ui uitab uitopo; do
pom="tools/package/archetypes/$atype/src/main/resources/archetype-resources/pom.xml"
sed -i "" -E "1,/<onos.version>/s/<onos.version>[^<]*</<onos.version>$NEW_VERSION</g" $pom
done
@@ -51,6 +51,3 @@
perl -i -0pe "s#<artifactId>cord-gui<.*\n.*version>#<artifactId>cord-gui</artifactId>\n <version>$NEW_VERSION</version>#" $ONOS_ROOT/apps/demo/cord-gui/pom.xml
sed -i "" -E "s#demo/cord-gui/target/cord-gui-.*\.war#demo/cord-gui/target/cord-gui-$NEW_VERSION.war#" $ONOS_ROOT/apps/demo/cord-gui/src/scripts/pullwar.sh
sed -i "" -E "s#CORD=./cord-gui-.*\.war#CORD=./cord-gui-$NEW_VERSION.war#" $ONOS_ROOT/apps/demo/cord-gui/src/scripts/run.me
-
-# Augment the acl app
-sed -i "" -E "s/<onos.version>[^<]*</<onos.version>$NEW_VERSION</g" $ONOS_ROOT/apps/acl/pom.xml
diff --git a/tools/package/karaf-assembly/pom.xml b/tools/package/karaf-assembly/pom.xml
index 38a3df4..4b47c0d 100644
--- a/tools/package/karaf-assembly/pom.xml
+++ b/tools/package/karaf-assembly/pom.xml
@@ -22,12 +22,13 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <artifactId>onos-base</artifactId>
+ <version>1</version>
</parent>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-assembly</artifactId>
+ <version>1.0</version>
<packaging>pom</packaging>
<description>ONOS Apache Karaf assembly definitions</description>
diff --git a/web/api/src/main/resources/definitions/Application.json b/web/api/src/main/resources/definitions/Application.json
index ea6c3ea25..fb5bbeb 100644
--- a/web/api/src/main/resources/definitions/Application.json
+++ b/web/api/src/main/resources/definitions/Application.json
@@ -25,7 +25,7 @@
},
"version": {
"type": "string",
- "example": "1.4.0.SNAPSHOT"
+ "example": "1.2.3"
},
"description": {
"type": "string",
@@ -48,7 +48,7 @@
},
"featuresRepo": {
"type": "string",
- "example": "mvn:org.onosproject/onos-app-cip/1.4.0-SNAPSHOT/xml/features"
+ "example": "mvn:org.onosproject/onos-app-cip/1.2.3/xml/features"
},
"features": {
"type": "array",
diff --git a/web/api/src/main/resources/definitions/ApplicationPost.json b/web/api/src/main/resources/definitions/ApplicationPost.json
index ea6c3ea25..fb5bbeb 100644
--- a/web/api/src/main/resources/definitions/ApplicationPost.json
+++ b/web/api/src/main/resources/definitions/ApplicationPost.json
@@ -25,7 +25,7 @@
},
"version": {
"type": "string",
- "example": "1.4.0.SNAPSHOT"
+ "example": "1.2.3"
},
"description": {
"type": "string",
@@ -48,7 +48,7 @@
},
"featuresRepo": {
"type": "string",
- "example": "mvn:org.onosproject/onos-app-cip/1.4.0-SNAPSHOT/xml/features"
+ "example": "mvn:org.onosproject/onos-app-cip/1.2.3/xml/features"
},
"features": {
"type": "array",
diff --git a/web/api/src/main/resources/definitions/Applications.json b/web/api/src/main/resources/definitions/Applications.json
index d765361..304404a 100644
--- a/web/api/src/main/resources/definitions/Applications.json
+++ b/web/api/src/main/resources/definitions/Applications.json
@@ -38,7 +38,7 @@
},
"version": {
"type": "string",
- "example": "1.4.0.SNAPSHOT"
+ "example": "1.2.3"
},
"description": {
"type": "string",
@@ -61,7 +61,7 @@
},
"featuresRepo": {
"type": "string",
- "example": "mvn:org.onosproject/onos-app-cip/1.4.0-SNAPSHOT/xml/features"
+ "example": "mvn:org.onosproject/onos-app-cip/1.2.3/xml/features"
},
"features": {
"type": "array",