Upgrade to Atomix 3.0.0-rc12
Change-Id: Id05018faa82195608d0ec6dae5cedc7a8899fc19
diff --git a/core/store/primitives/pom.xml b/core/store/primitives/pom.xml
index 68250a2..06fcb9a 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-rc11</version>
+ <version>3.0.0-rc12</version>
</dependency>
<dependency>
<groupId>io.atomix</groupId>
<artifactId>atomix-raft</artifactId>
- <version>3.0.0-rc11</version>
+ <version>3.0.0-rc12</version>
</dependency>
<dependency>
diff --git a/lib/BUCK b/lib/BUCK
index 622d29e..b8fc7e1 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Fri, 10 Aug 2018 23:10:43 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Sat, 18 Aug 2018 08:17:40 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.0-rc11.jar',
- url = 'mvn:io.atomix:atomix:jar:3.0.0-rc11',
- sha1 = '0e095e48e5cc7e8fdcf46eb65972d8ae13acd7cf',
- maven_coords = 'io.atomix:atomix:3.0.0-rc11',
+ out = 'atomix-3.0.0-rc12.jar',
+ url = 'mvn:io.atomix:atomix:jar:3.0.0-rc12',
+ sha1 = '6603f39eddcc5d5a6b8b91225ae1127960fde337',
+ maven_coords = 'io.atomix:atomix:3.0.0-rc12',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-cluster',
- out = 'atomix-cluster-3.0.0-rc11.jar',
- url = 'mvn:io.atomix:atomix-cluster:jar:3.0.0-rc11',
- sha1 = '6b76c3155d57cfaaecdc2efff317795443d9befa',
- maven_coords = 'io.atomix:atomix-cluster:3.0.0-rc11',
+ out = 'atomix-cluster-3.0.0-rc12.jar',
+ url = 'mvn:io.atomix:atomix-cluster:jar:3.0.0-rc12',
+ sha1 = 'f4f692af091bdc239754cb179e3f198ed907268b',
+ maven_coords = 'io.atomix:atomix-cluster:3.0.0-rc12',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-gossip',
- out = 'atomix-gossip-3.0.0-rc11.jar',
- url = 'mvn:io.atomix:atomix-gossip:jar:3.0.0-rc11',
- sha1 = '3616b5e689f9e242ca6e075be5550532969236f5',
- maven_coords = 'io.atomix:atomix-gossip:3.0.0-rc11',
+ out = 'atomix-gossip-3.0.0-rc12.jar',
+ url = 'mvn:io.atomix:atomix-gossip:jar:3.0.0-rc12',
+ sha1 = '1ee07e06bd888261b0f8f1efea1bae16a411d560',
+ maven_coords = 'io.atomix:atomix-gossip:3.0.0-rc12',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-primary-backup',
- out = 'atomix-primary-backup-3.0.0-rc11.jar',
- url = 'mvn:io.atomix:atomix-primary-backup:jar:3.0.0-rc11',
- sha1 = '57d2118072361f83655891ccde45f9e26f869fe6',
- maven_coords = 'io.atomix:atomix-primary-backup:3.0.0-rc11',
+ out = 'atomix-primary-backup-3.0.0-rc12.jar',
+ url = 'mvn:io.atomix:atomix-primary-backup:jar:3.0.0-rc12',
+ sha1 = '1bf8bcc2caf58e59a20e41c707aad3ddd60a417e',
+ maven_coords = 'io.atomix:atomix-primary-backup:3.0.0-rc12',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-primitive',
- out = 'atomix-primitive-3.0.0-rc11.jar',
- url = 'mvn:io.atomix:atomix-primitive:jar:3.0.0-rc11',
- sha1 = 'eeae8bc2d81a93af7cb02d1c8dc3e771919b39a0',
- maven_coords = 'io.atomix:atomix-primitive:3.0.0-rc11',
+ out = 'atomix-primitive-3.0.0-rc12.jar',
+ url = 'mvn:io.atomix:atomix-primitive:jar:3.0.0-rc12',
+ sha1 = '99654b247ac152f75b4fb2334924fd7e56c5397a',
+ maven_coords = 'io.atomix:atomix-primitive:3.0.0-rc12',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-raft',
- out = 'atomix-raft-3.0.0-rc11.jar',
- url = 'mvn:io.atomix:atomix-raft:jar:3.0.0-rc11',
- sha1 = 'f39ce10114f1d336906093eb2ee932f129c96919',
- maven_coords = 'io.atomix:atomix-raft:3.0.0-rc11',
+ out = 'atomix-raft-3.0.0-rc12.jar',
+ url = 'mvn:io.atomix:atomix-raft:jar:3.0.0-rc12',
+ sha1 = 'd744ba3d077035f46d3bf52e79c685f9df56fea6',
+ maven_coords = 'io.atomix:atomix-raft:3.0.0-rc12',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-storage',
- out = 'atomix-storage-3.0.0-rc11.jar',
- url = 'mvn:io.atomix:atomix-storage:jar:3.0.0-rc11',
- sha1 = 'aa3b119675bfe4406b4ba4720a8211b0e717265c',
- maven_coords = 'io.atomix:atomix-storage:3.0.0-rc11',
+ out = 'atomix-storage-3.0.0-rc12.jar',
+ url = 'mvn:io.atomix:atomix-storage:jar:3.0.0-rc12',
+ sha1 = '614b794a3004199c0e230d12284145e40e99eda4',
+ maven_coords = 'io.atomix:atomix-storage:3.0.0-rc12',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-utils',
- out = 'atomix-utils-3.0.0-rc11.jar',
- url = 'mvn:io.atomix:atomix-utils:jar:3.0.0-rc11',
- sha1 = 'f415a99511d481b7028e7b702b59c526460e7424',
- maven_coords = 'io.atomix:atomix-utils:3.0.0-rc11',
+ out = 'atomix-utils-3.0.0-rc12.jar',
+ url = 'mvn:io.atomix:atomix-utils:jar:3.0.0-rc12',
+ sha1 = 'da8077c3f2d2cc56d260f0e09bd65502dd2a94c4',
+ maven_coords = 'io.atomix:atomix-utils:3.0.0-rc12',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index 83fa1bd..c1fe00a 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.0-rc11",
- "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.0.0-rc11",
- "atomix-gossip": "mvn:io.atomix:atomix-gossip:3.0.0-rc11",
- "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.0.0-rc11",
- "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.0.0-rc11",
- "atomix-raft": "mvn:io.atomix:atomix-raft:3.0.0-rc11",
- "atomix-storage": "mvn:io.atomix:atomix-storage:3.0.0-rc11",
- "atomix-utils": "mvn:io.atomix:atomix-utils:3.0.0-rc11",
+ "atomix": "mvn:io.atomix:atomix:3.0.0-rc12",
+ "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.0.0-rc12",
+ "atomix-gossip": "mvn:io.atomix:atomix-gossip:3.0.0-rc12",
+ "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.0.0-rc12",
+ "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.0.0-rc12",
+ "atomix-raft": "mvn:io.atomix:atomix-raft:3.0.0-rc12",
+ "atomix-storage": "mvn:io.atomix:atomix-storage:3.0.0-rc12",
+ "atomix-utils": "mvn:io.atomix:atomix-utils:3.0.0-rc12",
"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 8d2f855..49cc975 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, 10 Aug 2018 23:10:39 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Sat, 18 Aug 2018 08:17:39 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.0-rc11",
- sha1 = "0e095e48e5cc7e8fdcf46eb65972d8ae13acd7cf",
+ artifact = "io.atomix:atomix:3.0.0-rc12",
+ sha1 = "6603f39eddcc5d5a6b8b91225ae1127960fde337",
)
native.maven_jar(
name = "atomix_cluster",
- artifact = "io.atomix:atomix-cluster:3.0.0-rc11",
- sha1 = "6b76c3155d57cfaaecdc2efff317795443d9befa",
+ artifact = "io.atomix:atomix-cluster:3.0.0-rc12",
+ sha1 = "f4f692af091bdc239754cb179e3f198ed907268b",
)
native.maven_jar(
name = "atomix_gossip",
- artifact = "io.atomix:atomix-gossip:3.0.0-rc11",
- sha1 = "3616b5e689f9e242ca6e075be5550532969236f5",
+ artifact = "io.atomix:atomix-gossip:3.0.0-rc12",
+ sha1 = "1ee07e06bd888261b0f8f1efea1bae16a411d560",
)
native.maven_jar(
name = "atomix_primary_backup",
- artifact = "io.atomix:atomix-primary-backup:3.0.0-rc11",
- sha1 = "57d2118072361f83655891ccde45f9e26f869fe6",
+ artifact = "io.atomix:atomix-primary-backup:3.0.0-rc12",
+ sha1 = "1bf8bcc2caf58e59a20e41c707aad3ddd60a417e",
)
native.maven_jar(
name = "atomix_primitive",
- artifact = "io.atomix:atomix-primitive:3.0.0-rc11",
- sha1 = "eeae8bc2d81a93af7cb02d1c8dc3e771919b39a0",
+ artifact = "io.atomix:atomix-primitive:3.0.0-rc12",
+ sha1 = "99654b247ac152f75b4fb2334924fd7e56c5397a",
)
native.maven_jar(
name = "atomix_raft",
- artifact = "io.atomix:atomix-raft:3.0.0-rc11",
- sha1 = "f39ce10114f1d336906093eb2ee932f129c96919",
+ artifact = "io.atomix:atomix-raft:3.0.0-rc12",
+ sha1 = "d744ba3d077035f46d3bf52e79c685f9df56fea6",
)
native.maven_jar(
name = "atomix_storage",
- artifact = "io.atomix:atomix-storage:3.0.0-rc11",
- sha1 = "aa3b119675bfe4406b4ba4720a8211b0e717265c",
+ artifact = "io.atomix:atomix-storage:3.0.0-rc12",
+ sha1 = "614b794a3004199c0e230d12284145e40e99eda4",
)
native.maven_jar(
name = "atomix_utils",
- artifact = "io.atomix:atomix-utils:3.0.0-rc11",
- sha1 = "f415a99511d481b7028e7b702b59c526460e7424",
+ artifact = "io.atomix:atomix-utils:3.0.0-rc12",
+ sha1 = "da8077c3f2d2cc56d260f0e09bd65502dd2a94c4",
)
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.0-rc11"
-artifact_map["@atomix_cluster//jar"] = "mvn:io.atomix:atomix-cluster:jar:3.0.0-rc11"
-artifact_map["@atomix_gossip//jar"] = "mvn:io.atomix:atomix-gossip:jar:3.0.0-rc11"
-artifact_map["@atomix_primary_backup//jar"] = "mvn:io.atomix:atomix-primary-backup:jar:3.0.0-rc11"
-artifact_map["@atomix_primitive//jar"] = "mvn:io.atomix:atomix-primitive:jar:3.0.0-rc11"
-artifact_map["@atomix_raft//jar"] = "mvn:io.atomix:atomix-raft:jar:3.0.0-rc11"
-artifact_map["@atomix_storage//jar"] = "mvn:io.atomix:atomix-storage:jar:3.0.0-rc11"
-artifact_map["@atomix_utils//jar"] = "mvn:io.atomix:atomix-utils:jar:3.0.0-rc11"
+artifact_map["@atomix//jar"] = "mvn:io.atomix:atomix:jar:3.0.0-rc12"
+artifact_map["@atomix_cluster//jar"] = "mvn:io.atomix:atomix-cluster:jar:3.0.0-rc12"
+artifact_map["@atomix_gossip//jar"] = "mvn:io.atomix:atomix-gossip:jar:3.0.0-rc12"
+artifact_map["@atomix_primary_backup//jar"] = "mvn:io.atomix:atomix-primary-backup:jar:3.0.0-rc12"
+artifact_map["@atomix_primitive//jar"] = "mvn:io.atomix:atomix-primitive:jar:3.0.0-rc12"
+artifact_map["@atomix_raft//jar"] = "mvn:io.atomix:atomix-raft:jar:3.0.0-rc12"
+artifact_map["@atomix_storage//jar"] = "mvn:io.atomix:atomix-storage:jar:3.0.0-rc12"
+artifact_map["@atomix_utils//jar"] = "mvn:io.atomix:atomix-utils:jar:3.0.0-rc12"
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"
diff --git a/tools/package/features/features.xml b/tools/package/features/features.xml
index 5ce587e..db3178f 100644
--- a/tools/package/features/features.xml
+++ b/tools/package/features/features.xml
@@ -59,14 +59,14 @@
<bundle>mvn:com.typesafe/config/1.3.2</bundle>
<bundle>mvn:com.googlecode.concurrent-trees/concurrent-trees/2.6.0</bundle>
<bundle>mvn:commons-io/commons-io/2.4</bundle>
- <bundle>mvn:io.atomix/atomix/3.0.0-rc11</bundle>
- <bundle>mvn:io.atomix/atomix-cluster/3.0.0-rc11</bundle>
- <bundle>mvn:io.atomix/atomix-gossip/3.0.0-rc11</bundle>
- <bundle>mvn:io.atomix/atomix-primary-backup/3.0.0-rc11</bundle>
- <bundle>mvn:io.atomix/atomix-primitive/3.0.0-rc11</bundle>
- <bundle>mvn:io.atomix/atomix-raft/3.0.0-rc11</bundle>
- <bundle>mvn:io.atomix/atomix-storage/3.0.0-rc11</bundle>
- <bundle>mvn:io.atomix/atomix-utils/3.0.0-rc11</bundle>
+ <bundle>mvn:io.atomix/atomix/3.0.0-rc12</bundle>
+ <bundle>mvn:io.atomix/atomix-cluster/3.0.0-rc12</bundle>
+ <bundle>mvn:io.atomix/atomix-gossip/3.0.0-rc12</bundle>
+ <bundle>mvn:io.atomix/atomix-primary-backup/3.0.0-rc12</bundle>
+ <bundle>mvn:io.atomix/atomix-primitive/3.0.0-rc12</bundle>
+ <bundle>mvn:io.atomix/atomix-raft/3.0.0-rc12</bundle>
+ <bundle>mvn:io.atomix/atomix-storage/3.0.0-rc12</bundle>
+ <bundle>mvn:io.atomix/atomix-utils/3.0.0-rc12</bundle>
<bundle>mvn:com.typesafe/config/1.3.2</bundle>
<bundle>mvn:io.github.classgraph/classgraph/4.0.6</bundle>
diff --git a/tools/test/bin/atomix-gen-config b/tools/test/bin/atomix-gen-config
index 3521f2e..e69f441 100755
--- a/tools/test/bin/atomix-gen-config
+++ b/tools/test/bin/atomix-gen-config
@@ -135,7 +135,6 @@
'type': 'raft',
'partitions': 1,
'partitionSize': len(nodes),
- 'flushOnCommit': False,
'members': [node['id'] for node in nodes]
},
'partitionGroups': {
@@ -143,7 +142,6 @@
'type': 'raft',
'partitions': num_partitions,
'partitionSize': partition_size,
- 'flushOnCommit': False,
'members': [node['id'] for node in nodes]
}
}
diff --git a/tools/test/bin/atomix-install b/tools/test/bin/atomix-install
index 3147375..2c20f4a 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.0-rc11/atomix-dist-3.0.0-rc11.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.0-rc12/atomix-dist-3.0.0-rc12.tar.gz
tar -xvf $ATOMIX_INSTALL_DIR/atomix-dist.tar.gz -C $ATOMIX_INSTALL_DIR
"
diff --git a/tools/test/scenarios/ha-multi-node.xml b/tools/test/scenarios/ha-multi-node.xml
index 6b0ecae..d53d3ca 100644
--- a/tools/test/scenarios/ha-multi-node.xml
+++ b/tools/test/scenarios/ha-multi-node.xml
@@ -23,12 +23,8 @@
<step name="Node-Death-${#}"
exec="onos-power ${OC#} off"/>
- <step name="Validate-Death-${#}"
- requires="Node-Death-${#}"
- exec="onos-check-node-status ${OC#} INACTIVE"/>
-
<step name="Breathe-${#}"
- requires="Validate-Death-${#}"
+ requires="Node-Death-${#}"
exec="sleep 5"/>
<step name="Node-Start-${#}"
@@ -61,7 +57,7 @@
<step name="Check-All-Logs-${#}"
requires="~Check-Nodes-${#},~Check-Masters-${#},~Check-Components-${#},~Check-Apps-${#},~Check-Flows-${#}"
- exec="onos-check-all-logs --ignore-store-exceptions"/>
+ exec="onos-check-all-logs"/>
</sequential>
</group>