diff --git a/pom.xml b/pom.xml index 9e8ab91..571df25 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ org.testcontainers testcontainers-bom - 1.21.4 + 2.0.3 pom import diff --git a/testcontainers-gitserver/pom.xml b/testcontainers-gitserver/pom.xml index 8e9adb2..0e3be3b 100644 --- a/testcontainers-gitserver/pom.xml +++ b/testcontainers-gitserver/pom.xml @@ -50,7 +50,7 @@ org.testcontainers - junit-jupiter + testcontainers-junit-jupiter test diff --git a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/http/GitHttpServerContainerTest.java b/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/http/GitHttpServerContainerTest.java index 317ef53..59fee95 100644 --- a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/http/GitHttpServerContainerTest.java +++ b/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/http/GitHttpServerContainerTest.java @@ -88,7 +88,7 @@ void enableHttpProxySetting() throws GitAPIException, IOException { private void assertGitPull(Git git, UsernamePasswordCredentialsProvider credentialsProvider) throws IOException, GitAPIException { new File(tempDir, "test.txt").createNewFile(); git.add().addFilepattern(".").call(); - git.commit().setMessage("test").call(); + git.commit().setSign(false).setMessage("test").call(); if (credentialsProvider == null) { git.push().call(); diff --git a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java b/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java index 4f83ad3..2dcf719 100644 --- a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java +++ b/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java @@ -5,6 +5,7 @@ import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; +import org.apache.commons.io.FileUtils; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.TransportConfigCallback; import org.eclipse.jgit.api.errors.GitAPIException; @@ -21,7 +22,6 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import org.testcontainers.shaded.org.apache.commons.io.FileUtils; import org.testcontainers.utility.DockerImageName; import java.io.File; @@ -31,11 +31,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; -import java.util.stream.StreamSupport; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNoException; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.assertj.core.api.Assertions.assertThat; public class GitServerContainerTest { @@ -251,7 +250,7 @@ private void initSampleRepo(File sampleRepo, String repoContent) throws IOExcept Git repo = Git.init().setDirectory(sampleRepo).setInitialBranch("main").call(); repo.add().addFilepattern("testFile").call(); - repo.commit().setAuthor("Sandra Parsick", "sample@example.com").setMessage("init").call(); + repo.commit().setSign(false).setAuthor("Sandra Parsick", "sample@example.com").setMessage("init").call(); } private static void configureWithPasswordAndNoHostKeyChecking(Transport transport) {