Merge branch 'main' into it-cleanup

eddumelendez · web-flow · commit d3a7b8b277bd · 2023-10-26T11:57:36.000-06:00
diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.7.2</version>
+			<version>5.10.0</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.12.1</version>
+			<version>5.13.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.12.1</version>
+			<version>5.13.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.22.0</version>
+			<version>3.24.2</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.12.1</version>
+			<version>5.13.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 import com.github.dockerjava.utils.LogContainerTestCallback;
 import org.apache.commons.io.FileUtils;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -148,6 +149,7 @@ public void copyFileWithExecutePermission() throws Exception {
         assertThat(exitCode, equalTo(0));
     }
 
+    @Ignore("Docker issue https://github.com/moby/moby/issues/46388")
     @Test
     public void copyFileWithUIDGID() throws Exception {
         Path with = Files.createFile(Files.createTempDirectory("copyFileWithUIDGID").resolve("uidgid.with"));
diff --git a/pom.xml b/pom.xml
@@ -62,11 +62,11 @@
 		<jackson-jaxrs.version>2.10.3</jackson-jaxrs.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.21</commons-compress.version>
-		<commons-io.version>2.6</commons-io.version>
+		<commons-io.version>2.13.0</commons-io.version>
 		<commons-lang3.version>3.12.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
-		<bouncycastle.version>1.75</bouncycastle.version>
+		<bouncycastle.version>1.76</bouncycastle.version>
 		<junixsocket.version>2.6.1</junixsocket.version>
 		<guava.version>19.0</guava.version> <!-- todo remove from project -->
 
