From 5a95fd0d2b15d115fcdbe8bf4605a26b971d258b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 7 Feb 2023 15:11:48 +0000 Subject: [PATCH] Make httpcore5-h2 classes available to Gradle tests httpclient5 now requires classes in httpcore5-h2 in addition to those in httpcore5. See gh-34086 --- .../boot/testsupport/gradle/testkit/GradleBuild.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java index 0e8e0144c1..0299ec170c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,6 +43,7 @@ import org.antlr.v4.runtime.Lexer; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.hc.client5.http.io.HttpClientConnectionManager; import org.apache.hc.core5.http.HttpRequest; +import org.apache.hc.core5.http2.HttpVersionPolicy; import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.GradleRunner; import org.gradle.util.GradleVersion; @@ -123,7 +124,8 @@ public class GradleBuild { new File(pathOfJarContaining(LanguageSettings.class)), new File(pathOfJarContaining(ArchiveEntry.class)), new File(pathOfJarContaining(BuildRequest.class)), new File(pathOfJarContaining(HttpClientConnectionManager.class)), - new File(pathOfJarContaining(HttpRequest.class)), new File(pathOfJarContaining(Module.class)), + new File(pathOfJarContaining(HttpRequest.class)), + new File(pathOfJarContaining(HttpVersionPolicy.class)), new File(pathOfJarContaining(Module.class)), new File(pathOfJarContaining(Versioned.class)), new File(pathOfJarContaining(ParameterNamesModule.class)), new File(pathOfJarContaining(JsonView.class)), new File(pathOfJarContaining(Platform.class)),