From e769afdb134099eedcc690daa4df69d93d6bdb66 Mon Sep 17 00:00:00 2001 From: ONOS Jenkins User Date: Sun, 19 Dec 2021 17:50:53 +0000 Subject: [PATCH] Tagging 2.5.5 --- .../src/main/java/org/onosproject/core/impl/VersionManager.java | 2 +- tools/build/bazel/variables.bzl | 2 +- tools/build/envDefaults | 2 +- tools/package/archetypes/api/pom.xml | 2 +- .../src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- tools/package/archetypes/bundle/pom.xml | 2 +- .../src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- tools/package/archetypes/cli/pom.xml | 2 +- .../src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- tools/package/archetypes/pom.xml | 2 +- tools/package/archetypes/rest/pom.xml | 2 +- .../src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- tools/package/archetypes/ui/pom.xml | 2 +- .../ui/src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- tools/package/archetypes/ui2/pom.xml | 2 +- .../src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- tools/package/archetypes/uitab/pom.xml | 2 +- .../src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- tools/package/archetypes/uitopo/pom.xml | 2 +- .../src/main/resources/META-INF/maven/archetype-metadata.xml | 2 +- tools/test/bin/onos-archetypes-test | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java b/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java index cadf82568a..c8f2b6a7d7 100644 --- a/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java +++ b/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java @@ -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("2.5.5-SNAPSHOT"); + private static Version version = Version.version("2.5.5"); @Activate protected void activate() { diff --git a/tools/build/bazel/variables.bzl b/tools/build/bazel/variables.bzl index 18164770df..6228666dc8 100644 --- a/tools/build/bazel/variables.bzl +++ b/tools/build/bazel/variables.bzl @@ -1,4 +1,4 @@ -ONOS_VERSION = "2.5.5-SNAPSHOT" +ONOS_VERSION = "2.5.5" ONOS_ARTIFACT_BASE = "onos-" ONOS_GROUP_ID = "org.onosproject" ONOS_ORIGIN = "ONOS Community" diff --git a/tools/build/envDefaults b/tools/build/envDefaults index 1d6f22daea..e3a7d699e9 100644 --- a/tools/build/envDefaults +++ b/tools/build/envDefaults @@ -18,7 +18,7 @@ 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="2.5.5-SNAPSHOT" +export ONOS_POM_VERSION="2.5.5" export ONOS_VERSION=${ONOS_VERSION:-2.5.5.$BUILD_NUMBER} # ONOS production bits (onos.tar.gz, onos.zip, onos.deb, onos.rpm) staging environment diff --git a/tools/package/archetypes/api/pom.xml b/tools/package/archetypes/api/pom.xml index 4b9b7c840f..4dcb8a7fb1 100644 --- a/tools/package/archetypes/api/pom.xml +++ b/tools/package/archetypes/api/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.5.5-SNAPSHOT + 2.5.5 onos-api-archetype diff --git a/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml index dd6ff53067..b6fb23ed48 100644 --- a/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/tools/package/archetypes/api/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -29,7 +29,7 @@ - 2.5.5-SNAPSHOT + 2.5.5 diff --git a/tools/package/archetypes/bundle/pom.xml b/tools/package/archetypes/bundle/pom.xml index a50381f2c8..ea87f47aa3 100644 --- a/tools/package/archetypes/bundle/pom.xml +++ b/tools/package/archetypes/bundle/pom.xml @@ -22,7 +22,7 @@ org.onosproject onos-archetypes - 2.5.5-SNAPSHOT + 2.5.5 onos-bundle-archetype diff --git a/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml index ba10887f82..1d25d9e9a2 100644 --- a/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/tools/package/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -35,7 +35,7 @@ - 2.5.5-SNAPSHOT + 2.5.5 diff --git a/tools/package/archetypes/cli/pom.xml b/tools/package/archetypes/cli/pom.xml index fe40c753ba..c7cfe398e2 100644 --- a/tools/package/archetypes/cli/pom.xml +++ b/tools/package/archetypes/cli/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.5.5-SNAPSHOT + 2.5.5 onos-cli-archetype diff --git a/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml index d89968ea0e..cedd40880e 100644 --- a/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/tools/package/archetypes/cli/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -35,7 +35,7 @@ - 2.5.5-SNAPSHOT + 2.5.5 diff --git a/tools/package/archetypes/pom.xml b/tools/package/archetypes/pom.xml index f9751c6b11..91d09fac28 100644 --- a/tools/package/archetypes/pom.xml +++ b/tools/package/archetypes/pom.xml @@ -28,7 +28,7 @@ org.onosproject onos-archetypes - 2.5.5-SNAPSHOT + 2.5.5 pom ONOS archetypes project diff --git a/tools/package/archetypes/rest/pom.xml b/tools/package/archetypes/rest/pom.xml index de6038bcaa..80c50f71c8 100644 --- a/tools/package/archetypes/rest/pom.xml +++ b/tools/package/archetypes/rest/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.5.5-SNAPSHOT + 2.5.5 onos-rest-archetype diff --git a/tools/package/archetypes/rest/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/rest/src/main/resources/META-INF/maven/archetype-metadata.xml index afef4751cc..03bd0a6839 100644 --- a/tools/package/archetypes/rest/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/tools/package/archetypes/rest/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -35,7 +35,7 @@ - 2.5.5-SNAPSHOT + 2.5.5 diff --git a/tools/package/archetypes/ui/pom.xml b/tools/package/archetypes/ui/pom.xml index 2edbf67312..076dd9c4e8 100644 --- a/tools/package/archetypes/ui/pom.xml +++ b/tools/package/archetypes/ui/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.5.5-SNAPSHOT + 2.5.5 onos-ui-archetype diff --git a/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml index 20b7e8735b..b61e4bb5cf 100644 --- a/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/tools/package/archetypes/ui/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -37,7 +37,7 @@ - 2.5.5-SNAPSHOT + 2.5.5 diff --git a/tools/package/archetypes/ui2/pom.xml b/tools/package/archetypes/ui2/pom.xml index 1a8e7f6550..0446cde0e6 100644 --- a/tools/package/archetypes/ui2/pom.xml +++ b/tools/package/archetypes/ui2/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.5.5-SNAPSHOT + 2.5.5 onos-ui2-archetype diff --git a/tools/package/archetypes/ui2/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/ui2/src/main/resources/META-INF/maven/archetype-metadata.xml index f1c855e10f..ea96fb12bf 100644 --- a/tools/package/archetypes/ui2/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/tools/package/archetypes/ui2/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -75,7 +75,7 @@ - 2.5.5-SNAPSHOT + 2.5.5 diff --git a/tools/package/archetypes/uitab/pom.xml b/tools/package/archetypes/uitab/pom.xml index be08b4ffa9..27c75c73f3 100644 --- a/tools/package/archetypes/uitab/pom.xml +++ b/tools/package/archetypes/uitab/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.5.5-SNAPSHOT + 2.5.5 onos-uitab-archetype diff --git a/tools/package/archetypes/uitab/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/uitab/src/main/resources/META-INF/maven/archetype-metadata.xml index 02e01ad68f..3c5d5aedf3 100644 --- a/tools/package/archetypes/uitab/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/tools/package/archetypes/uitab/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -38,7 +38,7 @@ - 2.5.5-SNAPSHOT + 2.5.5 diff --git a/tools/package/archetypes/uitopo/pom.xml b/tools/package/archetypes/uitopo/pom.xml index 17cd3ba0e3..abbf0d6896 100644 --- a/tools/package/archetypes/uitopo/pom.xml +++ b/tools/package/archetypes/uitopo/pom.xml @@ -20,7 +20,7 @@ org.onosproject onos-archetypes - 2.5.5-SNAPSHOT + 2.5.5 onos-uitopo-archetype diff --git a/tools/package/archetypes/uitopo/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/package/archetypes/uitopo/src/main/resources/META-INF/maven/archetype-metadata.xml index 041da4e687..cf54c33fa6 100644 --- a/tools/package/archetypes/uitopo/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/tools/package/archetypes/uitopo/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -38,7 +38,7 @@ - 2.5.5-SNAPSHOT + 2.5.5 diff --git a/tools/test/bin/onos-archetypes-test b/tools/test/bin/onos-archetypes-test index f0cfbd3423..61b6240e66 100755 --- a/tools/test/bin/onos-archetypes-test +++ b/tools/test/bin/onos-archetypes-test @@ -19,7 +19,7 @@ _EOF_ set -e export AROOT=${ONOS_STAGE_ROOT:-/tmp}/foo -export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.5.5-SNAPSHOT" +export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=2.5.5" rm -fr $AROOT 2>/dev/null mkdir -p $AROOT