mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-12-16 14:52:15 +01:00
Code Issues Projects Releases Wiki Activity

Changing version from 1.15.0-SNAPSHOT to 2.0.0-SNAPSHOT.

Browse Source 
Change-Id: I61a586cfc769275db78f4059a630ab0e0f87c6e7
This commit is contained in:
Thomas Vachuska 2018-10-31 15:23:55 -07:00
parent 09fee5f03a
commit e17756d128
23 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD
View File

@ -1,4 +1,4 @@
load("//tools/build/bazel:generate_workspace.bzl", "ONOS_VERSION")
load("//tools/build/bazel:variables.bzl", "ONOS_VERSION")
load(":modules.bzl", "APPS", "CORE", "FEATURES")
filegroup(

2
core/net/src/main/java/org/onosproject/core/impl/VersionManager.java
View File

@ -38,7 +38,7 @@ public class VersionManager implements VersionService {
private final Logger log = LoggerFactory.getLogger(getClass());
private static final File VERSION_FILE = new File("../VERSION");
private static Version version = Version.version("1.15.0-SNAPSHOT");
private static Version version = Version.version("2.0.0-SNAPSHOT");
@Activate
protected void activate() {

4
lib/pom.xml
View File

@ -29,7 +29,7 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
<packaging>pom</packaging>
<version>1.15.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
<description>Open Network Operating System shared dependencies</description>
@ -40,7 +40,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos-build-conf.version>1.15.0-SNAPSHOT</onos-build-conf.version>
<onos-build-conf.version>2.0.0-SNAPSHOT</onos-build-conf.version>
<netty4.version>4.1.8.Final</netty4.version>
<openflowj.version>3.2.1.onos</openflowj.version>
<onos-maven-plugin.version>1.12</onos-maven-plugin.version>

2
onos.defs
View File

@ -1,6 +1,6 @@
ONOS_ORIGIN = 'ONOS Community'
ONOS_GROUP_ID = 'org.onosproject'
ONOS_VERSION = '1.15.0-SNAPSHOT'
ONOS_VERSION = '2.0.0-SNAPSHOT'
DEFAULT_APP_CATEGORY = 'Utility'
ONOS_ARTIFACT_BASE = 'onos-'
APP_PREFIX = ONOS_GROUP_ID + '.'

8
tools/build/bazel/variables.bzl
View File

@ -1,6 +1,6 @@
ONOS_ORIGIN = "ONOS Community"
ONOS_GROUP_ID = "org.onosproject"
ONOS_VERSION = "1.15.0-SNAPSHOT"
DEFAULT_APP_CATEGORY = "Utility"
ONOS_VERSION = "2.0.0-SNAPSHOT"
ONOS_ARTIFACT_BASE = "onos-"
ONOS_GROUP_ID = "org.onosproject"
ONOS_ORIGIN = "ONOS Community"
APP_PREFIX = ONOS_GROUP_ID + "."
DEFAULT_APP_CATEGORY = "Utility"

4
tools/build/envDefaults
View File

@ -18,8 +18,8 @@ export PATH="$ONOS_ROOT/tools/build:$PATH"
export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)}
# ONOS Version and onos.tar.gz staging environment
export ONOS_POM_VERSION="1.15.0-SNAPSHOT"
export ONOS_VERSION=${ONOS_VERSION:-1.15.0.$BUILD_NUMBER}
export ONOS_POM_VERSION="2.0.0-SNAPSHOT"
export ONOS_VERSION=${ONOS_VERSION:-2.0.0.$BUILD_NUMBER}
# ONOS production bits (onos.tar.gz, onos.zip, onos.deb, onos.rpm) staging environment
export ONOS_BITS=onos-${ONOS_VERSION%~*}

2
tools/build/onos-prepare-sonar
View File

@ -12,7 +12,7 @@ from shutil import copy, copytree, rmtree
from subprocess import call, check_call, check_output
# FIXME pull the version from the Buck version file
ONOS_VERSION='1.15.0-SNAPSHOT'
ONOS_VERSION='2.0.0-SNAPSHOT'
# SonarQube property file name and template
FILE_NAME = 'sonar-project.properties'

2
tools/package/archetypes/api/pom.xml
View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>onos-api-archetype</artifactId>

2
tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
View File

@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos.version>1.15.0-SNAPSHOT</onos.version>
<onos.version>2.0.0-SNAPSHOT</onos.version>
</properties>
<dependencies>

2
tools/package/archetypes/bundle/pom.xml
View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>onos-bundle-archetype</artifactId>

2
tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
View File

@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos.version>1.15.0-SNAPSHOT</onos.version>
<onos.version>2.0.0-SNAPSHOT</onos.version>
<!-- Uncomment to generate ONOS app from this module.
<onos.app.name>org.foo.app</onos.app.name>
<onos.app.title>Foo App</onos.app.title>

2
tools/package/archetypes/cli/pom.xml
View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>onos-cli-archetype</artifactId>

2
tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
View File

@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos.version>1.15.0-SNAPSHOT</onos.version>
<onos.version>2.0.0-SNAPSHOT</onos.version>
</properties>
<dependencies>

2
tools/package/archetypes/pom.xml
View File

@ -28,7 +28,7 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>ONOS archetypes project</description>

2
tools/package/archetypes/rest/pom.xml
View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>onos-rest-archetype</artifactId>

2
tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
View File

@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos.version>1.15.0-SNAPSHOT</onos.version>
<onos.version>2.0.0-SNAPSHOT</onos.version>
<web.context>/onos/${artifactId}</web.context>
<api.version>1.0.0</api.version>

2
tools/package/archetypes/ui/pom.xml
View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>onos-ui-archetype</artifactId>

2
tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
View File

@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos.version>1.15.0-SNAPSHOT</onos.version>
<onos.version>2.0.0-SNAPSHOT</onos.version>
<!-- Uncomment to generate ONOS app from this module.
<onos.app.name>org.foo.app</onos.app.name>
<onos.app.title>Foo App</onos.app.title>

2
tools/package/archetypes/uitab/pom.xml
View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>onos-uitab-archetype</artifactId>

2
tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
View File

@ -33,7 +33,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos.version>1.15.0-SNAPSHOT</onos.version>
<onos.version>2.0.0-SNAPSHOT</onos.version>
<!-- Uncomment to generate ONOS app from this module.
<onos.app.name>org.foo.app</onos.app.name>
<onos.app.title>Foo App</onos.app.title>

2
tools/package/archetypes/uitopo/pom.xml
View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-archetypes</artifactId>
<version>1.15.0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>onos-uitopo-archetype</artifactId>

2
tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
View File

@ -33,7 +33,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos.version>1.15.0-SNAPSHOT</onos.version>
<onos.version>2.0.0-SNAPSHOT</onos.version>
<!-- Uncomment to generate ONOS app from this module.
<onos.app.name>org.foo.app</onos.app.name>
<onos.app.title>Foo App</onos.app.title>

2
tools/test/bin/onos-archetypes-test
View File

@ -19,7 +19,7 @@ _EOF_
set -e
export AROOT=${ONOS_STAGE_ROOT:-/tmp}/foo
export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.15.0-SNAPSHOT"
export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.0.0-SNAPSHOT"
mkdir -p $AROOT
for an in api bundle cli rest ui uitab uitopo; do