Set stable versions for 1.1 release
Additionally, it starts a new dev. cycle
Change-Id: I3f9d4c4845a6dca771c591bd908a46bd613c6d67
diff --git a/Makefile b/Makefile
index 3ed4f52..b47d1e6 100644
--- a/Makefile
+++ b/Makefile
@@ -40,13 +40,9 @@
endif
ifeq ($(DOCKER_TAG),stable)
-# FIXME temporary until stable moves to newer commits
- KARAF_VERSION := 4.2.9
# Includes the default ("working") versions of each component
include ./Makefile.vars.stable
else ifeq ($(DOCKER_TAG),master)
-# FIXME temporary until stable moves to newer commits
- KARAF_VERSION := 4.2.14
# Includes the master versions of each component
include ./Makefile.vars.master
else
@@ -70,6 +66,7 @@
ONOS_YOURKIT := 2021.3-b230
USE_ONOS_BAZEL_OUTPUT ?=
USE_LOCAL_SNAPSHOT_ARTIFACTS ?=
+KARAF_VERSION := 4.2.14
# Trellis-Control related
export TRELLIS_CONTROL_ROOT := $(shell pwd)/trellis-control
diff --git a/Makefile.vars.master b/Makefile.vars.master
index 4add94d..394cd9a 100644
--- a/Makefile.vars.master
+++ b/Makefile.vars.master
@@ -27,7 +27,7 @@
# (3) Fetch from Gerrit/Github (pending review in the form of refs/changes/... or pending pull request);
export ONOS_VERSION ?= onos-2.5
-export TRELLIS_CONTROL_VERSION ?= 3.2.0-SNAPSHOT
+export TRELLIS_CONTROL_VERSION ?= 3.3.0-SNAPSHOT
export TRELLIS_T3_VERSION ?= 4.1.0-SNAPSHOT
export UP4_VERSION ?= master
export FABRIC_TNA_VERSION ?= main
diff --git a/Makefile.vars.stable b/Makefile.vars.stable
index 40696c4..bcbaf0d 100644
--- a/Makefile.vars.stable
+++ b/Makefile.vars.stable
@@ -26,8 +26,8 @@
# (2) Checkout Local source code (local branch not yet pushed);
# (3) Fetch from Gerrit/Github (pending review in the form of refs/changes/... or pending pull request);
-export ONOS_VERSION ?= 2.5.5-rc1
-export TRELLIS_CONTROL_VERSION ?= 3.1.0
+export ONOS_VERSION ?= 2.5.7-rc2
+export TRELLIS_CONTROL_VERSION ?= 3.2.0
export TRELLIS_T3_VERSION ?= 4.0.0
-export UP4_VERSION ?= 1.0.0
-export FABRIC_TNA_VERSION ?= 1.0.0
+export UP4_VERSION ?= 1.1.0
+export FABRIC_TNA_VERSION ?= 1.1.0