Merge branch 'master' into dev-karaf-4.2.1
Change-Id: Iec1b8947c898b0bf10db8caece0c3a064d1c63ae
diff --git a/lib/BUCK b/lib/BUCK
index d799e21..7c56626 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,5 +1,6 @@
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
# ***** This file was auto-generated at Tue, 18 Sep 2018 20:31:36 GMT. Do not edit this file manually. *****
=======
# ***** This file was auto-generated at Thu, 27 Sep 2018 15:25:26 GMT. Do not edit this file manually. *****
@@ -7,6 +8,9 @@
=======
# ***** This file was auto-generated at Fri, 5 Oct 2018 20:40:12 GMT. Do not edit this file manually. *****
>>>>>>> master
+=======
+# ***** This file was auto-generated at Fri, 12 Oct 2018 17:49:41 GMT. Do not edit this file manually. *****
+>>>>>>> f4f54a1be000d2aaae7299ed6d26468c7e0e0763
# ***** Use onos-lib-gen *****
pass_thru_pom(
@@ -250,73 +254,73 @@
remote_jar (
name = 'atomix',
- out = 'atomix-3.0.6.jar',
- url = 'mvn:io.atomix:atomix:jar:3.0.6',
- sha1 = 'a8c1401b9f5d3757c8cfa2b7905d928825507cf8',
- maven_coords = 'io.atomix:atomix:3.0.6',
+ out = 'atomix-3.0.7.jar',
+ url = 'mvn:io.atomix:atomix:jar:3.0.7',
+ sha1 = 'd2c0cdbdc4e7c242d1fe476892fdbc31a1468d43',
+ maven_coords = 'io.atomix:atomix:3.0.7',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-cluster',
- out = 'atomix-cluster-3.0.6.jar',
- url = 'mvn:io.atomix:atomix-cluster:jar:3.0.6',
- sha1 = '8d91e0caf5c2739476826b32bdcf21afc32bf433',
- maven_coords = 'io.atomix:atomix-cluster:3.0.6',
+ out = 'atomix-cluster-3.0.7.jar',
+ url = 'mvn:io.atomix:atomix-cluster:jar:3.0.7',
+ sha1 = '1bf4ca3d10f8be0c87588b531a200d982ef6f1a3',
+ maven_coords = 'io.atomix:atomix-cluster:3.0.7',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-gossip',
- out = 'atomix-gossip-3.0.6.jar',
- url = 'mvn:io.atomix:atomix-gossip:jar:3.0.6',
- sha1 = '5db475ea2702fabfb8eb19079bc07979bc706c17',
- maven_coords = 'io.atomix:atomix-gossip:3.0.6',
+ out = 'atomix-gossip-3.0.7.jar',
+ url = 'mvn:io.atomix:atomix-gossip:jar:3.0.7',
+ sha1 = 'c702172c4d77cea0fb95ad953ee36c2bae73db34',
+ maven_coords = 'io.atomix:atomix-gossip:3.0.7',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-primary-backup',
- out = 'atomix-primary-backup-3.0.6.jar',
- url = 'mvn:io.atomix:atomix-primary-backup:jar:3.0.6',
- sha1 = 'af3a4475a54a83fe8eafd58925c04db608eec150',
- maven_coords = 'io.atomix:atomix-primary-backup:3.0.6',
+ out = 'atomix-primary-backup-3.0.7.jar',
+ url = 'mvn:io.atomix:atomix-primary-backup:jar:3.0.7',
+ sha1 = 'b5269c7bc1172966928ec14af098f02c65c78c97',
+ maven_coords = 'io.atomix:atomix-primary-backup:3.0.7',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-primitive',
- out = 'atomix-primitive-3.0.6.jar',
- url = 'mvn:io.atomix:atomix-primitive:jar:3.0.6',
- sha1 = 'bb65acf0dd5e805ffc27f0f768e2fe5310d83a71',
- maven_coords = 'io.atomix:atomix-primitive:3.0.6',
+ out = 'atomix-primitive-3.0.7.jar',
+ url = 'mvn:io.atomix:atomix-primitive:jar:3.0.7',
+ sha1 = '41c55b48913ceffecaa846395e19dbe2e959d145',
+ maven_coords = 'io.atomix:atomix-primitive:3.0.7',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-raft',
- out = 'atomix-raft-3.0.6.jar',
- url = 'mvn:io.atomix:atomix-raft:jar:3.0.6',
- sha1 = 'f3497269b021f8794ba26296f6779977fd213f0e',
- maven_coords = 'io.atomix:atomix-raft:3.0.6',
+ out = 'atomix-raft-3.0.7.jar',
+ url = 'mvn:io.atomix:atomix-raft:jar:3.0.7',
+ sha1 = '9b294e0568df35d1a58971b2748426da7d13e849',
+ maven_coords = 'io.atomix:atomix-raft:3.0.7',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-storage',
- out = 'atomix-storage-3.0.6.jar',
- url = 'mvn:io.atomix:atomix-storage:jar:3.0.6',
- sha1 = '0cebbfd8932c7ed27d173d9f3487687317905f5d',
- maven_coords = 'io.atomix:atomix-storage:3.0.6',
+ out = 'atomix-storage-3.0.7.jar',
+ url = 'mvn:io.atomix:atomix-storage:jar:3.0.7',
+ sha1 = '451575082ad5bd0257372bd34c29ac0bf1120133',
+ maven_coords = 'io.atomix:atomix-storage:3.0.7',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-utils',
- out = 'atomix-utils-3.0.6.jar',
- url = 'mvn:io.atomix:atomix-utils:jar:3.0.6',
- sha1 = 'd99e63b9df25b59baea5c2fedbd6ad9dab6de59f',
- maven_coords = 'io.atomix:atomix-utils:3.0.6',
+ out = 'atomix-utils-3.0.7.jar',
+ url = 'mvn:io.atomix:atomix-utils:jar:3.0.7',
+ sha1 = '647aee1cab71c3b816c8a205d0d55bdae9047434',
+ maven_coords = 'io.atomix:atomix-utils:3.0.7',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index 8a70512..f08a6cf 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -146,14 +146,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.2",
- "atomix": "mvn:io.atomix:atomix:3.0.5",
- "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.0.5",
- "atomix-gossip": "mvn:io.atomix:atomix-gossip:3.0.5",
- "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.0.5",
- "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.0.5",
- "atomix-raft": "mvn:io.atomix:atomix-raft:3.0.5",
- "atomix-storage": "mvn:io.atomix:atomix-storage:3.0.5",
- "atomix-utils": "mvn:io.atomix:atomix-utils:3.0.5",
+ "atomix": "mvn:io.atomix:atomix:3.0.7",
+ "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.0.7",
+ "atomix-gossip": "mvn:io.atomix:atomix-gossip:3.0.7",
+ "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.0.7",
+ "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.0.7",
+ "atomix-raft": "mvn:io.atomix:atomix-raft:3.0.7",
+ "atomix-storage": "mvn:io.atomix:atomix-storage:3.0.7",
+ "atomix-utils": "mvn:io.atomix:atomix-utils:3.0.7",
"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",