Merge with master.

This commit is contained in:
Dawid Weiss 2019-12-16 11:27:02 +01:00
parent bc539fc0fd
commit 67d3cf678d
60 changed files with 61 additions and 61 deletions

View File

@ -1 +0,0 @@
da335ee2e7d1439dcc7e11e89941edfad91e9e10

View File

@ -0,0 +1 @@
2f043b2b3b9d27c17f2a067521dfb69b41fea1b8

View File

@ -1 +0,0 @@
3b8c59c68d52a3d0de0d53f5b3588be3a5c05fb8

View File

@ -0,0 +1 @@
81ac98f3be6a902e39e3f48496c9790dd02d4950

View File

@ -1 +0,0 @@
3aaf2c8c9c781f10d4d9da6120c5195b2fcb2ad9

View File

@ -0,0 +1 @@
916f481032995159d062ffc44f566891872d8a07

View File

@ -1 +0,0 @@
95f58cd0cfa0c4553fc3901138cc6a03ece23b94

View File

@ -0,0 +1 @@
cde2b06c3134600309061a84759d1ef9087a7348

View File

@ -1 +0,0 @@
672891a1abbeef85192d137192e347872a6fc9c3

View File

@ -0,0 +1 @@
41365c22bc6046af6e1e10f1be0b4dbfe49902be

View File

@ -1 +0,0 @@
8c9283b8a04056a0fced23fc474e62aa39764c6b

View File

@ -0,0 +1 @@
4aa2da175202a62d62850ade7fb26a64fd451bc2

View File

@ -1 +0,0 @@
37eff0bd068adca090e14a0fbd9de258a871f9d9

View File

@ -0,0 +1 @@
d3e23487151f5393bdcef5449407c5ce29718cdc

View File

@ -1 +0,0 @@
7e7f62c2c03b74e59211eeeba0ddc067ad422ff7

View File

@ -0,0 +1 @@
7a999fbfb9905465c1494052b612b4a4bbb349b7

View File

@ -1 +0,0 @@
5dd67dacaf1eed80ab95493da840dab35c22ce9c

View File

@ -0,0 +1 @@
aaacd77f8073e98f8400d042e70538623b3924ed

View File

@ -1 +0,0 @@
4386c1f243042e0f78f2e4c3c6cd239967410d6e

View File

@ -0,0 +1 @@
09dd286abe644513305864453030e9c1631b5535

View File

@ -1 +0,0 @@
4acddfa41f45790e43fe4be257c3c4bcf6b846ff

View File

@ -0,0 +1 @@
69125cf74b07f1b9d60b5c94da47cb04c098f654

View File

@ -1 +0,0 @@
8b350466ff1fcb7030a7abc152eed458e086fac2

View File

@ -0,0 +1 @@
12d71fe6d671c635f1ae6fd3c31bc6578a293c4b

View File

@ -1 +0,0 @@
b59ff8ecb0cf5d6234958f2404eabf0b72464e14

View File

@ -0,0 +1 @@
d3f0b0fb016ef8d35ffb199d928ffbcbfa121c86

View File

@ -1 +0,0 @@
7eb9a6be62d84e1691e5fdc99223e632485619a8

View File

@ -0,0 +1 @@
dcb6d4d505ef74898e3a64a38c40195c01e97119

View File

@ -1 +0,0 @@
8dc81acdc4d3085c0b5f3c80b9a78cc9cb48bc4e

View File

@ -0,0 +1 @@
22be18a055850a6cf3b0efd56c789c3929c87e98

View File

@ -1 +0,0 @@
9b830886bd6098c613ed08d99574bbf300519506

View File

@ -0,0 +1 @@
7990b0f4e8cafe99b47148df9aa3276af336d4d5

View File

@ -1 +0,0 @@
bfe96e1e78719bdd446e063c3f45c132010237ce

View File

@ -0,0 +1 @@
9fa640d36c088cf55843900043d28aef830ade4d

View File

@ -1 +0,0 @@
55786f6e6649bd49425a7da1ac72cd85b8dd4bef

View File

@ -0,0 +1 @@
7885cc3d5d7701a444acada7ab97f89846514875

View File

@ -1 +0,0 @@
89e25610b3199fdf34a831c1b306f7e765928959

View File

@ -0,0 +1 @@
ca1803fde51b795c0a8346ca8bc6277d9d04d01d

View File

@ -1 +0,0 @@
b290c176abe2cd9274b9f794bf74497c4759359d

View File

@ -0,0 +1 @@
b7bb7913d7583ee8d877f1c20feeb0905f342ad5

View File

@ -1 +0,0 @@
6ab950be264e74803f12ba43ee5db434a74e6c0c

View File

@ -0,0 +1 @@
ddb54190e858875fb681a6b9dd630a3609eaa513

View File

@ -1 +0,0 @@
2fd3cd40279280e8c56241f753d2c52d8d446d19

View File

@ -0,0 +1 @@
3095acb088f4ff9e3fd9aedf98db73e3c18ea849

View File

@ -1 +0,0 @@
945fc0c0fa69504c194e32c5330afa1df0be9574

View File

@ -0,0 +1 @@
968d70676fa16b3d62487987624dd4e9ce5db123

View File

@ -1 +0,0 @@
d25e67fbe0809cae777065b75b10ecfb5c1bd749

View File

@ -0,0 +1 @@
a5da43f9b72d2208b8f4d22ba0a16d176b328b91

View File

@ -1 +0,0 @@
b81ef162970cdb9f4512ee2da09715a856ff4c4c

View File

@ -0,0 +1 @@
bba231bbf3024c19e75622ec168821cbbd4261a4

View File

@ -1 +0,0 @@
76e8758356373d5aed5abacbda429b38f6e8fa98

View File

@ -0,0 +1 @@
c98a2821eeb9193001c131a6d742a8f4e67e3b10

View File

@ -1 +0,0 @@
87f3b49a7377e56f62046875d394ed0028b37690

View File

@ -0,0 +1 @@
96b3aefcd0544de7e0e1f72990968b48c3d04dd1

View File

@ -1 +0,0 @@
d7be4ddd7ba674ee8be1d23d883fb3ca68ee1d54

View File

@ -0,0 +1 @@
73a242395eadde5bc4cd16a43230531dccb3d0eb

View File

@ -1 +0,0 @@
09f6f1e6c1db440d9ad4c3114f17be40f66bb399

View File

@ -0,0 +1 @@
01c23f7c463f8f4e83209d83b0549cea5d51ec1c

View File

@ -53,11 +53,11 @@ commons-fileupload:commons-fileupload:1.3.3 (1 constraints: 0905fc35)
commons-io:commons-io:2.5 (2 constraints: be142680)
commons-logging:commons-logging:1.1.3 (2 constraints: c8149e7f)
de.l3s.boilerpipe:boilerpipe:1.1.0 (1 constraints: 0405f335)
io.dropwizard.metrics:metrics-core:4.0.5 (5 constraints: 204326bf)
io.dropwizard.metrics:metrics-graphite:4.0.5 (1 constraints: 0b050436)
io.dropwizard.metrics:metrics-jetty9:4.0.5 (1 constraints: 0b050436)
io.dropwizard.metrics:metrics-jmx:4.0.5 (1 constraints: 0b050436)
io.dropwizard.metrics:metrics-jvm:4.0.5 (1 constraints: 0b050436)
io.dropwizard.metrics:metrics-core:4.1.2 (5 constraints: 1643c8bb)
io.dropwizard.metrics:metrics-graphite:4.1.2 (1 constraints: 09050436)
io.dropwizard.metrics:metrics-jetty9:4.1.2 (1 constraints: 09050436)
io.dropwizard.metrics:metrics-jmx:4.1.2 (1 constraints: 09050436)
io.dropwizard.metrics:metrics-jvm:4.1.2 (1 constraints: 09050436)
io.jaegertracing:jaeger-core:0.35.5 (1 constraints: 970d1034)
io.jaegertracing:jaeger-thrift:0.35.5 (1 constraints: 3f053f3b)
io.netty:netty-buffer:4.1.29.Final (4 constraints: 5b3421e8)
@ -161,29 +161,29 @@ org.codehaus.janino:janino:3.0.9 (1 constraints: 0e050336)
org.codehaus.mojo:animal-sniffer-annotations:1.14 (1 constraints: ea09d5aa)
org.codehaus.woodstox:stax2-api:3.1.4 (2 constraints: 241635f1)
org.codehaus.woodstox:woodstox-core-asl:4.4.1 (1 constraints: 0b050c36)
org.eclipse.jetty:jetty-alpn-client:9.4.19.v20190610 (3 constraints: d12c8400)
org.eclipse.jetty:jetty-alpn-java-client:9.4.19.v20190610 (1 constraints: 8007517d)
org.eclipse.jetty:jetty-alpn-java-server:9.4.19.v20190610 (1 constraints: 8007517d)
org.eclipse.jetty:jetty-alpn-server:9.4.19.v20190610 (2 constraints: 231beedd)
org.eclipse.jetty:jetty-client:9.4.19.v20190610 (1 constraints: ce1741ae)
org.eclipse.jetty:jetty-continuation:9.4.19.v20190610 (2 constraints: 5d186efb)
org.eclipse.jetty:jetty-deploy:9.4.19.v20190610 (1 constraints: 8007517d)
org.eclipse.jetty:jetty-http:9.4.19.v20190610 (5 constraints: 8b497e4f)
org.eclipse.jetty:jetty-io:9.4.19.v20190610 (8 constraints: 0f7eb132)
org.eclipse.jetty:jetty-jmx:9.4.19.v20190610 (1 constraints: 8007517d)
org.eclipse.jetty:jetty-rewrite:9.4.19.v20190610 (1 constraints: 8007517d)
org.eclipse.jetty:jetty-security:9.4.19.v20190610 (2 constraints: ea172ade)
org.eclipse.jetty:jetty-server:9.4.19.v20190610 (6 constraints: bd5e38f5)
org.eclipse.jetty:jetty-servlet:9.4.19.v20190610 (2 constraints: 641789bf)
org.eclipse.jetty:jetty-servlets:9.4.19.v20190610 (1 constraints: 8007517d)
org.eclipse.jetty:jetty-util:9.4.19.v20190610 (7 constraints: 77648009)
org.eclipse.jetty:jetty-webapp:9.4.19.v20190610 (2 constraints: 72178fc0)
org.eclipse.jetty:jetty-xml:9.4.19.v20190610 (3 constraints: 56274720)
org.eclipse.jetty.http2:http2-client:9.4.19.v20190610 (2 constraints: 4d1ff83f)
org.eclipse.jetty.http2:http2-common:9.4.19.v20190610 (3 constraints: 242bc31f)
org.eclipse.jetty.http2:http2-hpack:9.4.19.v20190610 (2 constraints: 50198f5c)
org.eclipse.jetty.http2:http2-http-client-transport:9.4.19.v20190610 (1 constraints: 8007517d)
org.eclipse.jetty.http2:http2-server:9.4.19.v20190610 (1 constraints: 8007517d)
org.eclipse.jetty:jetty-alpn-client:9.4.24.v20191120 (3 constraints: bc2c25fb)
org.eclipse.jetty:jetty-alpn-java-client:9.4.24.v20191120 (1 constraints: 79071d7d)
org.eclipse.jetty:jetty-alpn-java-server:9.4.24.v20191120 (1 constraints: 79071d7d)
org.eclipse.jetty:jetty-alpn-server:9.4.24.v20191120 (2 constraints: 151be2db)
org.eclipse.jetty:jetty-client:9.4.24.v20191120 (1 constraints: c7170dae)
org.eclipse.jetty:jetty-continuation:9.4.24.v20191120 (2 constraints: 4f189af9)
org.eclipse.jetty:jetty-deploy:9.4.24.v20191120 (1 constraints: 79071d7d)
org.eclipse.jetty:jetty-http:9.4.24.v20191120 (5 constraints: 68491840)
org.eclipse.jetty:jetty-io:9.4.24.v20191120 (8 constraints: d77d0909)
org.eclipse.jetty:jetty-jmx:9.4.24.v20191120 (1 constraints: 79071d7d)
org.eclipse.jetty:jetty-rewrite:9.4.24.v20191120 (1 constraints: 79071d7d)
org.eclipse.jetty:jetty-security:9.4.24.v20191120 (2 constraints: dc175ddc)
org.eclipse.jetty:jetty-server:9.4.24.v20191120 (6 constraints: 995e36e3)
org.eclipse.jetty:jetty-servlet:9.4.24.v20191120 (2 constraints: 5617c3bd)
org.eclipse.jetty:jetty-servlets:9.4.24.v20191120 (1 constraints: 79071d7d)
org.eclipse.jetty:jetty-util:9.4.24.v20191120 (7 constraints: 466433eb)
org.eclipse.jetty:jetty-webapp:9.4.24.v20191120 (2 constraints: 6417c9be)
org.eclipse.jetty:jetty-xml:9.4.24.v20191120 (3 constraints: 4127911b)
org.eclipse.jetty.http2:http2-client:9.4.24.v20191120 (2 constraints: 3f1f9f3d)
org.eclipse.jetty.http2:http2-common:9.4.24.v20191120 (3 constraints: 0f2b8f1a)
org.eclipse.jetty.http2:http2-hpack:9.4.24.v20191120 (2 constraints: 42199f5a)
org.eclipse.jetty.http2:http2-http-client-transport:9.4.24.v20191120 (1 constraints: 79071d7d)
org.eclipse.jetty.http2:http2-server:9.4.24.v20191120 (1 constraints: 79071d7d)
org.gagravarr:vorbis-java-core:0.8 (1 constraints: ac041f2c)
org.gagravarr:vorbis-java-tika:0.8 (1 constraints: ac041f2c)
org.hamcrest:hamcrest-core:1.3 (2 constraints: 730ad9bf)
@ -202,7 +202,7 @@ org.restlet.jee:org.restlet:2.3.0 (2 constraints: e3159ee6)
org.restlet.jee:org.restlet.ext.servlet:2.3.0 (1 constraints: 0705fe35)
org.rrd4j:rrd4j:3.5 (1 constraints: ac04252c)
org.slf4j:jcl-over-slf4j:1.7.24 (1 constraints: 4005473b)
org.slf4j:slf4j-api:1.7.24 (18 constraints: 66f4afd8)
org.slf4j:slf4j-api:1.7.24 (18 constraints: 6ef487eb)
org.slf4j:slf4j-simple:1.7.24 (1 constraints: 4005473b)
org.tallison:jmatio:1.5 (1 constraints: aa041f2c)
org.tukaani:xz:1.8 (1 constraints: ad04222c)

View File

@ -34,7 +34,7 @@ commons-io:commons-io=2.5
commons-logging:commons-logging=1.1.3
de.l3s.boilerpipe:boilerpipe=1.1.0
info.ganglia.gmetric4j:gmetric4j=1.0.7
io.dropwizard.metrics:*=4.0.5
io.dropwizard.metrics:*=4.1.2
io.netty:*=4.1.29.Final
io.opentracing:*=0.33.0
io.prometheus:*=0.2.0
@ -88,8 +88,8 @@ org.ccil.cowan.tagsoup:tagsoup=1.2.1
org.codehaus.janino:*=3.0.9
org.codehaus.woodstox:stax2-api=3.1.4
org.codehaus.woodstox:woodstox-core-asl=4.4.1
org.eclipse.jetty.http2:*=9.4.19.v20190610
org.eclipse.jetty:*=9.4.19.v20190610
org.eclipse.jetty.http2:*=9.4.24.v20191120
org.eclipse.jetty:*=9.4.24.v20191120
org.gagravarr:*=0.8
org.hamcrest:*=1.3
org.hsqldb:hsqldb=2.4.0