Merge branch 'master' into dev-karaf-4.2.1
Change-Id: I86b9d80581cd76a7c20e05201023090f9692d1ab
diff --git a/lib/BUCK b/lib/BUCK
index 55a2608..d799e21 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,8 +1,12 @@
<<<<<<< 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. *****
>>>>>>> origin/master
+=======
+# ***** This file was auto-generated at Fri, 5 Oct 2018 20:40:12 GMT. Do not edit this file manually. *****
+>>>>>>> master
# ***** Use onos-lib-gen *****
pass_thru_pom(
@@ -246,82 +250,82 @@
remote_jar (
name = 'atomix',
- out = 'atomix-3.0.5.jar',
- url = 'mvn:io.atomix:atomix:jar:3.0.5',
- sha1 = '758df25aed743d625930654d2e589cc0084efdbc',
- maven_coords = 'io.atomix:atomix:3.0.5',
+ 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',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-cluster',
- out = 'atomix-cluster-3.0.5.jar',
- url = 'mvn:io.atomix:atomix-cluster:jar:3.0.5',
- sha1 = '3ac50436eaf47fa5ba7553b37628aea7fa8b8deb',
- maven_coords = 'io.atomix:atomix-cluster:3.0.5',
+ 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',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-gossip',
- out = 'atomix-gossip-3.0.5.jar',
- url = 'mvn:io.atomix:atomix-gossip:jar:3.0.5',
- sha1 = '63c365b00b0164aa067e55febca9a4df253e8ab2',
- maven_coords = 'io.atomix:atomix-gossip:3.0.5',
+ 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',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-primary-backup',
- out = 'atomix-primary-backup-3.0.5.jar',
- url = 'mvn:io.atomix:atomix-primary-backup:jar:3.0.5',
- sha1 = 'f444f8f733457182a096786dd2b6a4369d1feebc',
- maven_coords = 'io.atomix:atomix-primary-backup:3.0.5',
+ 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',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-primitive',
- out = 'atomix-primitive-3.0.5.jar',
- url = 'mvn:io.atomix:atomix-primitive:jar:3.0.5',
- sha1 = 'e383b171c202df84af7e8510034714bc52831115',
- maven_coords = 'io.atomix:atomix-primitive:3.0.5',
+ 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',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-raft',
- out = 'atomix-raft-3.0.5.jar',
- url = 'mvn:io.atomix:atomix-raft:jar:3.0.5',
- sha1 = '0e7345cd475adb6e1f5af8ec48fd6faeb1261f84',
- maven_coords = 'io.atomix:atomix-raft:3.0.5',
+ 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',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-storage',
- out = 'atomix-storage-3.0.5.jar',
- url = 'mvn:io.atomix:atomix-storage:jar:3.0.5',
- sha1 = '2967037f437ce85c191795baeb65535d76b027fe',
- maven_coords = 'io.atomix:atomix-storage:3.0.5',
+ 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',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'atomix-utils',
- out = 'atomix-utils-3.0.5.jar',
- url = 'mvn:io.atomix:atomix-utils:jar:3.0.5',
- sha1 = '63afb65deccb9631b8017d6aa779b337f920cef0',
- maven_coords = 'io.atomix:atomix-utils:3.0.5',
+ 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',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'classgraph',
- out = 'classgraph-4.0.6.jar',
- url = 'mvn:io.github.classgraph:classgraph:jar:4.0.6',
- sha1 = '7fe1e7464ffd40c7333b8bbf53c4d73a7cbd7b4c',
- maven_coords = 'io.github.classgraph:classgraph:4.0.6',
+ out = 'classgraph-4.2.3.jar',
+ url = 'mvn:io.github.classgraph:classgraph:jar:4.2.3',
+ sha1 = '5c9bfb002097a6cf6c7134821954e24326db3a7b',
+ maven_coords = 'io.github.classgraph:classgraph:4.2.3',
visibility = [ 'PUBLIC' ],
)
@@ -1477,10 +1481,10 @@
remote_jar (
name = 'libthrift',
- out = 'libthrift-0.9.3.jar',
- url = 'mvn:org.apache.thrift:libthrift:jar:0.9.3',
- sha1 = '8625e8f9b6f49b881fa5fd143172c2833df1ce47',
- maven_coords = 'org.apache.thrift:libthrift:0.9.3',
+ out = 'libthrift-0.11.0.jar',
+ url = 'mvn:org.apache.thrift:libthrift:jar:0.11.0',
+ sha1 = '4f4f1c1fbbae63258625dea71007fa41bee7edb3',
+ maven_coords = 'org.apache.thrift:libthrift:0.11.0',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index ad15f29..b06dbeb 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -148,7 +148,7 @@
"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",
- "classgraph": "mvn:io.github.classgraph:classgraph:4.0.6",
+ "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",
"commons-collections": "mvn:commons-collections:commons-collections:3.2.2",
@@ -285,7 +285,7 @@
"apache-karaf": "http://repo1.maven.org/maven2/org/onosproject/apache-karaf-offline/4.2.1-base/apache-karaf-offline-4.2.1-base.tar.gz",
"bndlib": "mvn:biz.aQute.bnd:biz.aQute.bndlib:jar:4.0.0",
"bndexe": "mvn:biz.aQute.bnd:biz.aQute.bnd:4.0.0",
- "libthrift": "mvn:org.apache.thrift:libthrift:0.9.3",
+ "libthrift": "mvn:org.apache.thrift:libthrift:0.11.0",
"qdox": "mvn:com.thoughtworks.qdox:qdox:2.0-M3",
"snmp-core": "mvn:org.onosproject:snmp-core:1.3-20161021.1",
"mibs-net-snmp": "mvn:org.onosproject:mibbler-mibs-net-snmp:1.0-20151221.1",