You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/06/05 02:12:41 UTC

[lucene-solr] 03/04: SOLR-13452: More work on transitive deps, mostly on solr-core.

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 7260f766ec9e8ab3e4f1a5e56f8c46c83b800ca3
Author: markrmiller <ma...@apache.org>
AuthorDate: Tue Jun 4 12:10:09 2019 -0500

    SOLR-13452: More work on transitive deps, mostly on solr-core.
---
 build.gradle                                       |  9 +++-
 .../org/apache/lucene/gradle/ListDeps.groovy       | 18 +++++--
 lucene/analysis/opennlp/build.gradle               |  2 +-
 lucene/memory/build.gradle                         |  1 +
 lucene/test-framework/build.gradle                 | 10 ++--
 solr/core/build.gradle                             | 24 +++++----
 .../solr/handler/tagger/XmlOffsetCorrector.java    | 12 ++---
 solr/solrj/build.gradle                            |  4 +-
 versions.lock                                      | 58 +++++++++++-----------
 9 files changed, 83 insertions(+), 55 deletions(-)

diff --git a/build.gradle b/build.gradle
index 63fe65e..42f434f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,7 @@ def luceneSolrSubProjects = subprojects.findAll { project -> project.name != 'bu
 
 def rootProjectDir = project.rootProject.projectDir;
 
+// make sure ant task logging shows up by default
 ant.lifecycleLogLevel = "INFO"
 
 // TOC
@@ -167,7 +168,13 @@ configure(allprojects) {
 
 configure(allprojects) {
 
-  dependencies {
+    dependencies {
+      configurations.all {
+        // these classes are in Java 11
+        exclude group: 'javax.xml.stream', module: 'stax-api'
+        exclude group: 'stax', module: 'stax-api'
+    }
+    
     modules {
       module("commons-logging:commons-logging") { replacedBy("org.slf4j:jcl-over-slf4j") }
     }
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy
index c353656..b330eac 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy
@@ -29,10 +29,22 @@ class ListDeps extends DefaultTask {
   
   @TaskAction
   void list() {
-    def artifacts = project.configurations.runtimeClasspath.getResolvedConfiguration().getResolvedArtifacts()
-    println 'count: ' + artifacts.size()
+    println "Runtime Deps"
+    def runtimeArtifacts = project.configurations.runtimeClasspath.getResolvedConfiguration().getResolvedArtifacts()
+    runtimeArtifacts = runtimeArtifacts.toSorted{a,b -> a.name <=> b.name}
+    runtimeArtifacts.forEach( { ra -> println ra })
     
-    artifacts.forEach( { ra -> println ra })
+    println "-"
+    
+    println "TestRuntime Deps"
+    def testRuntimeArtifacts = project.configurations.testRuntimeClasspath.getResolvedConfiguration().getResolvedArtifacts()
+ 
+    testRuntimeArtifacts = testRuntimeArtifacts.toSorted{a,b -> a.name <=> b.name}
+    testRuntimeArtifacts.forEach( { ra -> println ra })
+    
+    println "-"
+    println 'runtime count: ' + runtimeArtifacts.size()
+    println 'testRuntime count: ' + testRuntimeArtifacts.size()
   }
 }
 
diff --git a/lucene/analysis/opennlp/build.gradle b/lucene/analysis/opennlp/build.gradle
index 7f6c462..0cda201 100644
--- a/lucene/analysis/opennlp/build.gradle
+++ b/lucene/analysis/opennlp/build.gradle
@@ -156,7 +156,7 @@ task trainLemmatizerTrainerME(type: JavaExec) {
 
 task trainTestModels {
   group = 'Build'
-  description = "Traines all small test models for unit tests."
+  description = "Trains all small test models for unit tests."
 
   dependsOn trainSentenceDetector, trainTokenizerTrainer, trainPOSTaggerTrainer, trainChunkerTrainerME, trainTokenNameFinderTrainer, trainLemmatizerTrainerME
 }
diff --git a/lucene/memory/build.gradle b/lucene/memory/build.gradle
index d646dc2..3f601cd 100644
--- a/lucene/memory/build.gradle
+++ b/lucene/memory/build.gradle
@@ -20,6 +20,7 @@ apply plugin: 'java-library'
 dependencies {
   implementation project(':lucene:lucene-core')
   implementation project(':lucene:codecs')
+
   testImplementation project(':lucene:lucene-test-framework')
   testImplementation project(':lucene:queryparser')
 }
\ No newline at end of file
diff --git a/lucene/test-framework/build.gradle b/lucene/test-framework/build.gradle
index b90762d..d7c4efa 100644
--- a/lucene/test-framework/build.gradle
+++ b/lucene/test-framework/build.gradle
@@ -24,10 +24,10 @@ dependencies {
 	api project(':lucene:lucene-core')
 	implementation project(':lucene:codecs')
   
-	api ("junit:junit") { transitive = false }
-	api ("com.carrotsearch.randomizedtesting:randomizedtesting-runner") { transitive = false }
-	api ('org.hamcrest:hamcrest-all') { transitive = false }
-  
-  implementation ('commons-codec:commons-codec') { transitive = false }
+	api ("junit:junit")
+  api ('org.hamcrest:hamcrest-core')
+	api ("com.carrotsearch.randomizedtesting:randomizedtesting-runner")
+
+  implementation ('commons-codec:commons-codec')
   
 }
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 2a310f2..dadee3b 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -21,8 +21,6 @@ archivesBaseName = 'solr-core'
 
 dependencies {
   
-  implementation project(':solr:solrj')
-  
   implementation project(':lucene:lucene-core')
   implementation project(':lucene:codecs')
   implementation project(':lucene:analysis:analyzers-common')
@@ -40,6 +38,7 @@ dependencies {
   implementation project(':lucene:queryparser')
   implementation project(':lucene:misc')
   implementation project(':lucene:join')
+  implementation project(':solr:solrj')
   
   compileOnly ('javax.servlet:javax.servlet-api')
   
@@ -55,6 +54,7 @@ dependencies {
   implementation ('org.apache.httpcomponents:httpmime')
   implementation ('org.apache.httpcomponents:httpcore')
   implementation ('org.codehaus.woodstox:stax2-api')
+  implementation ('org.codehaus.woodstox:woodstox-core-asl')
   implementation ('org.ow2.asm:asm')
   implementation ('org.ow2.asm:asm-commons')
   implementation ('io.dropwizard.metrics:metrics-core') {
@@ -108,7 +108,7 @@ dependencies {
   implementation ('commons-collections:commons-collections')
   implementation ('commons-beanutils:commons-beanutils')
   implementation ('com.github.ben-manes.caffeine:caffeine')
-  implementation  ('com.google.re2j:re2j')
+  implementation ('com.google.re2j:re2j')
   implementation ('org.apache.commons:commons-lang3')
   implementation ('org.apache.htrace:htrace-core4')
   implementation ('org.apache.curator:curator-framework') {
@@ -140,7 +140,7 @@ dependencies {
   implementation ('org.codehaus.janino:janino')
   implementation ('org.codehaus.janino:commons-compiler')
   implementation ('com.google.protobuf:protobuf-java') 
-  implementation ('com.jayway.jsonpath:json-path') { transitive = false }
+  implementation ('com.jayway.jsonpath:json-path')
   implementation ('org.rrd4j:rrd4j')
   implementation ('org.bitbucket.b_c:jose4j')
   
@@ -163,16 +163,23 @@ dependencies {
   
   testRuntimeOnly ('com.lmax:disruptor')
   
+  testImplementation ('org.mockito:mockito-core') { transitive = false }
+  testImplementation ('net.bytebuddy:byte-buddy') { transitive = false }
+  testImplementation ('org.objenesis:objenesis') { transitive = false }
+  testImplementation ('commons-logging:commons-logging') { transitive = false }
+  testImplementation ('io.netty:netty-all') { transitive = false }
+  testImplementation ('org.apache.commons:commons-text')
   testImplementation ('org.eclipse.jetty:jetty-webapp') { transitive = false }
   testImplementation ('com.sun.jersey:jersey-servlet:1.19.4') { transitive = false }
+  
+  // hdfs
   testImplementation ('org.apache.hadoop:hadoop-minicluster') { transitive = false }
   testImplementation ('org.apache.hadoop:hadoop-common::tests') { transitive = false }
   testImplementation ('org.apache.hadoop:hadoop-hdfs') { transitive = false }
   testImplementation ('org.apache.hadoop:hadoop-hdfs::tests') { transitive = false }
-  testImplementation ('commons-logging:commons-logging') { transitive = false }
-  testImplementation ('io.netty:netty-all') { transitive = false }
-  testImplementation ('org.apache.commons:commons-text') { transitive = false }
   testImplementation ('org.apache.hadoop:hadoop-minikdc') { transitive = false }
+  
+  // kerby
   testImplementation ('org.apache.kerby:kerby-config') { transitive = false }
   testImplementation ('org.apache.kerby:kerb-client') { transitive = false }
   testImplementation ('org.apache.kerby:kerb-common') { transitive = false }
@@ -183,9 +190,6 @@ dependencies {
   testImplementation ('org.apache.kerby:kerby-util') { transitive = false }
   testImplementation ('org.apache.kerby:kerb-admin') { transitive = false }
   testImplementation ('org.apache.kerby:kerby-kdc') { transitive = false }
-  testImplementation ('org.mockito:mockito-core') { transitive = false }
-  testImplementation ('net.bytebuddy:byte-buddy') { transitive = false }
-  testImplementation ('org.objenesis:objenesis') { transitive = false }
   
   testImplementation project(path: ':lucene:backward-codecs', configuration: 'testOutput')
   testImplementation project(path: ':lucene:queryparser', configuration: 'testOutput')
diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java b/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java
index 576328f..d17c417 100644
--- a/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java
+++ b/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java
@@ -22,13 +22,14 @@
 
 package org.apache.solr.handler.tagger;
 
+import java.io.InputStream;
+import java.io.StringReader;
+
+import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLResolver;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.XMLEvent;
-import java.io.InputStream;
-import java.io.StringReader;
 
-import com.ctc.wstx.stax.WstxInputFactory;
 import org.apache.commons.io.input.ClosedInputStream;
 import org.codehaus.stax2.LocationInfo;
 import org.codehaus.stax2.XMLInputFactory2;
@@ -47,10 +48,10 @@ public class XmlOffsetCorrector extends OffsetCorrector {
 
   //TODO use StAX without hard requirement on woodstox.   xmlStreamReader.getLocation().getCharacterOffset()
 
-  private static final XMLInputFactory2 XML_INPUT_FACTORY;
+  private static final XMLInputFactory XML_INPUT_FACTORY;
   static {
     // note: similar code in Solr's EmptyEntityResolver
-    XML_INPUT_FACTORY = new WstxInputFactory();
+    XML_INPUT_FACTORY = XMLInputFactory2.newFactory();
     XML_INPUT_FACTORY.setXMLResolver(new XMLResolver() {
       @Override
       public InputStream resolveEntity(String publicId, String systemId, String baseURI, String namespace) {
@@ -59,7 +60,6 @@ public class XmlOffsetCorrector extends OffsetCorrector {
     });
     // TODO disable DTD?
     // XML_INPUT_FACTORY.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE)
-    XML_INPUT_FACTORY.configureForSpeed();
   }
 
   /**
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index 16c8e9a..bcf0c92 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -56,7 +56,9 @@ dependencies {
   testImplementation ('org.eclipse.jetty:jetty-server')
   testImplementation ('org.eclipse.jetty:jetty-xml')
   testImplementation ('commons-collections:commons-collections')
-  testImplementation ('com.google.guava:guava')
+  testImplementation ('com.google.guava:guava') {
+    exclude group: '*', module: '*' // many annotation deps we don't need
+  }
   testImplementation ('org.apache.commons:commons-compress')
   testImplementation ('org.mockito:mockito-core')
   testImplementation ('net.bytebuddy:byte-buddy')
diff --git a/versions.lock b/versions.lock
index 8f9b652..f482593 100644
--- a/versions.lock
+++ b/versions.lock
@@ -7,8 +7,8 @@ com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.2 (1 constraints
 com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
 com.drewnoakes:metadata-extractor:2.11.0 (2 constraints: c011970f)
 com.epam:parso:2.0.9 (2 constraints: 6e11a9f2)
-com.fasterxml.jackson.core:jackson-annotations:2.9.8 (2 constraints: 7c1103f4)
-com.fasterxml.jackson.core:jackson-core:2.9.8 (3 constraints: de2340b3)
+com.fasterxml.jackson.core:jackson-annotations:2.9.8 (3 constraints: d62310b2)
+com.fasterxml.jackson.core:jackson-core:2.9.8 (4 constraints: ed3b2294)
 com.fasterxml.jackson.core:jackson-databind:2.9.8 (2 constraints: 7c1103f4)
 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.8 (1 constraints: 15051836)
 com.fasterxml.woodstox:woodstox-core:5.2.0 (1 constraints: 360a63bc)
@@ -45,11 +45,10 @@ com.tdunning:t-digest:3.1 (1 constraints: a804212c)
 commons-beanutils:commons-beanutils:1.9.3 (1 constraints: 0f050e36)
 commons-cli:commons-cli:1.2 (2 constraints: 161107d9)
 commons-codec:commons-codec:1.11 (4 constraints: 2d29e02a)
-commons-collections:commons-collections:3.2.2 (2 constraints: d911ad14)
+commons-collections:commons-collections:3.2.2 (3 constraints: 9121ccda)
 commons-fileupload:commons-fileupload:1.3.3 (1 constraints: 0905fc35)
-commons-io:commons-io:2.6 (3 constraints: 1b1dc919)
+commons-io:commons-io:2.6 (4 constraints: 2e2d61f3)
 commons-lang:commons-lang:2.6 (3 constraints: df29f552)
-commons-logging:commons-logging:1.2 (2 constraints: c8149e7f)
 de.l3s.boilerpipe:boilerpipe:1.1.0 (2 constraints: 5c1146f1)
 de.thetaphi:forbiddenapis:2.6 (1 constraints: ac04232c)
 edu.ucar:cdm:4.5.5 (3 constraints: 9d1abd7d)
@@ -58,7 +57,7 @@ edu.ucar:httpservices:4.5.5 (2 constraints: 8f122834)
 edu.ucar:netcdf4:4.5.5 (1 constraints: 650c0402)
 edu.ucar:udunits:4.5.5 (1 constraints: 2b06034e)
 edu.usc.ir:sentiment-analysis-parser:0.1 (1 constraints: fa0b50e9)
-io.dropwizard.metrics:metrics-core:4.0.5 (1 constraints: 0b050436)
+io.dropwizard.metrics:metrics-core:4.0.5 (4 constraints: 48333d26)
 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)
@@ -70,7 +69,7 @@ io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: 0305f035)
 javax.activation:activation:1.1.1 (2 constraints: 5e116df1)
 javax.annotation:javax.annotation-api:1.3 (1 constraints: f50e785e)
 javax.measure:unit-api:1.0 (5 constraints: 8e3e2cc5)
-javax.servlet:javax.servlet-api:3.1.0 (1 constraints: 0605fd35)
+javax.servlet:javax.servlet-api:3.1.0 (2 constraints: 88129b22)
 javax.ws.rs:javax.ws.rs-api:2.1 (1 constraints: f40e795e)
 javax.xml.bind:jaxb-api:2.3.0 (1 constraints: 5f0c0706)
 joda-time:joda-time:2.2 (2 constraints: 5d0d232c)
@@ -92,7 +91,7 @@ org.apache.commons:commons-compress:1.18 (4 constraints: 2128b5ae)
 org.apache.commons:commons-configuration2:2.1.1 (1 constraints: 0605f935)
 org.apache.commons:commons-csv:1.5 (1 constraints: ff0b57e9)
 org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
-org.apache.commons:commons-lang3:3.6 (1 constraints: ad04262c)
+org.apache.commons:commons-lang3:3.8.1 (3 constraints: 2824aaaf)
 org.apache.commons:commons-math3:3.6.1 (1 constraints: 0c050d36)
 org.apache.commons:commons-text:1.6 (1 constraints: ab04202c)
 org.apache.curator:curator-client:2.13.0 (1 constraints: 3805383b)
@@ -113,13 +112,16 @@ org.apache.httpcomponents:httpcore:4.4.10 (4 constraints: ce250e79)
 org.apache.httpcomponents:httpmime:4.5.6 (3 constraints: 8e1b90af)
 org.apache.james:apache-mime4j-core:0.8.2 (3 constraints: 9f1f5230)
 org.apache.james:apache-mime4j-dom:0.8.2 (2 constraints: 6c1192f2)
-org.apache.kerby:kerb-core:1.0.1 (1 constraints: 0405f135)
+org.apache.kerby:kerb-core:1.0.1 (3 constraints: f11c583a)
+org.apache.kerby:kerb-crypto:1.0.1 (1 constraints: 860b05e6)
 org.apache.kerby:kerb-util:1.0.1 (1 constraints: 0405f135)
-org.apache.kerby:kerby-asn1:1.0.1 (1 constraints: 0405f135)
-org.apache.kerby:kerby-pkix:1.0.1 (1 constraints: 0405f135)
+org.apache.kerby:kerby-asn1:1.0.1 (2 constraints: 001155df)
+org.apache.kerby:kerby-config:1.0.1 (1 constraints: 860b05e6)
+org.apache.kerby:kerby-pkix:1.0.1 (2 constraints: 741065ca)
+org.apache.kerby:kerby-util:1.0.1 (2 constraints: 6518bdb6)
 org.apache.logging.log4j:log4j-1.2-api:2.11.2 (1 constraints: 3805343b)
-org.apache.logging.log4j:log4j-api:2.11.2 (1 constraints: 3805343b)
-org.apache.logging.log4j:log4j-core:2.11.2 (1 constraints: 3805343b)
+org.apache.logging.log4j:log4j-api:2.11.2 (4 constraints: c83394ae)
+org.apache.logging.log4j:log4j-core:2.11.2 (3 constraints: 102588ba)
 org.apache.logging.log4j:log4j-slf4j-impl:2.11.2 (1 constraints: 3805343b)
 org.apache.opennlp:opennlp-tools:1.9.1 (2 constraints: 6d11c4f2)
 org.apache.pdfbox:fontbox:2.0.15 (2 constraints: 4f1040c5)
@@ -167,32 +169,32 @@ org.carrot2.attributes:attributes-binder:1.3.3 (1 constraints: 0905fc35)
 org.carrot2.shaded:carrot2-guava:18.0 (1 constraints: dd040931)
 org.ccil.cowan.tagsoup:tagsoup:1.2.1 (2 constraints: 601198f1)
 org.checkerframework:checker-qual:2.0.0 (1 constraints: 140ae5b4)
-org.codehaus.janino:commons-compiler:3.0.9 (1 constraints: 0e050336)
+org.codehaus.janino:commons-compiler:3.0.9 (2 constraints: d910f7d1)
 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:4.1 (2 constraints: d7141885)
+org.codehaus.woodstox:stax2-api:4.1 (3 constraints: f125f836)
 org.codehaus.woodstox:woodstox-core-asl:4.4.1 (1 constraints: 0b050c36)
 org.codelibs:jhighlight:1.0.3 (1 constraints: 5b0ce401)
-org.eclipse.jetty:jetty-alpn-client:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty:jetty-alpn-client:9.4.14.v20181114 (3 constraints: bf2ca4fb)
 org.eclipse.jetty:jetty-alpn-java-client:9.4.14.v20181114 (1 constraints: 7a070e7d)
 org.eclipse.jetty:jetty-alpn-server:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-client:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty:jetty-client:9.4.14.v20181114 (2 constraints: 411fc83d)
 org.eclipse.jetty:jetty-continuation:9.4.14.v20181114 (1 constraints: 7a070e7d)
 org.eclipse.jetty:jetty-deploy:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-http:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-io:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty:jetty-http:9.4.14.v20181114 (4 constraints: 963853af)
+org.eclipse.jetty:jetty-io:9.4.14.v20181114 (6 constraints: 6b59afbf)
 org.eclipse.jetty:jetty-jmx:9.4.14.v20181114 (1 constraints: 7a070e7d)
 org.eclipse.jetty:jetty-rewrite:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-security:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-server:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty:jetty-security:9.4.14.v20181114 (2 constraints: de1772dc)
+org.eclipse.jetty:jetty-server:9.4.14.v20181114 (4 constraints: f73bfbd7)
 org.eclipse.jetty:jetty-servlet:9.4.14.v20181114 (1 constraints: 7a070e7d)
 org.eclipse.jetty:jetty-servlets:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-util:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty:jetty-util:9.4.14.v20181114 (5 constraints: c8449c9d)
 org.eclipse.jetty:jetty-webapp:9.4.14.v20181114 (1 constraints: 7a070e7d)
 org.eclipse.jetty:jetty-xml:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty.http2:http2-client:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty.http2:http2-common:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty.http2:http2-hpack:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty.http2:http2-client:9.4.14.v20181114 (2 constraints: 411fc83d)
+org.eclipse.jetty.http2:http2-common:9.4.14.v20181114 (3 constraints: 122b0a1b)
+org.eclipse.jetty.http2:http2-hpack:9.4.14.v20181114 (2 constraints: 4419b95a)
 org.eclipse.jetty.http2:http2-http-client-transport:9.4.14.v20181114 (1 constraints: 7a070e7d)
 org.eclipse.jetty.http2:http2-server:9.4.14.v20181114 (1 constraints: 7a070e7d)
 org.eclipse.jgit:org.eclipse.jgit:4.6.0.201612231935-r (1 constraints: 3c085c99)
@@ -216,13 +218,13 @@ org.ow2.asm:asm-analysis:6.2 (1 constraints: e309d6a5)
 org.ow2.asm:asm-commons:6.2 (1 constraints: aa04272c)
 org.ow2.asm:asm-tree:6.2 (2 constraints: 2d14228c)
 org.quartz-scheduler:quartz:2.2.0 (1 constraints: 2106eb4d)
-org.restlet.jee:org.restlet:2.3.0 (1 constraints: 0705fe35)
+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.simpleframework:simple-xml:2.7.1 (1 constraints: 0c050b36)
-org.slf4j:jcl-over-slf4j:1.7.25 (3 constraints: 0018d6b7)
+org.slf4j:jcl-over-slf4j:1.7.25 (6 constraints: 974ad8ec)
 org.slf4j:jul-to-slf4j:1.7.25 (2 constraints: d5113e11)
-org.slf4j:slf4j-api:1.7.25 (14 constraints: af846a32)
+org.slf4j:slf4j-api:1.7.25 (22 constraints: c2f7e475)
 org.tallison:jmatio:1.5 (2 constraints: a810a0b8)
 org.tukaani:xz:1.8 (2 constraints: ae100fb9)
 ua.net.nlp:morfologik-ukrainian-search:3.9.0 (1 constraints: 0e051536)