This is an automated email from the ASF dual-hosted git repository. markrmiller pushed a commit to branch SOLR-15955 in repository https://gitbox.apache.org/repos/asf/solr.git
commit ec81ef738ad3e1e4548206fa0d9febb5e80ca58d Author: Mark Miller <[email protected]> AuthorDate: Tue Feb 1 14:02:44 2022 -0600 SOLR-15955 --- .stignore | 1 + solr/contrib/s3-repository/build.gradle | 71 ++++++++ .../client/solrj/embedded/JettySolrRunner.java | 11 +- .../apache/solr/servlet/SolrRequestParsers.java | 10 +- solr/server/build.gradle | 3 +- .../solr/client/solrj/impl/Http2SolrClient.java | 15 +- .../client/solrj/util/SolrBasicAuthentication.java | 4 +- versions.lock | 184 ++++++++++----------- versions.props | 9 +- 9 files changed, 195 insertions(+), 113 deletions(-) diff --git a/.stignore b/.stignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/.stignore @@ -0,0 +1 @@ +build diff --git a/solr/contrib/s3-repository/build.gradle b/solr/contrib/s3-repository/build.gradle new file mode 100644 index 0000000..bd73f4b --- /dev/null +++ b/solr/contrib/s3-repository/build.gradle @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +apply plugin: 'java-library' + +description = 'S3 Repository' + +dependencies { + api project(':solr:core') + + implementation platform(group: 'software.amazon.awssdk', name: 'bom') + implementation (group: 'software.amazon.awssdk', name: 'auth') + implementation (group: 'software.amazon.awssdk', name: 'apache-client') + implementation (group: 'software.amazon.awssdk', name: 'aws-core') + implementation (group: 'software.amazon.awssdk', name: 's3') { + exclude group: 'software.amazon.awssdk', module: 'netty-nio-client' + } + implementation (group: 'software.amazon.awssdk', name: 'sdk-core') + implementation (group: 'software.amazon.awssdk', name: 'protocol-core') + runtimeOnly (group: 'com.fasterxml.woodstox', name: 'woodstox-core') + runtimeOnly (group: 'org.codehaus.woodstox', name: 'stax2-api') + + implementation 'org.springframework.boot:spring-boot' + implementation 'org.springframework:spring-core' + implementation 'org.springframework:spring-web' + + testImplementation('com.adobe.testing:s3mock-junit4') { + // Don't pull in separate versions of these libs, just use what Solr already has + exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j' + exclude group: 'ch.qos.logback', module: 'logback-classic' + exclude group: 'org.eclipse.jetty', module: '*' + exclude group: 'io.netty', module: '*' + exclude group: 'commons-io', module: 'commons-io' + exclude group: 'commons-codec', module: 'commons-codec' + exclude group: 'org.apache.commons', module: 'commons-lang3' + exclude group: 'software.amazon.awssdk', module: 'netty-nio-client' + exclude group: 'org.codehaus.woodstox', module: 'stax2-api' + exclude group: 'org.springframework', module: 'spring-web' + exclude group: 'org.springframework.boot', module: 'spring-boot' + } + + testImplementation project(':solr:test-framework') +} + +test { + // S3Mock uses Spring Boot under the hood, which tries to do too much auto configuration that we don't want + environment "spring.autoconfigure.exclude", "org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration" + environment "spring.jmx.enabled", "false" + + // Without this, randomizedtesting will think our tests leak threads (b/c S3Mock's Jetty hasn't bothered to clean up yet) + environment "server.jetty.threads.idle-timeout", "1s" + + // Reduce logging noise during the tests + environment "aws.accessKeyId", "foo" + environment "aws.secretAccessKey", "bar" +} diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java index b0b2e99..87283e6 100644 --- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java +++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java @@ -307,7 +307,10 @@ public class JettySolrRunner { ServerConnector connector; if (sslcontext != null) { configuration.setSecureScheme("https"); - configuration.addCustomizer(new SecureRequestCustomizer()); + SecureRequestCustomizer customizer = new SecureRequestCustomizer(false); + sslcontext.setSniRequired(false); + + configuration.addCustomizer(customizer); HttpConnectionFactory http1ConnectionFactory = new HttpConnectionFactory(configuration); if (config.onlyHttp1 || !Constants.JRE_IS_MINIMUM_JAVA9) { @@ -361,8 +364,9 @@ public class JettySolrRunner { { // Initialize the servlets final ServletContextHandler root = new ServletContextHandler(server, config.context, ServletContextHandler.SESSIONS); + root.setResourceBase("."); - server.addLifeCycleListener(new LifeCycle.Listener() { + server.addEventListener(new LifeCycle.Listener() { @Override public void lifeCycleStopping(LifeCycle arg0) { @@ -439,9 +443,6 @@ public class JettySolrRunner { gzipHandler.setHandler(chain); gzipHandler.setMinGzipSize(23); // https://github.com/eclipse/jetty.project/issues/4191 - gzipHandler.setCheckGzExists(false); - gzipHandler.setCompressionLevel(-1); - gzipHandler.setExcludedAgentPatterns(".*MSIE.6\\.0.*"); gzipHandler.setIncludedMethods("GET"); server.setHandler(gzipHandler); diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java index 8685191..a75a8a8 100644 --- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java +++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java @@ -587,7 +587,7 @@ public class SolrRequestParsers { throw new SolrException( ErrorCode.BAD_REQUEST, "Not multipart content! "+req.getContentType() ); } // Magic way to tell Jetty dynamically we want multi-part processing. "Request" here is a Jetty class - req.setAttribute(Request.MULTIPART_CONFIG_ELEMENT, multipartConfigElement); + req.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, multipartConfigElement); MultiMapSolrParams params = parseQueryString( req.getQueryString() ); @@ -609,7 +609,8 @@ public class SolrRequestParsers { static boolean isMultipart(HttpServletRequest req) { // Jetty utilities - return MimeTypes.Type.MULTIPART_FORM_DATA.is(HttpFields.valueParameters(req.getContentType(), null)); + String ct = req.getContentType(); + return ct != null && ct.startsWith("multipart/form-data"); } /** Wrap a MultiPart-{@link Part} as a {@link ContentStream} */ @@ -631,6 +632,11 @@ public class SolrRequestParsers { } } + static boolean isMultipart(HttpServletRequest req) { + // Jetty utilities + String ct = req.getContentType(); + return ct != null && ct.startsWith("multipart/form-data"); + } /** Clean up any files created by MultiPartInputStream. */ static void cleanupMultipartFiles(HttpServletRequest request) { diff --git a/solr/server/build.gradle b/solr/server/build.gradle index d6df58d..804efd9 100644 --- a/solr/server/build.gradle +++ b/solr/server/build.gradle @@ -44,7 +44,6 @@ dependencies { api 'io.dropwizard.metrics:metrics-jvm' api 'io.dropwizard.metrics:metrics-jmx' - api 'org.eclipse.jetty:jetty-continuation' api 'org.eclipse.jetty:jetty-deploy' api 'org.eclipse.jetty:jetty-http' api 'org.eclipse.jetty:jetty-io' @@ -57,7 +56,7 @@ dependencies { api 'org.eclipse.jetty:jetty-util' api 'org.eclipse.jetty:jetty-webapp' api 'org.eclipse.jetty:jetty-xml' - api 'org.eclipse.jetty:jetty-alpn-server' + api 'org.eclipse.jetty:jetty-alpn-java-server' api 'org.eclipse.jetty.http2:http2-server' api 'org.eclipse.jetty.http2:http2-common' diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java index 26e9459..15dc8ab 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java @@ -90,6 +90,7 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http2.client.HTTP2Client; import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2; +import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.Fields; import org.eclipse.jetty.util.ssl.SslContextFactory; @@ -214,13 +215,18 @@ public class Http2SolrClient extends SolrClient { log.debug("Create Http2SolrClient with HTTP/1.1 transport"); } transport = new HttpClientTransportOverHTTP(2); - httpClient = new HttpClient(transport, sslContextFactory); + httpClient = new HttpClient(transport); if (builder.maxConnectionsPerHost != null) httpClient.setMaxConnectionsPerDestination(builder.maxConnectionsPerHost); } else { log.debug("Create Http2SolrClient with HTTP/2 transport"); - HTTP2Client http2client = new HTTP2Client(); + ClientConnector clientConnector = new ClientConnector(); + clientConnector.setReuseAddress(true); + clientConnector.setSslContextFactory(sslContextFactory); + clientConnector.setSelectors(2); + + HTTP2Client http2client = new HTTP2Client(clientConnector); transport = new HttpClientTransportOverHTTP2(http2client); - httpClient = new HttpClient(transport, sslContextFactory); + httpClient = new HttpClient(transport); httpClient.setMaxConnectionsPerDestination(4); } @@ -247,7 +253,6 @@ public class Http2SolrClient extends SolrClient { asyncTracker.waitForComplete(); if (closeClient) { try { - httpClient.setStopTimeout(1000); httpClient.stop(); } catch (Exception e) { throw new RuntimeException("Exception on closing client", e); @@ -648,7 +653,7 @@ public class Http2SolrClient extends SolrClient { if (name == null) { name = ""; } - HttpFields fields = new HttpFields(); + HttpFields.Mutable fields = HttpFields.build(); fields.add(HttpHeader.CONTENT_TYPE, contentType); content.addFilePart(name, contentStream.getName(), new InputStreamContentProvider(contentStream.getStream()), fields); } diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java b/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java index 461fb79..21b499c 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrBasicAuthentication.java @@ -25,7 +25,7 @@ import org.eclipse.jetty.client.api.Authentication; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.util.Attributes; -import org.eclipse.jetty.util.B64Code; +import java.util.Base64; /** * BasicAuthentication that does not care about uri and realm @@ -35,7 +35,7 @@ public class SolrBasicAuthentication implements Authentication { private final String value; public SolrBasicAuthentication(String user, String password) { - this.value = "Basic " + B64Code.encode(user + ":" + password, StandardCharsets.ISO_8859_1); + this.value = "Basic " + Base64.getEncoder().encodeToString((user + ":" + password + "").getBytes(StandardCharsets.ISO_8859_1)); } @Override diff --git a/versions.lock b/versions.lock index 064bff2..73350fb 100644 --- a/versions.lock +++ b/versions.lock @@ -6,12 +6,12 @@ com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e) com.drewnoakes:metadata-extractor:2.11.0 (1 constraints: 3605323b) com.epam:parso:2.0.11 (1 constraints: 36052c3b) com.esri.geometry:esri-geometry-api:2.2.0 (2 constraints: 6112842b) -com.fasterxml.jackson:jackson-bom:2.12.3 (11 constraints: fdf28813) -com.fasterxml.jackson.core:jackson-annotations:2.12.3 (8 constraints: 099c8008) -com.fasterxml.jackson.core:jackson-core:2.12.3 (13 constraints: e304bc9b) -com.fasterxml.jackson.core:jackson-databind:2.12.3 (17 constraints: 5e455fcf) -com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.12.3 (2 constraints: f1137d82) -com.fasterxml.woodstox:woodstox-core:6.2.4 (2 constraints: 4d1cac9f) +com.fasterxml.jackson:jackson-bom:2.13.1 (10 constraints: 93d98ca5) +com.fasterxml.jackson.core:jackson-annotations:2.13.1 (7 constraints: a48268c3) +com.fasterxml.jackson.core:jackson-core:2.13.1 (12 constraints: 6ceb4571) +com.fasterxml.jackson.core:jackson-databind:2.13.1 (16 constraints: f42bccf9) +com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.13.1 (2 constraints: f0137e82) +com.fasterxml.woodstox:woodstox-core:6.2.7 (2 constraints: 501caf9f) com.github.ben-manes.caffeine:caffeine:3.0.5 (1 constraints: 0a05ff35) com.github.virtuald:curvesapi:1.06 (1 constraints: db04f530) com.github.zafarkhaja:java-semver:0.9.0 (1 constraints: 0b050636) @@ -88,8 +88,8 @@ io.prometheus:simpleclient_common:0.2.0 (2 constraints: e8159ecb) io.prometheus:simpleclient_httpserver:0.2.0 (1 constraints: 0405f135) io.sgr:s2-geometry-library-java:1.0.0 (2 constraints: b215dedf) javax.annotation:javax.annotation-api:1.3.2 (2 constraints: 031bd96b) -javax.servlet:javax.servlet-api:3.1.0 (3 constraints: 75209943) -junit:junit:4.13.1 (6 constraints: 154f6f23) +javax.servlet:javax.servlet-api:3.1.0 (1 constraints: 0605fd35) +junit:junit:4.13.2 (5 constraints: 5e406510) net.arnx:jsonic:1.2.7 (2 constraints: db10d4d1) net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165) net.sf.jopt-simple:jopt-simple:4.6 (1 constraints: 610a91b7) @@ -116,7 +116,7 @@ org.apache.hadoop:hadoop-common:3.2.0 (1 constraints: 07050036) org.apache.hadoop:hadoop-hdfs-client:3.2.0 (1 constraints: 07050036) org.apache.htrace:htrace-core4:4.1.0-incubating (1 constraints: 58090086) org.apache.httpcomponents:httpclient:4.5.13 (8 constraints: 237a2994) -org.apache.httpcomponents:httpcore:4.4.14 (7 constraints: 756d28c6) +org.apache.httpcomponents:httpcore:4.4.14 (7 constraints: 776d2ac6) org.apache.httpcomponents:httpmime:4.5.10 (1 constraints: 3c054b3b) org.apache.james:apache-mime4j-core:0.8.3 (1 constraints: 0d050636) org.apache.james:apache-mime4j-dom:0.8.3 (1 constraints: 0d050636) @@ -191,30 +191,29 @@ org.codehaus.janino:commons-compiler:3.0.11 (2 constraints: 81192719) org.codehaus.janino:janino:3.0.11 (1 constraints: 8d0d3f3a) org.codehaus.mojo:animal-sniffer-annotations:1.14 (1 constraints: ea09d5aa) org.codehaus.woodstox:stax2-api:4.2.1 (2 constraints: 36152eaf) -org.eclipse.jetty:jetty-alpn-client:9.4.44.v20210927 (2 constraints: 5625951d) -org.eclipse.jetty:jetty-alpn-java-client:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-alpn-java-server:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-alpn-server:9.4.44.v20210927 (2 constraints: 271b20de) -org.eclipse.jetty:jetty-client:9.4.44.v20210927 (2 constraints: 511f4040) -org.eclipse.jetty:jetty-continuation:9.4.44.v20210927 (2 constraints: 611890fb) -org.eclipse.jetty:jetty-deploy:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-http:9.4.44.v20210927 (5 constraints: 9549eb52) -org.eclipse.jetty:jetty-io:9.4.44.v20210927 (8 constraints: 1f7e093d) -org.eclipse.jetty:jetty-jmx:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-rewrite:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-security:9.4.44.v20210927 (2 constraints: ee174ade) -org.eclipse.jetty:jetty-server:9.4.44.v20210927 (6 constraints: c85e10fa) -org.eclipse.jetty:jetty-servlet:9.4.44.v20210927 (2 constraints: 6817a7bf) -org.eclipse.jetty:jetty-servlets:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty:jetty-util:9.4.44.v20210927 (8 constraints: 7b756007) -org.eclipse.jetty:jetty-util-ajax:9.4.44.v20210927 (1 constraints: 6d104be2) -org.eclipse.jetty:jetty-webapp:9.4.44.v20210927 (2 constraints: 7617adc0) -org.eclipse.jetty:jetty-xml:9.4.44.v20210927 (3 constraints: 5c270a21) -org.eclipse.jetty.http2:http2-client:9.4.44.v20210927 (2 constraints: 511f4040) -org.eclipse.jetty.http2:http2-common:9.4.44.v20210927 (3 constraints: 2a2baa20) -org.eclipse.jetty.http2:http2-hpack:9.4.44.v20210927 (2 constraints: 5419b95c) -org.eclipse.jetty.http2:http2-http-client-transport:9.4.44.v20210927 (1 constraints: 82072e7d) -org.eclipse.jetty.http2:http2-server:9.4.44.v20210927 (1 constraints: 82072e7d) +org.eclipse.jetty:jetty-alpn-client:10.0.7 (3 constraints: 642e39e8) +org.eclipse.jetty:jetty-alpn-java-client:10.0.7 (2 constraints: c11ae442) +org.eclipse.jetty:jetty-alpn-java-server:10.0.7 (1 constraints: 3a052e3b) +org.eclipse.jetty:jetty-alpn-server:10.0.7 (1 constraints: 5e1121e3) +org.eclipse.jetty:jetty-client:10.0.7 (2 constraints: c11ae442) +org.eclipse.jetty:jetty-deploy:10.0.7 (1 constraints: 3a052e3b) +org.eclipse.jetty:jetty-http:10.0.7 (5 constraints: 2d3e27e2) +org.eclipse.jetty:jetty-io:10.0.7 (8 constraints: df6b35d2) +org.eclipse.jetty:jetty-jmx:10.0.7 (1 constraints: 3a052e3b) +org.eclipse.jetty:jetty-rewrite:10.0.7 (1 constraints: 3a052e3b) +org.eclipse.jetty:jetty-security:10.0.7 (2 constraints: 5e137b58) +org.eclipse.jetty:jetty-server:10.0.7 (6 constraints: 60535db5) +org.eclipse.jetty:jetty-servlet:10.0.7 (2 constraints: d8125c41) +org.eclipse.jetty:jetty-servlets:10.0.7 (1 constraints: 3a052e3b) +org.eclipse.jetty:jetty-util:10.0.7 (7 constraints: 8d54994c) +org.eclipse.jetty:jetty-webapp:10.0.7 (2 constraints: e612d641) +org.eclipse.jetty:jetty-xml:10.0.7 (3 constraints: 8420026b) +org.eclipse.jetty.http2:http2-client:10.0.7 (2 constraints: c11ae442) +org.eclipse.jetty.http2:http2-common:10.0.7 (3 constraints: 52243e09) +org.eclipse.jetty.http2:http2-hpack:10.0.7 (2 constraints: c41477bd) +org.eclipse.jetty.http2:http2-http-client-transport:10.0.7 (1 constraints: 3a052e3b) +org.eclipse.jetty.http2:http2-server:10.0.7 (1 constraints: 3a052e3b) +org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 (2 constraints: 7c1bed81) org.gagravarr:vorbis-java-core:0.8 (1 constraints: ac041f2c) org.gagravarr:vorbis-java-tika:0.8 (1 constraints: ac041f2c) org.hamcrest:hamcrest:2.2 (2 constraints: cf1b088a) @@ -228,49 +227,48 @@ org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267) org.quicktheories:quicktheories:0.26 (1 constraints: dc04f530) org.reactivestreams:reactive-streams:1.0.3 (3 constraints: 3c2b02fd) org.slf4j:jcl-over-slf4j:1.7.24 (1 constraints: 4005473b) -org.slf4j:slf4j-api:1.7.24 (22 constraints: 9c20c409) +org.slf4j:slf4j-api:1.7.24 (37 constraints: 09218888) org.tallison:jmatio:1.5 (1 constraints: aa041f2c) org.threeten:threetenbp:1.5.0 (4 constraints: f82b9e86) org.tukaani:xz:1.8 (1 constraints: ad04222c) org.xerial.snappy:snappy-java:1.1.7.6 (1 constraints: 6f05a240) -software.amazon.awssdk:annotations:2.17.63 (17 constraints: e2ff18d3) -software.amazon.awssdk:apache-client:2.17.63 (3 constraints: 951d4b90) -software.amazon.awssdk:arns:2.17.63 (2 constraints: 21185ac1) -software.amazon.awssdk:auth:2.17.63 (4 constraints: d42bf4dd) -software.amazon.awssdk:aws-core:2.17.63 (5 constraints: 8641079a) -software.amazon.awssdk:aws-query-protocol:2.17.63 (2 constraints: e31dac7f) -software.amazon.awssdk:aws-xml-protocol:2.17.63 (2 constraints: 21185ac1) -software.amazon.awssdk:bom:2.17.63 (1 constraints: 7505bf40) -software.amazon.awssdk:http-client-spi:2.17.63 (10 constraints: 63992164) -software.amazon.awssdk:json-utils:2.17.63 (3 constraints: 4227d652) -software.amazon.awssdk:metrics-spi:2.17.63 (6 constraints: c555c7a0) -software.amazon.awssdk:profiles:2.17.63 (6 constraints: 7b4fb0aa) -software.amazon.awssdk:protocol-core:2.17.63 (5 constraints: 8641079a) -software.amazon.awssdk:regions:2.17.63 (4 constraints: 30334006) -software.amazon.awssdk:s3:2.17.63 (3 constraints: bb244128) -software.amazon.awssdk:sdk-core:2.17.63 (9 constraints: 107bb50f) -software.amazon.awssdk:third-party-jackson-core:2.17.63 (2 constraints: 931b14a8) -software.amazon.awssdk:utils:2.17.63 (16 constraints: 93f23eb1) +software.amazon.awssdk:annotations:2.17.102 (17 constraints: bb021aba) +software.amazon.awssdk:apache-client:2.17.102 (3 constraints: e91dfdc5) +software.amazon.awssdk:arns:2.17.102 (2 constraints: 751824ec) +software.amazon.awssdk:auth:2.17.102 (4 constraints: 522c5250) +software.amazon.awssdk:aws-core:2.17.102 (5 constraints: 2e42247a) +software.amazon.awssdk:aws-query-protocol:2.17.102 (2 constraints: 371e8cb5) +software.amazon.awssdk:aws-xml-protocol:2.17.102 (2 constraints: 751824ec) +software.amazon.awssdk:bom:2.17.102 (1 constraints: 7505bf40) +software.amazon.awssdk:http-client-spi:2.17.102 (10 constraints: 079b4afd) +software.amazon.awssdk:json-utils:2.17.102 (3 constraints: c02771b4) +software.amazon.awssdk:metrics-spi:2.17.102 (6 constraints: c156c33b) +software.amazon.awssdk:profiles:2.17.102 (6 constraints: 7750ca24) +software.amazon.awssdk:protocol-core:2.17.102 (5 constraints: 2e42247a) +software.amazon.awssdk:regions:2.17.102 (4 constraints: d833edae) +software.amazon.awssdk:s3:2.17.102 (3 constraints: 0d25816b) +software.amazon.awssdk:sdk-core:2.17.102 (9 constraints: 607c0d1d) +software.amazon.awssdk:third-party-jackson-core:2.17.102 (2 constraints: e71ba0d7) +software.amazon.awssdk:utils:2.17.102 (16 constraints: 33f5322f) software.amazon.eventstream:eventstream:1.0.1 (2 constraints: 2e1ae62b) ua.net.nlp:morfologik-ukrainian-search:4.9.1 (2 constraints: e417b360) xerces:xercesImpl:2.12.0 (1 constraints: 3705353b) [Test dependencies] -com.adobe.testing:s3mock:2.1.34 (1 constraints: b012831d) -com.adobe.testing:s3mock-junit4:2.1.34 (1 constraints: 3c05373b) -com.adobe.testing:s3mock-testsupport-common:2.1.34 (1 constraints: 7b0d8b39) -com.amazonaws:aws-java-sdk-core:1.12.15 (2 constraints: 501a5183) -com.amazonaws:aws-java-sdk-kms:1.12.15 (1 constraints: d60cb42a) -com.amazonaws:aws-java-sdk-s3:1.12.15 (1 constraints: e0125c30) -com.amazonaws:jmespath-java:1.12.15 (2 constraints: 501a5183) +com.adobe.testing:s3mock:2.3.3 (1 constraints: 7e12d90a) +com.adobe.testing:s3mock-junit4:2.3.3 (1 constraints: 0a050136) +com.adobe.testing:s3mock-testsupport-common:2.3.3 (1 constraints: 490d162c) +com.amazonaws:aws-java-sdk-core:1.12.131 (2 constraints: ae1afdb2) +com.amazonaws:aws-java-sdk-kms:1.12.131 (1 constraints: 050db737) +com.amazonaws:aws-java-sdk-s3:1.12.131 (1 constraints: 0f136943) +com.amazonaws:jmespath-java:1.12.131 (2 constraints: ae1afdb2) com.beust:jcommander:1.35 (1 constraints: b50c1901) -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3 (2 constraints: 5e1c0ef1) -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.12.3 (2 constraints: a519c412) -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3 (2 constraints: 0724ba81) -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3 (3 constraints: 753d9b0e) -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.3 (2 constraints: 2326f760) -com.fasterxml.jackson.module:jackson-module-kotlin:2.12.3 (2 constraints: a41dd15f) -com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.3 (2 constraints: 0724ba81) +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.1 (2 constraints: 5d1c0ff1) +com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1 (2 constraints: a3199d12) +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.1 (2 constraints: 05248381) +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.1 (3 constraints: 723de70d) +com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1 (2 constraints: a31da65f) +com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.1 (2 constraints: 05248381) com.github.jnr:jffi:1.2.18 (1 constraints: b20902ab) com.github.jnr:jnr-constants:0.9.12 (4 constraints: ed2c9d5d) com.github.jnr:jnr-enxio:0.19 (2 constraints: 2a167d08) @@ -296,13 +294,11 @@ com.sun.jersey:jersey-servlet:1.19 (1 constraints: df04fa30) com.vaadin.external.google:android-json:0.0.20131108.vaadin1 (1 constraints: 34092a9e) io.github.microutils:kotlin-logging:2.0.6 (1 constraints: be0e9d62) io.github.microutils:kotlin-logging-jvm:2.0.6 (1 constraints: 810f877c) -io.micrometer:micrometer-core:1.5.14 (1 constraints: fc161b19) +io.micrometer:micrometer-core:1.8.1 (1 constraints: cb162802) io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b) -jakarta.activation:jakarta.activation-api:1.2.1 (2 constraints: b928fbbd) jakarta.annotation:jakarta.annotation-api:1.3.5 (1 constraints: 3a131133) jakarta.servlet:jakarta.servlet-api:4.0.4 (1 constraints: 961568b9) jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9) -jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 (1 constraints: 30198ba6) javax.inject:javax.inject:1 (1 constraints: 7a0df617) joda-time:joda-time:2.9.9 (2 constraints: 0317195a) net.bytebuddy:byte-buddy:1.10.20 (2 constraints: 7c10a9d0) @@ -318,16 +314,16 @@ org.apache.kerby:kerb-identity:1.0.1 (1 constraints: 5f0cb602) org.apache.kerby:kerb-server:1.0.1 (1 constraints: d10b65f2) org.apache.kerby:kerb-simplekdc:1.0.1 (1 constraints: dc0d7e3e) org.apache.logging.log4j:log4j-1.2-api:2.17.1 (1 constraints: 3d05453b) +org.apache.tomcat.embed:tomcat-embed-el:9.0.56 (1 constraints: d21554cf) org.asciidoctor:asciidoctorj:1.6.2 (1 constraints: 0b050436) org.asciidoctor:asciidoctorj-api:1.6.2 (1 constraints: e30cfb0d) org.freemarker:freemarker:2.3.31 (1 constraints: ef0e9271) -org.glassfish:jakarta.el:3.0.3 (1 constraints: 941562b9) org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029) org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136) org.jetbrains:annotations:13.0 (1 constraints: df0e795c) -org.jetbrains.kotlin:kotlin-reflect:1.4.32 (2 constraints: 612453e2) -org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (7 constraints: 4168b6de) -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32 (3 constraints: b92a7abb) +org.jetbrains.kotlin:kotlin-reflect:1.5.30 (2 constraints: 622484e2) +org.jetbrains.kotlin:kotlin-stdlib:1.5.30 (7 constraints: 406856de) +org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30 (3 constraints: b82a7cbb) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10 (1 constraints: dd10ebd2) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 (1 constraints: 650f967c) org.jruby:dirgra:0.3 (1 constraints: 1b098b8e) @@ -340,26 +336,26 @@ org.jsoup:jsoup:1.12.1 (1 constraints: 3705303b) org.latencyutils:LatencyUtils:2.0.3 (1 constraints: 210dcd1b) org.mockito:mockito-core:3.8.0 (1 constraints: 0d051236) org.objenesis:objenesis:3.1 (2 constraints: 5b0ff979) -org.slf4j:jul-to-slf4j:1.7.24 (1 constraints: 801632ff) +org.slf4j:jul-to-slf4j:1.7.24 (1 constraints: 821634ff) org.slf4j:slf4j-simple:1.7.24 (1 constraints: 4005473b) -org.springframework:spring-aop:5.2.15.RELEASE (2 constraints: 32232d90) -org.springframework:spring-beans:5.2.15.RELEASE (4 constraints: 5843b908) -org.springframework:spring-context:5.2.15.RELEASE (2 constraints: c3236acf) -org.springframework:spring-core:5.2.15.RELEASE (8 constraints: 5f8f7c09) -org.springframework:spring-expression:5.2.15.RELEASE (2 constraints: 32232d90) -org.springframework:spring-jcl:5.2.15.RELEASE (1 constraints: 7e109dcb) -org.springframework:spring-web:5.2.15.RELEASE (3 constraints: e33f9fc2) -org.springframework:spring-webmvc:5.2.15.RELEASE (1 constraints: 0817c84e) -org.springframework.boot:spring-boot:2.3.12.RELEASE (4 constraints: 375ff6a1) -org.springframework.boot:spring-boot-actuator:2.3.12.RELEASE (1 constraints: 9e1ba38d) -org.springframework.boot:spring-boot-actuator-autoconfigure:2.3.12.RELEASE (1 constraints: 281969da) -org.springframework.boot:spring-boot-autoconfigure:2.3.12.RELEASE (2 constraints: 35316e29) -org.springframework.boot:spring-boot-starter:2.3.12.RELEASE (3 constraints: a847adb4) -org.springframework.boot:spring-boot-starter-actuator:2.3.12.RELEASE (1 constraints: a80fdfae) -org.springframework.boot:spring-boot-starter-jetty:2.3.12.RELEASE (1 constraints: 1d0d3137) -org.springframework.boot:spring-boot-starter-json:2.3.12.RELEASE (1 constraints: 03178f4e) -org.springframework.boot:spring-boot-starter-logging:2.3.12.RELEASE (1 constraints: 98154deb) -org.springframework.boot:spring-boot-starter-web:2.3.12.RELEASE (1 constraints: 1d0d3137) -org.yaml:snakeyaml:1.26 (1 constraints: 0c13dd1f) -software.amazon.awssdk:url-connection-client:2.17.63 (2 constraints: 471f19f7) +org.springframework:spring-aop:5.3.14 (2 constraints: d41eac99) +org.springframework:spring-beans:5.3.14 (4 constraints: 9c3abac4) +org.springframework:spring-context:5.3.14 (2 constraints: 651fdcd1) +org.springframework:spring-core:5.3.14 (9 constraints: 2785712c) +org.springframework:spring-expression:5.3.14 (2 constraints: d41eac99) +org.springframework:spring-jcl:5.3.14 (1 constraints: 4f0e9e4f) +org.springframework:spring-web:5.3.14 (4 constraints: 9640be7b) +org.springframework:spring-webmvc:5.3.14 (1 constraints: d9146a9e) +org.springframework.boot:spring-boot:2.6.2 (5 constraints: ce5a89f9) +org.springframework.boot:spring-boot-actuator:2.6.2 (1 constraints: 41192d9f) +org.springframework.boot:spring-boot-actuator-autoconfigure:2.6.2 (1 constraints: cb162802) +org.springframework.boot:spring-boot-autoconfigure:2.6.2 (2 constraints: 7b2ce30c) +org.springframework.boot:spring-boot-starter:2.6.2 (3 constraints: 9140261f) +org.springframework.boot:spring-boot-starter-actuator:2.6.2 (1 constraints: 4b0d1e2c) +org.springframework.boot:spring-boot-starter-jetty:2.6.2 (1 constraints: c00a44cb) +org.springframework.boot:spring-boot-starter-json:2.6.2 (1 constraints: a6148c89) +org.springframework.boot:spring-boot-starter-logging:2.6.2 (1 constraints: 3b131c33) +org.springframework.boot:spring-boot-starter-web:2.6.2 (1 constraints: c00a44cb) +org.yaml:snakeyaml:1.29 (1 constraints: 0f13e01f) +software.amazon.awssdk:url-connection-client:2.17.102 (2 constraints: 991f802f) software.amazon.ion:ion-java:1.0.2 (1 constraints: 720db831) diff --git a/versions.props b/versions.props index b9409cf..cf36c77 100644 --- a/versions.props +++ b/versions.props @@ -1,4 +1,4 @@ -com.adobe.testing:s3mock-junit4=2.1.34 +com.adobe.testing:s3mock-junit4=2.3.3 com.adobe.xmp:xmpcore=5.1.3 com.carrotsearch.randomizedtesting:*=2.7.6 com.carrotsearch:hppc=0.8.2 @@ -109,8 +109,8 @@ org.ccil.cowan.tagsoup:tagsoup=1.2.1 org.checkerframework:checker-qual=3.10.0 org.codehaus.janino:*=3.0.9 org.codehaus.woodstox:stax2-api=4.2.1 -org.eclipse.jetty.http2:*=9.4.44.v20210927 -org.eclipse.jetty:*=9.4.44.v20210927 +org.eclipse.jetty.http2:*=10.0.7 +org.eclipse.jetty:*=10.0.7 org.gagravarr:*=0.8 org.hamcrest:*=2.2 org.hsqldb:hsqldb=2.4.0 @@ -124,6 +124,9 @@ org.openjdk.jmh:*=1.32 org.ow2.asm:*=7.2 org.quicktheories:quicktheories=0.26 org.slf4j:*=1.7.24 +org.springframework:spring-core=5.2.9.RELEASE +org.springframework:spring-web=5.2.9.RELEASE +org.springframework.boot:spring-boot=2.5.3 org.tallison:jmatio=1.5 org.threeten:threetenbp=1.3.3 org.tukaani:xz=1.8
