forked from pool/maven-resolver2
48 lines
2.3 KiB
Diff
48 lines
2.3 KiB
Diff
--- a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
|
|
+++ b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporter.java
|
|
@@ -62,7 +62,6 @@ import java.util.function.Function;
|
|
import java.util.function.Supplier;
|
|
import java.util.regex.Matcher;
|
|
|
|
-import com.github.mizosoft.methanol.Methanol;
|
|
import org.eclipse.aether.ConfigurationProperties;
|
|
import org.eclipse.aether.RepositorySystemSession;
|
|
import org.eclipse.aether.repository.AuthenticationContext;
|
|
@@ -525,7 +524,7 @@ final class JdkTransporter extends AbstractTransporter implements HttpTransporte
|
|
}
|
|
}
|
|
|
|
- HttpClient.Builder builder = Methanol.newBuilder()
|
|
+ HttpClient.Builder builder = HttpClient.newBuilder()
|
|
.version(HttpClient.Version.valueOf(ConfigUtils.getString(
|
|
session,
|
|
DEFAULT_HTTP_VERSION,
|
|
@@ -533,10 +532,6 @@ final class JdkTransporter extends AbstractTransporter implements HttpTransporte
|
|
CONFIG_PROP_HTTP_VERSION)))
|
|
.followRedirects(HttpClient.Redirect.NORMAL)
|
|
.connectTimeout(Duration.ofMillis(connectTimeout))
|
|
- // this only considers the time until the response header is received, see
|
|
- // https://bugs.openjdk.org/browse/JDK-8208693
|
|
- // but better than nothing
|
|
- .requestTimeout(Duration.ofMillis(requestTimeout))
|
|
.sslContext(sslContext);
|
|
|
|
if (insecure) {
|
|
--- a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
|
|
+++ b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk11/src/test/java/org/eclipse/aether/transport/jdk/JdkTransporterTest.java
|
|
@@ -99,6 +99,11 @@ class JdkTransporterTest extends HttpTransporterTest {
|
|
@Test
|
|
protected void testPut_Authenticated_ExpectContinueRejected_ExplicitlyConfiguredHeader() {}
|
|
|
|
+ @Override
|
|
+ @Disabled
|
|
+ @Test
|
|
+ protected void testRequestTimeout() throws Exception {}
|
|
+
|
|
public JdkTransporterTest() {
|
|
super(() -> new JdkTransporterFactory(standardChecksumExtractor(), new DefaultPathProcessor()));
|
|
}
|
|
--
|
|
2.52.0
|
|
|