Skip to content

Commit ea84ca8

Browse files
authored
Update Linux Tools to use docker-client 8.0.2 (#387)
- fix HttpHijackWorkaround due to changed dependencies
1 parent 49d0abc commit ea84ca8

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2015, 2023 Red Hat.
2+
* Copyright (c) 2015, 2024 Red Hat.
33
*
44
* This program and the accompanying materials are made
55
* available under the terms of the Eclipse Public License 2.0
@@ -47,6 +47,7 @@ public static WritableByteChannel getOutputStream(LogStream stream, String uri)
4747
"input", //$NON-NLS-1$
4848
"in", //$NON-NLS-1$
4949
"in", //$NON-NLS-1$
50+
"in", //$NON-NLS-1$
5051
"wrappedStream", //$NON-NLS-1$
5152
"in", //$NON-NLS-1$
5253
"inStream" //$NON-NLS-1$
@@ -57,6 +58,7 @@ public static WritableByteChannel getOutputStream(LogStream stream, String uri)
5758
"org.glassfish.jersey.message.internal.EntityInputStream", //$NON-NLS-1$
5859
FilterInputStream.class.getName(),
5960
FilterInputStream.class.getName(),
61+
"org.glassfish.jersey.apache.connector.ApacheConnector$CancellableInputStream",
6062
"org.apache.http.conn.EofSensorInputStream", //$NON-NLS-1$
6163
"org.apache.http.impl.io.IdentityInputStream", //$NON-NLS-1$
6264
"org.apache.http.impl.io.SessionInputBufferImpl" }; //$NON-NLS-1$

releng/org.eclipse.linuxtools.target/linuxtools-e4.33.target

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
<dependency>
277277
<groupId>org.mandas</groupId>
278278
<artifactId>docker-client</artifactId>
279-
<version>7.0.8</version>
279+
<version>8.0.2</version>
280280
<type>jar</type>
281281
</dependency>
282282
</dependencies>
@@ -286,4 +286,4 @@
286286
<launcherArgs>
287287
<programArgs>-consolelog</programArgs>
288288
</launcherArgs>
289-
</target>
289+
</target>

0 commit comments

Comments
 (0)