Upgrade to Atomix 3.0.3
Change-Id: Ic884691957d2deca6727758653cbdf4c4d73bb1d
diff --git a/core/store/primitives/pom.xml b/core/store/primitives/pom.xml
index b8df25f..fe3c4b8 100644
--- a/core/store/primitives/pom.xml
+++ b/core/store/primitives/pom.xml
@@ -69,13 +69,13 @@
<dependency>
<groupId>io.atomix</groupId>
<artifactId>atomix</artifactId>
- <version>3.0.0</version>
+ <version>3.0.3</version>
</dependency>
<dependency>
<groupId>io.atomix</groupId>
<artifactId>atomix-raft</artifactId>
- <version>3.0.0</version>
+ <version>3.0.3</version>
</dependency>
<dependency>
diff --git a/lib/BUCK b/lib/BUCK
index b570c65..a97e1fc 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Fri, 24 Aug 2018 17:30:42 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Thu, 30 Aug 2018 21:03:24 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
@@ -242,73 +242,73 @@
remote_jar (
name = 'atomix',
- out = 'atomix-3.0.1.jar',
- url = 'mvn:io.atomix:atomix:jar:3.0.1',
- sha1 = '18f0a2d827c851885c911ba79c12337e4b684882',
- maven_coords = 'io.atomix:atomix:3.0.1',
+ out = 'atomix-3.0.3.jar',
+ url = 'mvn:io.atomix:atomix:jar:3.0.3',
+ sha1 = '708ee66373ff86369d1699f8246661a757b61726',
+ maven_coords = 'io.atomix:atomix:3.0.3',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-cluster',
- out = 'atomix-cluster-3.0.1.jar',
- url = 'mvn:io.atomix:atomix-cluster:jar:3.0.1',
- sha1 = 'c1f78bd5cf3a17ae0cfbe3e9753949acbf2a1a10',
- maven_coords = 'io.atomix:atomix-cluster:3.0.1',
+ out = 'atomix-cluster-3.0.3.jar',
+ url = 'mvn:io.atomix:atomix-cluster:jar:3.0.3',
+ sha1 = 'f7ba29d9725d4acac7db806cb05fe77435f7cb1c',
+ maven_coords = 'io.atomix:atomix-cluster:3.0.3',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-gossip',
- out = 'atomix-gossip-3.0.1.jar',
- url = 'mvn:io.atomix:atomix-gossip:jar:3.0.1',
- sha1 = '5023cb9ee8f8b6ff99b101c93d513310429f43d0',
- maven_coords = 'io.atomix:atomix-gossip:3.0.1',
+ out = 'atomix-gossip-3.0.3.jar',
+ url = 'mvn:io.atomix:atomix-gossip:jar:3.0.3',
+ sha1 = '93ca54c1ba6619b5820d5b898ce0410ac55ad9e3',
+ maven_coords = 'io.atomix:atomix-gossip:3.0.3',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-primary-backup',
- out = 'atomix-primary-backup-3.0.1.jar',
- url = 'mvn:io.atomix:atomix-primary-backup:jar:3.0.1',
- sha1 = '69df17efb894313ed64fb84744931e63447a61de',
- maven_coords = 'io.atomix:atomix-primary-backup:3.0.1',
+ out = 'atomix-primary-backup-3.0.3.jar',
+ url = 'mvn:io.atomix:atomix-primary-backup:jar:3.0.3',
+ sha1 = '95f44706477348b45c502752bae0aa5b8cd6670a',
+ maven_coords = 'io.atomix:atomix-primary-backup:3.0.3',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-primitive',
- out = 'atomix-primitive-3.0.1.jar',
- url = 'mvn:io.atomix:atomix-primitive:jar:3.0.1',
- sha1 = '9f0f1120899288248d258ad6fe65ee15fe4f7846',
- maven_coords = 'io.atomix:atomix-primitive:3.0.1',
+ out = 'atomix-primitive-3.0.3.jar',
+ url = 'mvn:io.atomix:atomix-primitive:jar:3.0.3',
+ sha1 = '3e97f76ee148a8451090b50fb8edd174699962de',
+ maven_coords = 'io.atomix:atomix-primitive:3.0.3',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-raft',
- out = 'atomix-raft-3.0.1.jar',
- url = 'mvn:io.atomix:atomix-raft:jar:3.0.1',
- sha1 = '6bcf6864f8549815dea930c90d302302b88c33a6',
- maven_coords = 'io.atomix:atomix-raft:3.0.1',
+ out = 'atomix-raft-3.0.3.jar',
+ url = 'mvn:io.atomix:atomix-raft:jar:3.0.3',
+ sha1 = '0c3b4bb68512de7fdef8e7c9af77830478b82e32',
+ maven_coords = 'io.atomix:atomix-raft:3.0.3',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-storage',
- out = 'atomix-storage-3.0.1.jar',
- url = 'mvn:io.atomix:atomix-storage:jar:3.0.1',
- sha1 = '1008706bb2fc5f65b32e57ec4f5204798a97d551',
- maven_coords = 'io.atomix:atomix-storage:3.0.1',
+ out = 'atomix-storage-3.0.3.jar',
+ url = 'mvn:io.atomix:atomix-storage:jar:3.0.3',
+ sha1 = '75b682d4c16555912b98159b9d1f055bfe12cfb4',
+ maven_coords = 'io.atomix:atomix-storage:3.0.3',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-utils',
- out = 'atomix-utils-3.0.1.jar',
- url = 'mvn:io.atomix:atomix-utils:jar:3.0.1',
- sha1 = 'e9d83e8a440ff0af9c693e9cf4e46e3448e05193',
- maven_coords = 'io.atomix:atomix-utils:3.0.1',
+ out = 'atomix-utils-3.0.3.jar',
+ url = 'mvn:io.atomix:atomix-utils:jar:3.0.3',
+ sha1 = '6a52f4f92d65ffad8cecb2577b1f2603bf446446',
+ maven_coords = 'io.atomix:atomix-utils:3.0.3',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index 7beab29..fb65b05 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -138,14 +138,14 @@
"aopalliance-repackaged": "mvn:org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b42",
"amqp-client": "mvn:com.rabbitmq:amqp-client:jar:3.6.1",
"asm": "mvn:org.ow2.asm:asm:5.0.4",
- "atomix": "mvn:io.atomix:atomix:3.0.1",
- "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.0.1",
- "atomix-gossip": "mvn:io.atomix:atomix-gossip:3.0.1",
- "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.0.1",
- "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.0.1",
- "atomix-raft": "mvn:io.atomix:atomix-raft:3.0.1",
- "atomix-storage": "mvn:io.atomix:atomix-storage:3.0.1",
- "atomix-utils": "mvn:io.atomix:atomix-utils:3.0.1",
+ "atomix": "mvn:io.atomix:atomix:3.0.3",
+ "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.0.3",
+ "atomix-gossip": "mvn:io.atomix:atomix-gossip:3.0.3",
+ "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.0.3",
+ "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.0.3",
+ "atomix-raft": "mvn:io.atomix:atomix-raft:3.0.3",
+ "atomix-storage": "mvn:io.atomix:atomix-storage:3.0.3",
+ "atomix-utils": "mvn:io.atomix:atomix-utils:3.0.3",
"classgraph": "mvn:io.github.classgraph:classgraph:4.0.6",
"commons-codec": "mvn:commons-codec:commons-codec:1.10",
"commons-cli": "mvn:commons-cli:commons-cli:1.3",
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index 409badd..e58bef0 100644
--- a/tools/build/bazel/generate_workspace.bzl
+++ b/tools/build/bazel/generate_workspace.bzl
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Fri, 24 Aug 2018 17:30:40 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Thu, 30 Aug 2018 21:03:22 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -152,50 +152,50 @@
native.maven_jar(
name = "atomix",
- artifact = "io.atomix:atomix:3.0.1",
- sha1 = "18f0a2d827c851885c911ba79c12337e4b684882",
+ artifact = "io.atomix:atomix:3.0.3",
+ sha1 = "708ee66373ff86369d1699f8246661a757b61726",
)
native.maven_jar(
name = "atomix_cluster",
- artifact = "io.atomix:atomix-cluster:3.0.1",
- sha1 = "c1f78bd5cf3a17ae0cfbe3e9753949acbf2a1a10",
+ artifact = "io.atomix:atomix-cluster:3.0.3",
+ sha1 = "f7ba29d9725d4acac7db806cb05fe77435f7cb1c",
)
native.maven_jar(
name = "atomix_gossip",
- artifact = "io.atomix:atomix-gossip:3.0.1",
- sha1 = "5023cb9ee8f8b6ff99b101c93d513310429f43d0",
+ artifact = "io.atomix:atomix-gossip:3.0.3",
+ sha1 = "93ca54c1ba6619b5820d5b898ce0410ac55ad9e3",
)
native.maven_jar(
name = "atomix_primary_backup",
- artifact = "io.atomix:atomix-primary-backup:3.0.1",
- sha1 = "69df17efb894313ed64fb84744931e63447a61de",
+ artifact = "io.atomix:atomix-primary-backup:3.0.3",
+ sha1 = "95f44706477348b45c502752bae0aa5b8cd6670a",
)
native.maven_jar(
name = "atomix_primitive",
- artifact = "io.atomix:atomix-primitive:3.0.1",
- sha1 = "9f0f1120899288248d258ad6fe65ee15fe4f7846",
+ artifact = "io.atomix:atomix-primitive:3.0.3",
+ sha1 = "3e97f76ee148a8451090b50fb8edd174699962de",
)
native.maven_jar(
name = "atomix_raft",
- artifact = "io.atomix:atomix-raft:3.0.1",
- sha1 = "6bcf6864f8549815dea930c90d302302b88c33a6",
+ artifact = "io.atomix:atomix-raft:3.0.3",
+ sha1 = "0c3b4bb68512de7fdef8e7c9af77830478b82e32",
)
native.maven_jar(
name = "atomix_storage",
- artifact = "io.atomix:atomix-storage:3.0.1",
- sha1 = "1008706bb2fc5f65b32e57ec4f5204798a97d551",
+ artifact = "io.atomix:atomix-storage:3.0.3",
+ sha1 = "75b682d4c16555912b98159b9d1f055bfe12cfb4",
)
native.maven_jar(
name = "atomix_utils",
- artifact = "io.atomix:atomix-utils:3.0.1",
- sha1 = "e9d83e8a440ff0af9c693e9cf4e46e3448e05193",
+ artifact = "io.atomix:atomix-utils:3.0.3",
+ sha1 = "6a52f4f92d65ffad8cecb2577b1f2603bf446446",
)
native.maven_jar(
@@ -2502,14 +2502,14 @@
artifact_map["@aopalliance_repackaged//jar"] = "mvn:org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42"
artifact_map["@amqp_client//jar"] = "mvn:com.rabbitmq:amqp-client:jar:3.6.1"
artifact_map["@asm//jar"] = "mvn:org.ow2.asm:asm:jar:5.0.4"
-artifact_map["@atomix//jar"] = "mvn:io.atomix:atomix:jar:3.0.1"
-artifact_map["@atomix_cluster//jar"] = "mvn:io.atomix:atomix-cluster:jar:3.0.1"
-artifact_map["@atomix_gossip//jar"] = "mvn:io.atomix:atomix-gossip:jar:3.0.1"
-artifact_map["@atomix_primary_backup//jar"] = "mvn:io.atomix:atomix-primary-backup:jar:3.0.1"
-artifact_map["@atomix_primitive//jar"] = "mvn:io.atomix:atomix-primitive:jar:3.0.1"
-artifact_map["@atomix_raft//jar"] = "mvn:io.atomix:atomix-raft:jar:3.0.1"
-artifact_map["@atomix_storage//jar"] = "mvn:io.atomix:atomix-storage:jar:3.0.1"
-artifact_map["@atomix_utils//jar"] = "mvn:io.atomix:atomix-utils:jar:3.0.1"
+artifact_map["@atomix//jar"] = "mvn:io.atomix:atomix:jar:3.0.3"
+artifact_map["@atomix_cluster//jar"] = "mvn:io.atomix:atomix-cluster:jar:3.0.3"
+artifact_map["@atomix_gossip//jar"] = "mvn:io.atomix:atomix-gossip:jar:3.0.3"
+artifact_map["@atomix_primary_backup//jar"] = "mvn:io.atomix:atomix-primary-backup:jar:3.0.3"
+artifact_map["@atomix_primitive//jar"] = "mvn:io.atomix:atomix-primitive:jar:3.0.3"
+artifact_map["@atomix_raft//jar"] = "mvn:io.atomix:atomix-raft:jar:3.0.3"
+artifact_map["@atomix_storage//jar"] = "mvn:io.atomix:atomix-storage:jar:3.0.3"
+artifact_map["@atomix_utils//jar"] = "mvn:io.atomix:atomix-utils:jar:3.0.3"
artifact_map["@classgraph//jar"] = "mvn:io.github.classgraph:classgraph:jar:4.0.6"
artifact_map["@commons_codec//jar"] = "mvn:commons-codec:commons-codec:jar:1.10"
artifact_map["@commons_cli//jar"] = "mvn:commons-cli:commons-cli:jar:1.3"
@@ -2709,3 +2709,4 @@
if type(label) == "string":
return "mvn:%s:%s:%s" % (ONOS_GROUP_ID, label_string, ONOS_VERSION)
return "mvn:%s:%s:%s" % (ONOS_GROUP_ID, label.name, ONOS_VERSION)
+
diff --git a/tools/test/bin/atomix-config b/tools/test/bin/atomix-config
index f7decba..709d42e 100755
--- a/tools/test/bin/atomix-config
+++ b/tools/test/bin/atomix-config
@@ -37,5 +37,5 @@
scp -q $CDEF_FILE $remote:$ATOMIX_INSTALL_DIR/atomix.json
ssh -tt $ONOS_USER@$node "
- sed -i -e $'s/<logger name=\"io.atomix\" level=\"INFO\" \/>/<logger name=\"io.atomix\" level=\"INFO\" \/>\\\n <logger name=\"io.atomix.protocols.raft\" level=\"DEBUG\" \/>/g' /opt/atomix/conf/logback.xml
+ sed -i -e $'s/<logger name=\"io.atomix\" level=\"\${atomix.level:-INFO}\" \/>/<logger name=\"io.atomix\" level=\"INFO\" \/>\\\n <logger name=\"io.atomix.protocols.raft\" level=\"DEBUG\" \/>/g' /opt/atomix/conf/logback.xml
"
diff --git a/tools/test/bin/atomix-install b/tools/test/bin/atomix-install
index 645c1f5..f0a46a3 100755
--- a/tools/test/bin/atomix-install
+++ b/tools/test/bin/atomix-install
@@ -47,7 +47,7 @@
[ -f $ATOMIX_INSTALL_DIR/bin/atomix-agent ] && echo \"Atomix is already installed\" && exit 1
sudo mkdir -p $ATOMIX_INSTALL_DIR && sudo chown ${ONOS_USER}:${ONOS_GROUP} $ATOMIX_INSTALL_DIR
- sudo wget -O $ATOMIX_INSTALL_DIR/atomix-dist.tar.gz https://oss.sonatype.org/content/repositories/releases/io/atomix/atomix-dist/3.0.1/atomix-dist-3.0.1.tar.gz
+ sudo wget -O $ATOMIX_INSTALL_DIR/atomix-dist.tar.gz https://oss.sonatype.org/content/repositories/releases/io/atomix/atomix-dist/3.0.3/atomix-dist-3.0.3.tar.gz
tar -xvf $ATOMIX_INSTALL_DIR/atomix-dist.tar.gz -C $ATOMIX_INSTALL_DIR
"