From 02fb583e9e5fda3be2f137b23284ef8ef7d0b5d3 Mon Sep 17 00:00:00 2001 From: Jordan Halterman Date: Mon, 17 Dec 2018 15:52:34 -0800 Subject: [PATCH] Upgrade to Atomix 3.1.0-rc1 Change-Id: I9b72b1247ac9abe6f38a2606f0211d0331581e64 --- lib/deps.json | 14 ++++---- tools/build/bazel/generate_workspace.bzl | 44 ++++++++++++------------ tools/test/bin/atomix-push-bits | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/lib/deps.json b/lib/deps.json index cc17968218..3d90531459 100644 --- a/lib/deps.json +++ b/lib/deps.json @@ -145,13 +145,13 @@ "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.2", - "atomix": "mvn:io.atomix:atomix:3.1.0-beta3", - "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.1.0-beta3", - "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.1.0-beta3", - "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.1.0-beta3", - "atomix-raft": "mvn:io.atomix:atomix-raft:3.1.0-beta3", - "atomix-storage": "mvn:io.atomix:atomix-storage:3.1.0-beta3", - "atomix-utils": "mvn:io.atomix:atomix-utils:3.1.0-beta3", + "atomix": "mvn:io.atomix:atomix:3.1.0-rc1", + "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.1.0-rc1", + "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.1.0-rc1", + "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.1.0-rc1", + "atomix-raft": "mvn:io.atomix:atomix-raft:3.1.0-rc1", + "atomix-storage": "mvn:io.atomix:atomix-storage:3.1.0-rc1", + "atomix-utils": "mvn:io.atomix:atomix-utils:3.1.0-rc1", "classgraph": "mvn:io.github.classgraph:classgraph:4.2.3", "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 69c8326b3e..4b8d632a21 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, 14 Dec 2018 00:07:54 GMT. Do not edit this file manually. ***** +# ***** This file was auto-generated at Tue, 18 Dec 2018 02:18:38 GMT. Do not edit this file manually. ***** # ***** Use onos-lib-gen ***** load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION") @@ -162,45 +162,45 @@ def generated_maven_jars(): if "atomix" not in native.existing_rules(): java_import_external( name = "atomix", - jar_sha256 = "31a8e0be0942cb08f06c0aea638b2d8a43a7744241cbebacaa8fe189e1ef38e8", + jar_sha256 = "55d0c603d6b54dd752eb71ea4b6ec965e4b140a1781f7f2b3ec2c5d8260dec4e", licenses = ["notice"], - jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix/3.1.0-beta3/atomix-3.1.0-beta3.jar"], ) + jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix/3.1.0-rc1/atomix-3.1.0-rc1.jar"], ) if "atomix_cluster" not in native.existing_rules(): java_import_external( name = "atomix_cluster", - jar_sha256 = "8a14dc47b56b05fa034a0b49597b7e45bc794aa264cae19e67d5c25e8029ff6c", + jar_sha256 = "7ac529817acaa501fbb6c0b1824c9fcb990dd451102d739fa3376473051398f6", licenses = ["notice"], - jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-cluster/3.1.0-beta3/atomix-cluster-3.1.0-beta3.jar"], ) + jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-cluster/3.1.0-rc1/atomix-cluster-3.1.0-rc1.jar"], ) if "atomix_primary_backup" not in native.existing_rules(): java_import_external( name = "atomix_primary_backup", - jar_sha256 = "7e442d45b65e896c910273b09403d2f61da1a23f825f2a85bec8e2591f9850af", + jar_sha256 = "565894fe588c5f971d3e835bc03b2226b8ebb77b7993472d92be922a33810116", licenses = ["notice"], - jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primary-backup/3.1.0-beta3/atomix-primary-backup-3.1.0-beta3.jar"], ) + jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primary-backup/3.1.0-rc1/atomix-primary-backup-3.1.0-rc1.jar"], ) if "atomix_primitive" not in native.existing_rules(): java_import_external( name = "atomix_primitive", - jar_sha256 = "b1a333aae7c6e86a00f01a64f5dd2fc14df05813143c91ed4cefe13447c7d12e", + jar_sha256 = "bd37f8e11920c8e211806df1319104eb5f133cd2cabebebd90107bc1b5d76847", licenses = ["notice"], - jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primitive/3.1.0-beta3/atomix-primitive-3.1.0-beta3.jar"], ) + jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primitive/3.1.0-rc1/atomix-primitive-3.1.0-rc1.jar"], ) if "atomix_raft" not in native.existing_rules(): java_import_external( name = "atomix_raft", - jar_sha256 = "c9d071b2547fc22771d0837e68eb8b843d0e0088f4c54697105f2616c22ba109", + jar_sha256 = "8e39a0bf92a574af30b1b73271157af199e83f65ed86d3a2a73f52e049531d72", licenses = ["notice"], - jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-raft/3.1.0-beta3/atomix-raft-3.1.0-beta3.jar"], ) + jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-raft/3.1.0-rc1/atomix-raft-3.1.0-rc1.jar"], ) if "atomix_storage" not in native.existing_rules(): java_import_external( name = "atomix_storage", - jar_sha256 = "9e48f2b8d305f55cad8d3d105bd7d68aa6c040abf1aefd4b5560704e11aa8bf1", + jar_sha256 = "c11e91835db3267b5f779e9e52165856c67024b973abfc04f5dd504de112f9a6", licenses = ["notice"], - jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-storage/3.1.0-beta3/atomix-storage-3.1.0-beta3.jar"], ) + jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-storage/3.1.0-rc1/atomix-storage-3.1.0-rc1.jar"], ) if "atomix_utils" not in native.existing_rules(): java_import_external( name = "atomix_utils", - jar_sha256 = "b761bcae99c0a0e6970b4192589a6d57b8da42d5a8f4443e6f1b810c3f464684", + jar_sha256 = "1b5b670b5a1519e4bc3624fc50dff6dff905ad25847824e5a90e1ab58995d5b3", licenses = ["notice"], - jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-utils/3.1.0-beta3/atomix-utils-3.1.0-beta3.jar"], ) + jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-utils/3.1.0-rc1/atomix-utils-3.1.0-rc1.jar"], ) if "classgraph" not in native.existing_rules(): java_import_external( name = "classgraph", @@ -1423,13 +1423,13 @@ artifact_map = {} artifact_map["@aopalliance_repackaged//:aopalliance_repackaged"] = "mvn:org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42" artifact_map["@amqp_client//:amqp_client"] = "mvn:com.rabbitmq:amqp-client:jar:3.6.1" artifact_map["@asm//:asm"] = "mvn:org.ow2.asm:asm:jar:5.2" -artifact_map["@atomix//:atomix"] = "mvn:io.atomix:atomix:jar:3.1.0-beta3" -artifact_map["@atomix_cluster//:atomix_cluster"] = "mvn:io.atomix:atomix-cluster:jar:3.1.0-beta3" -artifact_map["@atomix_primary_backup//:atomix_primary_backup"] = "mvn:io.atomix:atomix-primary-backup:jar:3.1.0-beta3" -artifact_map["@atomix_primitive//:atomix_primitive"] = "mvn:io.atomix:atomix-primitive:jar:3.1.0-beta3" -artifact_map["@atomix_raft//:atomix_raft"] = "mvn:io.atomix:atomix-raft:jar:3.1.0-beta3" -artifact_map["@atomix_storage//:atomix_storage"] = "mvn:io.atomix:atomix-storage:jar:3.1.0-beta3" -artifact_map["@atomix_utils//:atomix_utils"] = "mvn:io.atomix:atomix-utils:jar:3.1.0-beta3" +artifact_map["@atomix//:atomix"] = "mvn:io.atomix:atomix:jar:3.1.0-rc1" +artifact_map["@atomix_cluster//:atomix_cluster"] = "mvn:io.atomix:atomix-cluster:jar:3.1.0-rc1" +artifact_map["@atomix_primary_backup//:atomix_primary_backup"] = "mvn:io.atomix:atomix-primary-backup:jar:3.1.0-rc1" +artifact_map["@atomix_primitive//:atomix_primitive"] = "mvn:io.atomix:atomix-primitive:jar:3.1.0-rc1" +artifact_map["@atomix_raft//:atomix_raft"] = "mvn:io.atomix:atomix-raft:jar:3.1.0-rc1" +artifact_map["@atomix_storage//:atomix_storage"] = "mvn:io.atomix:atomix-storage:jar:3.1.0-rc1" +artifact_map["@atomix_utils//:atomix_utils"] = "mvn:io.atomix:atomix-utils:jar:3.1.0-rc1" artifact_map["@classgraph//:classgraph"] = "mvn:io.github.classgraph:classgraph:jar:4.2.3" artifact_map["@commons_codec//:commons_codec"] = "mvn:commons-codec:commons-codec:jar:1.10" artifact_map["@commons_cli//:commons_cli"] = "mvn:commons-cli:commons-cli:jar:1.3" diff --git a/tools/test/bin/atomix-push-bits b/tools/test/bin/atomix-push-bits index b5159a9a4a..a1ebce2747 100755 --- a/tools/test/bin/atomix-push-bits +++ b/tools/test/bin/atomix-push-bits @@ -26,7 +26,7 @@ set -e . $ONOS_ROOT/tools/build/envDefaults -ATOMIX_VERSION=${ATOMIX_VERSION:-3.1.0-beta3} +ATOMIX_VERSION=${ATOMIX_VERSION:-3.1.0-rc1} ATOMIX_MAVEN=~/.m2/repository/io/atomix/atomix-dist/$ATOMIX_VERSION/atomix-dist-$ATOMIX_VERSION.tar.gz ATOMIX_LOCAL=/tmp/atomix-$ATOMIX_VERSION.tar.gz ATOMIX_REMOTE=https://oss.sonatype.org/content/repositories/releases/io/atomix/atomix-dist/$ATOMIX_VERSION/atomix-dist-$ATOMIX_VERSION.tar.gz