홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
372658e7 1 parent 4751e835

Updates to versions across project 

Change-Id: I3593d5d289d3149bea9644c7c09fa1ca753abfca
Inline Side-by-side
Showing 8 changed files with 14 additions and 26 deletions
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
31 31
32 <description>SONA Openstack Switching applications</description> 32 <description>SONA Openstack Switching applications</description>
33 <properties> 33 <properties>
34 - <onos.version>1.4.0-SNAPSHOT</onos.version>
35 <onos.app.name>org.onosproject.openstackswitching</onos.app.name> 34 <onos.app.name>org.onosproject.openstackswitching</onos.app.name>
36 <web.context>/onos/openstackswitching</web.context> 35 <web.context>/onos/openstackswitching</web.context>
37 <api.version>1.0.0</api.version> 36 <api.version>1.0.0</api.version>
......
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
77 <onos-build-conf.version>1.1</onos-build-conf.version> 77 <onos-build-conf.version>1.1</onos-build-conf.version>
78 <netty4.version>4.0.23.Final</netty4.version> 78 <netty4.version>4.0.23.Final</netty4.version>
79 <copycat.version>0.5.0.onos</copycat.version> 79 <copycat.version>0.5.0.onos</copycat.version>
80 + <!-- FIXME update to release version before Emu release -->
80 <openflowj.version>0.9.2.onos-SNAPSHOT</openflowj.version> 81 <openflowj.version>0.9.2.onos-SNAPSHOT</openflowj.version>
81 <karaf.version>3.0.3</karaf.version> 82 <karaf.version>3.0.3</karaf.version>
82 <jersey.version>1.19</jersey.version> 83 <jersey.version>1.19</jersey.version>
...@@ -88,7 +89,8 @@ ...@@ -88,7 +89,8 @@
88 <url>https://oss.sonatype.org/content/repositories/snapshots</url> 89 <url>https://oss.sonatype.org/content/repositories/snapshots</url>
89 </snapshotRepository> 90 </snapshotRepository>
90 </distributionManagement> 91 </distributionManagement>
91 - 92 +
93 + <!-- FIXME remove before Emu release -->
92 <repositories> 94 <repositories>
93 <repository> 95 <repository>
94 <id>snapshots</id> 96 <id>snapshots</id>
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
33 <url>http://onosproject.org</url> 33 <url>http://onosproject.org</url>
34 34
35 <properties> 35 <properties>
36 - <onos.version>1.4.0-SNAPSHOT</onos.version>
37 <onos.app.name>org.onosproject.netcfghostprovider</onos.app.name> 36 <onos.app.name>org.onosproject.netcfghostprovider</onos.app.name>
38 <onos.app.origin>ON.Lab</onos.app.origin> 37 <onos.app.origin>ON.Lab</onos.app.origin>
39 </properties> 38 </properties>
...@@ -42,13 +41,11 @@ ...@@ -42,13 +41,11 @@
42 <dependency> 41 <dependency>
43 <groupId>org.onosproject</groupId> 42 <groupId>org.onosproject</groupId>
44 <artifactId>onos-api</artifactId> 43 <artifactId>onos-api</artifactId>
45 - <version>${onos.version}</version>
46 </dependency> 44 </dependency>
47 45
48 <dependency> 46 <dependency>
49 <groupId>org.onosproject</groupId> 47 <groupId>org.onosproject</groupId>
50 <artifactId>onlab-osgi</artifactId> 48 <artifactId>onlab-osgi</artifactId>
51 - <version>${onos.version}</version>
52 </dependency> 49 </dependency>
53 50
54 <dependency> 51 <dependency>
...@@ -59,14 +56,6 @@ ...@@ -59,14 +56,6 @@
59 </dependency> 56 </dependency>
60 57
61 <dependency> 58 <dependency>
62 - <groupId>org.onosproject</groupId>
63 - <artifactId>onos-api</artifactId>
64 - <version>${onos.version}</version>
65 - <scope>test</scope>
66 - <classifier>tests</classifier>
67 - </dependency>
68 -
69 - <dependency>
70 <groupId>org.easymock</groupId> 59 <groupId>org.easymock</groupId>
71 <artifactId>easymock</artifactId> 60 <artifactId>easymock</artifactId>
72 <scope>test</scope> 61 <scope>test</scope>
......
...@@ -41,7 +41,7 @@ sed -i "" -E "s/Version\.version\(\"[^\"]*\"\)/Version.version(\"$NEW_VERSION\") ...@@ -41,7 +41,7 @@ sed -i "" -E "s/Version\.version\(\"[^\"]*\"\)/Version.version(\"$NEW_VERSION\")
41 41
42 # Augment the version in archetypes tree. 42 # Augment the version in archetypes tree.
43 mvn -f tools/package/archetypes/pom.xml versions:set -DnewVersion=$NEW_VERSION versions:commit 43 mvn -f tools/package/archetypes/pom.xml versions:set -DnewVersion=$NEW_VERSION versions:commit
44 -for atype in api bundle cli ui; do 44 +for atype in api bundle cli ui uitab uitopo; do
45 pom="tools/package/archetypes/$atype/src/main/resources/archetype-resources/pom.xml" 45 pom="tools/package/archetypes/$atype/src/main/resources/archetype-resources/pom.xml"
46 sed -i "" -E "1,/<onos.version>/s/<onos.version>[^<]*</<onos.version>$NEW_VERSION</g" $pom 46 sed -i "" -E "1,/<onos.version>/s/<onos.version>[^<]*</<onos.version>$NEW_VERSION</g" $pom
47 done 47 done
...@@ -51,6 +51,3 @@ sed -i "" -E "s/-DarchetypeVersion=[^\"]*/-DarchetypeVersion=$NEW_VERSION/g" $ON ...@@ -51,6 +51,3 @@ sed -i "" -E "s/-DarchetypeVersion=[^\"]*/-DarchetypeVersion=$NEW_VERSION/g" $ON
51 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 51 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
52 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 52 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
53 sed -i "" -E "s#CORD=./cord-gui-.*\.war#CORD=./cord-gui-$NEW_VERSION.war#" $ONOS_ROOT/apps/demo/cord-gui/src/scripts/run.me 53 sed -i "" -E "s#CORD=./cord-gui-.*\.war#CORD=./cord-gui-$NEW_VERSION.war#" $ONOS_ROOT/apps/demo/cord-gui/src/scripts/run.me
54 -
55 -# Augment the acl app
56 -sed -i "" -E "s/<onos.version>[^<]*</<onos.version>$NEW_VERSION</g" $ONOS_ROOT/apps/acl/pom.xml
......
...@@ -22,12 +22,13 @@ ...@@ -22,12 +22,13 @@
22 22
23 <parent> 23 <parent>
24 <groupId>org.onosproject</groupId> 24 <groupId>org.onosproject</groupId>
25 - <artifactId>onos</artifactId> 25 + <artifactId>onos-base</artifactId>
26 - <version>1.4.0-SNAPSHOT</version> 26 + <version>1</version>
27 - <relativePath>../../../pom.xml</relativePath>
28 </parent> 27 </parent>
29 28
29 + <groupId>org.onosproject</groupId>
30 <artifactId>onos-assembly</artifactId> 30 <artifactId>onos-assembly</artifactId>
31 + <version>1.0</version>
31 <packaging>pom</packaging> 32 <packaging>pom</packaging>
32 33
33 <description>ONOS Apache Karaf assembly definitions</description> 34 <description>ONOS Apache Karaf assembly definitions</description>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 }, 25 },
26 "version": { 26 "version": {
27 "type": "string", 27 "type": "string",
28 - "example": "1.4.0.SNAPSHOT" 28 + "example": "1.2.3"
29 }, 29 },
30 "description": { 30 "description": {
31 "type": "string", 31 "type": "string",
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 }, 48 },
49 "featuresRepo": { 49 "featuresRepo": {
50 "type": "string", 50 "type": "string",
51 - "example": "mvn:org.onosproject/onos-app-cip/1.4.0-SNAPSHOT/xml/features" 51 + "example": "mvn:org.onosproject/onos-app-cip/1.2.3/xml/features"
52 }, 52 },
53 "features": { 53 "features": {
54 "type": "array", 54 "type": "array",
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 }, 25 },
26 "version": { 26 "version": {
27 "type": "string", 27 "type": "string",
28 - "example": "1.4.0.SNAPSHOT" 28 + "example": "1.2.3"
29 }, 29 },
30 "description": { 30 "description": {
31 "type": "string", 31 "type": "string",
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 }, 48 },
49 "featuresRepo": { 49 "featuresRepo": {
50 "type": "string", 50 "type": "string",
51 - "example": "mvn:org.onosproject/onos-app-cip/1.4.0-SNAPSHOT/xml/features" 51 + "example": "mvn:org.onosproject/onos-app-cip/1.2.3/xml/features"
52 }, 52 },
53 "features": { 53 "features": {
54 "type": "array", 54 "type": "array",
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 }, 38 },
39 "version": { 39 "version": {
40 "type": "string", 40 "type": "string",
41 - "example": "1.4.0.SNAPSHOT" 41 + "example": "1.2.3"
42 }, 42 },
43 "description": { 43 "description": {
44 "type": "string", 44 "type": "string",
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 }, 61 },
62 "featuresRepo": { 62 "featuresRepo": {
63 "type": "string", 63 "type": "string",
64 - "example": "mvn:org.onosproject/onos-app-cip/1.4.0-SNAPSHOT/xml/features" 64 + "example": "mvn:org.onosproject/onos-app-cip/1.2.3/xml/features"
65 }, 65 },
66 "features": { 66 "features": {
67 "type": "array", 67 "type": "array",
......