diff --git a/build.gradle b/build.gradle index c8141cb54..23320aef2 100644 --- a/build.gradle +++ b/build.gradle @@ -22,13 +22,13 @@ buildscript { dependencies { classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0' - classpath 'com.palantir.gradle.jdks:gradle-jdks:0.58.0' + classpath 'com.palantir.gradle.jdks:gradle-jdks:0.59.0' classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.16.0' classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0' classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0' classpath 'org.revapi:gradle-revapi:1.8.0' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.50.0' - classpath 'com.palantir.baseline:gradle-baseline-java:6.4.0' + classpath 'com.palantir.baseline:gradle-baseline-java:6.5.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.1.0' classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0' classpath 'com.palantir.metricschema:gradle-metric-schema:0.32.0' diff --git a/changelog/4.7.0/pr-2452.v2.yml b/changelog/4.7.0/pr-2452.v2.yml new file mode 100644 index 000000000..1c1c2cb49 --- /dev/null +++ b/changelog/4.7.0/pr-2452.v2.yml @@ -0,0 +1,5 @@ +type: fix +fix: + description: Fix request request path to always include leading slash / + links: + - https://github.com/palantir/dialogue/pull/2452 diff --git a/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannel.java b/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannel.java index 0648149ef..cb326c195 100644 --- a/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannel.java +++ b/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannel.java @@ -162,7 +162,7 @@ static ClassicHttpRequest createRequest(BaseUrl baseUrl, Endpoint endpoint, Requ endpoint.httpMethod().name()) .setScheme(target.getProtocol()) .setAuthority(parseAuthority(target)) - .setPath(target.getFile()); + .setPath(getPath(target)); // Fill headers request.headerParams().forEach(builder::addHeader); @@ -181,6 +181,15 @@ static ClassicHttpRequest createRequest(BaseUrl baseUrl, Endpoint endpoint, Requ return builder.build(); } + @VisibleForTesting + static String getPath(URL target) { + String path = target.getFile(); + if (path.startsWith("/")) { + return path; + } + return path.isEmpty() ? "/" : '/' + path; + } + @VisibleForTesting static URIAuthority parseAuthority(URL url) { try { diff --git a/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannelTest.java b/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannelTest.java index 5439cc6b4..9205cea88 100644 --- a/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannelTest.java +++ b/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannelTest.java @@ -33,6 +33,7 @@ import java.util.Comparator; import java.util.Map; import org.apache.hc.core5.http.ClassicHttpRequest; +import org.apache.hc.core5.http.io.support.ClassicRequestBuilder; import org.apache.hc.core5.net.URIAuthority; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -116,9 +117,10 @@ public void renderPath(ListMultimap params, UrlBuilder url) { "https://user@[0000:0000:0000:0000:0000:ffff:c0a8:0102]:8443/path/to/foo/bar?baz=quux&hello=world#an-octothorpe" + " , 0000:0000:0000:0000:0000:ffff:c0a8:0102, 8443, user", "https://user:slash%2Fslash@www.example.local, www.example.local, -1, user:slash%2Fslash", + "http://localhost:59845/?REQUEST=GetCapabilities&SERVICE=WMS, localhost, 59845, ", + "http://localhost:59845?REQUEST=GetCapabilities&SERVICE=WMS, localhost, 59845, ", }) - void parseAuthority(String input, String expectedHost, int expectedPort, String expectedUserInfo) throws Exception { - URL url = new URL(input); + void parseAuthority(URL url, String expectedHost, int expectedPort, String expectedUserInfo) throws Exception { assertThat(ApacheHttpClientBlockingChannel.parseAuthority(url)) .isEqualTo(URIAuthority.create(url.toURI().getRawAuthority())) .isEqualTo(URIAuthority.create(url.getAuthority())) @@ -134,6 +136,88 @@ void parseAuthority(String input, String expectedHost, int expectedPort, String }); } + @ParameterizedTest + @ValueSource( + strings = { + "https://192.168.1.1", + "https://192.168.1.1/", + "https://localhost", + "https://localhost/", + "https://localhost/?REQUEST=GetCapabilities&SERVICE=WMS", + "https://localhost:12345", + "https://localhost:12345?REQUEST=GetCapabilities&SERVICE=WMS", + "https://localhost:12345/?REQUEST=GetCapabilities&SERVICE=WMS", + "https://www.example.local/path/to/foo/bar?baz=quux&hello=world", + }) + void getPathStartsWithSlash(URL url) { + assertThat(ApacheHttpClientBlockingChannel.getPath(url)) + .isNotNull() + .isNotEmpty() + .startsWith("/"); + } + + @ParameterizedTest + @CsvSource({ + "http://localhost:12345/?REQUEST=GetCapabilities&SERVICE=WMS , http://localhost:12345 , ", + "https://localhost:12345/?REQUEST=GetCapabilities&SERVICE=WMS , https://localhost:12345/ , ", + "https://localhost:12345/api?REQUEST=GetCapabilities&SERVICE=WMS , https://localhost:12345/api , ", + "https://localhost:12345/api?REQUEST=GetCapabilities&SERVICE=WMS , https://localhost:12345/api/ , ", + }) + void noPathQueryString(URL expectedUrl, String base) throws Exception { + Request wmsRequest = Request.builder() + .putQueryParams("REQUEST", "GetCapabilities") + .putQueryParams("SERVICE", "WMS") + .build(); + BaseUrl baseUrl = BaseUrl.of(new URL(base)); + Endpoint wmsEndpoint = new Endpoint() { + private final PathTemplate pathTemplate = PathTemplate.builder() + .variable("REQUEST") + .variable("SERVICE") + .build(); + + @Override + public HttpMethod httpMethod() { + return HttpMethod.GET; + } + + @Override + public String serviceName() { + return "testService"; + } + + @Override + public String endpointName() { + return "testEndpoint"; + } + + @Override + public String version() { + return "1.2.3"; + } + + @Override + public void renderPath(ListMultimap params, UrlBuilder url) { + pathTemplate.fill(params, url); + } + }; + URL target = baseUrl.render(wmsEndpoint, wmsRequest); + assertThat(ApacheHttpClientBlockingChannel.getPath(target)).isNotEmpty().startsWith("/"); + + ClassicHttpRequest expectedRequest = ClassicRequestBuilder.create( + wmsEndpoint.httpMethod().name()) + .setUri(target.toString()) + .build(); + + ClassicHttpRequest request = ApacheHttpClientBlockingChannel.createRequest(baseUrl, wmsEndpoint, wmsRequest); + assertThat(request.getMethod()).isEqualTo(wmsEndpoint.httpMethod().toString()); + assertThat(request.getUri()) + .isEqualTo(expectedUrl.toURI()) + .isEqualTo(expectedRequest.getUri()) + .asString() + .isEqualTo(expectedUrl.toString()); + assertThat(request.getPath()).isEqualTo(expectedRequest.getPath()); + } + @Test void testHostComparator() { assertThat("www.example.local") diff --git a/gradle/gradle-jdks-setup.jar b/gradle/gradle-jdks-setup.jar index 0cd1840ec..ef84f071e 100644 Binary files a/gradle/gradle-jdks-setup.jar and b/gradle/gradle-jdks-setup.jar differ diff --git a/gradle/jdks/11/linux-glibc/aarch64/local-path b/gradle/jdks/11/linux-glibc/aarch64/local-path index 0d759e87e..d7e7ce9c6 100644 --- a/gradle/jdks/11/linux-glibc/aarch64/local-path +++ b/gradle/jdks/11/linux-glibc/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-11.0.25.9.1 +amazon-corretto-11.0.25.9.1-glibc diff --git a/gradle/jdks/11/linux-glibc/x86-64/local-path b/gradle/jdks/11/linux-glibc/x86-64/local-path index 0d759e87e..d7e7ce9c6 100644 --- a/gradle/jdks/11/linux-glibc/x86-64/local-path +++ b/gradle/jdks/11/linux-glibc/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-11.0.25.9.1 +amazon-corretto-11.0.25.9.1-glibc diff --git a/gradle/jdks/11/linux-glibc/x86/local-path b/gradle/jdks/11/linux-glibc/x86/local-path index 0d759e87e..d7e7ce9c6 100644 --- a/gradle/jdks/11/linux-glibc/x86/local-path +++ b/gradle/jdks/11/linux-glibc/x86/local-path @@ -1 +1 @@ -amazon-corretto-11.0.25.9.1 +amazon-corretto-11.0.25.9.1-glibc diff --git a/gradle/jdks/11/linux-musl/aarch64/local-path b/gradle/jdks/11/linux-musl/aarch64/local-path index 0d759e87e..29fc3239e 100644 --- a/gradle/jdks/11/linux-musl/aarch64/local-path +++ b/gradle/jdks/11/linux-musl/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-11.0.25.9.1 +amazon-corretto-11.0.25.9.1-musl diff --git a/gradle/jdks/11/linux-musl/x86-64/local-path b/gradle/jdks/11/linux-musl/x86-64/local-path index 0d759e87e..29fc3239e 100644 --- a/gradle/jdks/11/linux-musl/x86-64/local-path +++ b/gradle/jdks/11/linux-musl/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-11.0.25.9.1 +amazon-corretto-11.0.25.9.1-musl diff --git a/gradle/jdks/17/linux-glibc/aarch64/local-path b/gradle/jdks/17/linux-glibc/aarch64/local-path index edac2a827..dd77d870a 100644 --- a/gradle/jdks/17/linux-glibc/aarch64/local-path +++ b/gradle/jdks/17/linux-glibc/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-17.0.13.11.1 +amazon-corretto-17.0.13.11.1-glibc diff --git a/gradle/jdks/17/linux-glibc/x86-64/local-path b/gradle/jdks/17/linux-glibc/x86-64/local-path index edac2a827..dd77d870a 100644 --- a/gradle/jdks/17/linux-glibc/x86-64/local-path +++ b/gradle/jdks/17/linux-glibc/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-17.0.13.11.1 +amazon-corretto-17.0.13.11.1-glibc diff --git a/gradle/jdks/17/linux-musl/aarch64/local-path b/gradle/jdks/17/linux-musl/aarch64/local-path index edac2a827..02101d29c 100644 --- a/gradle/jdks/17/linux-musl/aarch64/local-path +++ b/gradle/jdks/17/linux-musl/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-17.0.13.11.1 +amazon-corretto-17.0.13.11.1-musl diff --git a/gradle/jdks/17/linux-musl/x86-64/local-path b/gradle/jdks/17/linux-musl/x86-64/local-path index edac2a827..02101d29c 100644 --- a/gradle/jdks/17/linux-musl/x86-64/local-path +++ b/gradle/jdks/17/linux-musl/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-17.0.13.11.1 +amazon-corretto-17.0.13.11.1-musl diff --git a/gradle/jdks/21/linux-glibc/aarch64/local-path b/gradle/jdks/21/linux-glibc/aarch64/local-path index 4c19e3acf..e1fe47dc8 100644 --- a/gradle/jdks/21/linux-glibc/aarch64/local-path +++ b/gradle/jdks/21/linux-glibc/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-21.0.5.11.1 +amazon-corretto-21.0.5.11.1-glibc diff --git a/gradle/jdks/21/linux-glibc/x86-64/local-path b/gradle/jdks/21/linux-glibc/x86-64/local-path index 4c19e3acf..e1fe47dc8 100644 --- a/gradle/jdks/21/linux-glibc/x86-64/local-path +++ b/gradle/jdks/21/linux-glibc/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-21.0.5.11.1 +amazon-corretto-21.0.5.11.1-glibc diff --git a/gradle/jdks/21/linux-musl/aarch64/local-path b/gradle/jdks/21/linux-musl/aarch64/local-path index 4c19e3acf..7192bfeb3 100644 --- a/gradle/jdks/21/linux-musl/aarch64/local-path +++ b/gradle/jdks/21/linux-musl/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-21.0.5.11.1 +amazon-corretto-21.0.5.11.1-musl diff --git a/gradle/jdks/21/linux-musl/x86-64/local-path b/gradle/jdks/21/linux-musl/x86-64/local-path index 4c19e3acf..7192bfeb3 100644 --- a/gradle/jdks/21/linux-musl/x86-64/local-path +++ b/gradle/jdks/21/linux-musl/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-21.0.5.11.1 +amazon-corretto-21.0.5.11.1-musl diff --git a/settings.gradle b/settings.gradle index 74e5b22ad..440d15d2b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,7 @@ buildscript { gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } } } dependencies { - classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.58.0' + classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.59.0' } } apply plugin: 'com.palantir.jdks.settings' diff --git a/versions.lock b/versions.lock index 90b6cb3ba..d787088b9 100644 --- a/versions.lock +++ b/versions.lock @@ -1,32 +1,32 @@ # Run ./gradlew writeVersionsLocks to regenerate this file -com.fasterxml.jackson.core:jackson-annotations:2.18.1 (8 constraints: 0d8536b2) -com.fasterxml.jackson.core:jackson-core:2.18.1 (11 constraints: 7fe513f3) -com.fasterxml.jackson.core:jackson-databind:2.18.1 (15 constraints: 7d31a4a4) -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.1 (1 constraints: 811ca8a4) -com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.1 (1 constraints: 811ca8a4) -com.fasterxml.jackson.datatype:jackson-datatype-guava:2.18.1 (1 constraints: 811ca8a4) -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.1 (1 constraints: 811ca8a4) -com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.1 (1 constraints: 811ca8a4) -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1 (1 constraints: 811ca8a4) +com.fasterxml.jackson.core:jackson-annotations:2.18.2 (8 constraints: 12851fb7) +com.fasterxml.jackson.core:jackson-core:2.18.2 (11 constraints: 89e5ca00) +com.fasterxml.jackson.core:jackson-databind:2.18.2 (15 constraints: 863143b9) +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2 (1 constraints: 811ca8a4) +com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2 (1 constraints: 811ca8a4) +com.fasterxml.jackson.datatype:jackson-datatype-guava:2.18.2 (1 constraints: 811ca8a4) +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.2 (1 constraints: 811ca8a4) +com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.2 (1 constraints: 811ca8a4) +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2 (1 constraints: 811ca8a4) com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: 0f284736) com.google.auto:auto-common:1.2.1 (1 constraints: 17120ffb) com.google.code.findbugs:jsr305:3.0.2 (14 constraints: 49e26143) -com.google.errorprone:error_prone_annotations:2.7.1 (18 constraints: 80207776) +com.google.errorprone:error_prone_annotations:2.7.1 (18 constraints: 7f208773) com.google.guava:failureaccess:1.0.2 (1 constraints: 150ae2b4) -com.google.guava:guava:33.3.1-jre (17 constraints: 2f2b2816) +com.google.guava:guava:33.4.0-jre (17 constraints: 2f2b2a16) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:3.0.0 (1 constraints: 150aeab4) com.palantir.common:streams:2.4.0 (1 constraints: 08050136) -com.palantir.conjure.java:conjure-lib:8.34.0 (1 constraints: ad07af7e) -com.palantir.conjure.java.api:errors:2.56.0 (2 constraints: 63156edb) -com.palantir.conjure.java.api:service-config:2.56.0 (2 constraints: 5b1911dd) -com.palantir.conjure.java.api:ssl-config:2.56.0 (4 constraints: 043f23a0) +com.palantir.conjure.java:conjure-lib:8.36.0 (1 constraints: af07b77e) +com.palantir.conjure.java.api:errors:2.57.0 (2 constraints: 6415a0db) +com.palantir.conjure.java.api:service-config:2.57.0 (2 constraints: 5c194ddd) +com.palantir.conjure.java.api:ssl-config:2.57.0 (4 constraints: 063f3ba1) com.palantir.conjure.java.runtime:client-config:8.16.0 (1 constraints: 4105653b) com.palantir.conjure.java.runtime:conjure-java-jackson-optimizations:8.16.0 (1 constraints: 851cc6a4) com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:8.16.0 (2 constraints: 6116630f) com.palantir.conjure.java.runtime:keystores:8.16.0 (2 constraints: 6119b1dd) com.palantir.goethe:goethe:0.14.0 (1 constraints: 37052f3b) -com.palantir.javapoet:javapoet:0.5.0 (2 constraints: c7103ed1) +com.palantir.javapoet:javapoet:0.6.0 (2 constraints: c81064d1) com.palantir.nylon:nylon-threads:0.4.0 (1 constraints: 0c10fa91) com.palantir.refreshable:refreshable:2.5.0 (2 constraints: f1188fb2) com.palantir.ri:resource-identifier:2.8.0 (2 constraints: fc1495b7) @@ -39,14 +39,14 @@ com.palantir.safethreadlocalrandom:safe-thread-local-random:0.3.0 (1 constraints com.palantir.tokens:auth-tokens:3.18.0 (3 constraints: 2628868e) com.palantir.tracing:tracing:6.20.0 (2 constraints: 5416db0d) com.palantir.tracing:tracing-api:6.20.0 (2 constraints: 0912eb17) -com.palantir.tritium:tritium-api:0.95.0 (2 constraints: 3d1f14be) -com.palantir.tritium:tritium-caffeine:0.95.0 (1 constraints: 4005523b) -com.palantir.tritium:tritium-core:0.95.0 (1 constraints: 46105ba2) -com.palantir.tritium:tritium-ids:0.95.0 (1 constraints: d10fb396) -com.palantir.tritium:tritium-metrics:0.95.0 (2 constraints: bf1563e4) -com.palantir.tritium:tritium-registry:0.95.0 (5 constraints: a656f31c) +com.palantir.tritium:tritium-api:0.96.0 (2 constraints: 3f1f48be) +com.palantir.tritium:tritium-caffeine:0.96.0 (1 constraints: 4105553b) +com.palantir.tritium:tritium-core:0.96.0 (1 constraints: 47105ea2) +com.palantir.tritium:tritium-ids:0.96.0 (1 constraints: d10fb396) +com.palantir.tritium:tritium-metrics:0.96.0 (2 constraints: c11598e4) +com.palantir.tritium:tritium-registry:0.96.0 (5 constraints: a9560e1e) com.squareup:javapoet:1.13.0 (1 constraints: f50b65f7) -io.dropwizard.metrics:metrics-core:4.2.29 (5 constraints: 5953abfb) +io.dropwizard.metrics:metrics-core:4.2.29 (5 constraints: 5c533afc) javax.annotation:javax.annotation-api:1.3.2 (1 constraints: 0805fb35) joda-time:joda-time:2.12.7 (1 constraints: 2f16b1f1) org.apache.httpcomponents.client5:httpclient5:5.3.1 (1 constraints: 0b050e36) @@ -66,7 +66,7 @@ org.slf4j:slf4j-api:1.7.36 (8 constraints: bb801622) org.wildfly.common:wildfly-common:1.5.4.Final (2 constraints: 741cfbf1) [Test dependencies] -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.1 (1 constraints: 3e05483b) +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2 (1 constraints: 3f05493b) com.google.auto.value:auto-value:1.10 (1 constraints: e711f8e8) com.google.auto.value:auto-value-annotations:1.8.1 (1 constraints: 620a29b9) com.google.code.findbugs:annotations:3.0.1u2 (1 constraints: 450b07da) @@ -84,7 +84,7 @@ de.erichseifert.vectorgraphics2d:VectorGraphics2D:0.13 (1 constraints: 8c0a80bb) de.rototor.pdfbox:graphics2d:0.25 (1 constraints: 8f0a84bb) io.undertow:undertow-core:2.2.37.Final (1 constraints: 58074c61) junit:junit:4.13.2 (4 constraints: 90418c36) -net.bytebuddy:byte-buddy:1.15.4 (2 constraints: c916c650) +net.bytebuddy:byte-buddy:1.15.11 (2 constraints: c316f74f) net.bytebuddy:byte-buddy-agent:1.15.4 (1 constraints: 450b45de) net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165) net.sf.jopt-simple:jopt-simple:5.0.4 (1 constraints: be0ad6cc) @@ -97,7 +97,7 @@ org.apache.logging.log4j:log4j-slf4j-impl:2.24.0 (1 constraints: 3a053f3b) org.apache.pdfbox:fontbox:2.0.17 (1 constraints: 180b71d8) org.apache.pdfbox:pdfbox:2.0.17 (1 constraints: b40c5915) org.apiguardian:apiguardian-api:1.1.2 (6 constraints: 24695e60) -org.assertj:assertj-core:3.26.3 (3 constraints: 57253c4e) +org.assertj:assertj-core:3.27.0 (3 constraints: 5525844d) org.assertj:assertj-guava:3.3.0 (1 constraints: 08050336) org.awaitility:awaitility:4.2.2 (1 constraints: 0a050736) org.bouncycastle:bcpkix-jdk18on:1.79 (1 constraints: e5040631) @@ -114,13 +114,13 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (1 constraints: e210ffd2) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (3 constraints: eb27efa7) org.jmock:jmock:2.13.1 (1 constraints: 3905393b) org.jmock:jmock-testjar:2.13.1 (1 constraints: a707a672) -org.junit.jupiter:junit-jupiter:5.11.3 (1 constraints: 3c05473b) -org.junit.jupiter:junit-jupiter-api:5.11.3 (6 constraints: 6f590320) -org.junit.jupiter:junit-jupiter-engine:5.11.3 (1 constraints: 370e034a) -org.junit.jupiter:junit-jupiter-migrationsupport:5.11.3 (1 constraints: 3c05473b) -org.junit.jupiter:junit-jupiter-params:5.11.3 (2 constraints: 7213cc5b) -org.junit.platform:junit-platform-commons:1.11.3 (2 constraints: 3321ed83) -org.junit.platform:junit-platform-engine:1.11.3 (1 constraints: d610eac4) +org.junit.jupiter:junit-jupiter:5.11.4 (1 constraints: 3d05483b) +org.junit.jupiter:junit-jupiter-api:5.11.4 (6 constraints: 7459d622) +org.junit.jupiter:junit-jupiter-engine:5.11.4 (1 constraints: 380e044a) +org.junit.jupiter:junit-jupiter-migrationsupport:5.11.4 (1 constraints: 3d05483b) +org.junit.jupiter:junit-jupiter-params:5.11.4 (2 constraints: 7413f75b) +org.junit.platform:junit-platform-commons:1.11.4 (2 constraints: 35212184) +org.junit.platform:junit-platform-engine:1.11.4 (1 constraints: d710ebc4) org.knowm.xchart:xchart:3.6.1 (1 constraints: 0c050d36) org.mockito:mockito-core:5.14.2 (2 constraints: 34142487) org.mockito:mockito-junit-jupiter:5.14.2 (1 constraints: 3e054f3b) diff --git a/versions.props b/versions.props index 8530eca68..a1c6a8507 100644 --- a/versions.props +++ b/versions.props @@ -1,23 +1,23 @@ -com.fasterxml.jackson.*:* = 2.18.1 -com.fasterxml.jackson.core:jackson-databind = 2.18.1 +com.fasterxml.jackson.*:* = 2.18.2 +com.fasterxml.jackson.core:jackson-databind = 2.18.2 com.google.code.findbugs:jsr305 = 3.0.2 -com.google.guava:guava = 33.3.1-jre +com.google.guava:guava = 33.4.0-jre com.google.testing.compile:compile-testing = 0.21.0 com.palantir.common:streams = 2.4.0 -com.palantir.conjure.java.api:* = 2.56.0 +com.palantir.conjure.java.api:* = 2.57.0 com.palantir.conjure.java.runtime:* = 8.16.0 -com.palantir.conjure.java:* = 8.34.0 +com.palantir.conjure.java:* = 8.36.0 com.palantir.conjure:conjure = 4.50.0 com.palantir.goethe:* = 0.14.0 -com.palantir.javapoet:javapoet = 0.5.0 +com.palantir.javapoet:javapoet = 0.6.0 com.palantir.refreshable:* = 2.5.0 com.palantir.ri:resource-identifier = 2.8.0 com.palantir.safe-logging:* = 3.7.0 com.palantir.safethreadlocalrandom:safe-thread-local-random = 0.3.0 com.palantir.tokens:auth-tokens = 3.18.0 com.palantir.tracing:* = 6.20.0 -com.palantir.tritium:* = 0.95.0 -com.uber.nullaway:nullaway = 0.12.1 +com.palantir.tritium:* = 0.96.0 +com.uber.nullaway:nullaway = 0.12.2 io.dropwizard.metrics:metrics-core = 4.2.29 org.apache.httpcomponents.client5:* = 5.3.1 org.apache.httpcomponents.core5:* = 5.3.1 @@ -27,9 +27,9 @@ org.slf4j:* = 1.7.36 com.github.ben-manes.caffeine:caffeine = 3.1.8 # test deps -org.junit.jupiter:* = 5.11.3 +org.junit.jupiter:* = 5.11.4 org.apache.logging.log4j:* = 2.24.0 -org.assertj:assertj-core = 3.26.3 +org.assertj:assertj-core = 3.27.0 org.assertj:assertj-guava = 3.3.0 org.hamcrest:hamcrest-core = 3.0 org.mockito:* = 5.14.2