Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit d0a8c7c

Browse files
committed
Remove palantir repo
- Switch to use our own cleaned fork in IT tests. - Backport #4465 - Fixes #4479
1 parent 7fef40a commit d0a8c7c

File tree

3 files changed

+14
-25
lines changed

3 files changed

+14
-25
lines changed

pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
<apache-directory-server.version>1.5.5</apache-directory-server.version>
8989
<codearte-props2yml.version>0.5</codearte-props2yml.version>
9090
<json-unit.version>2.11.1</json-unit.version>
91-
<docker-compose-rule.version>1.4.2</docker-compose-rule.version>
9291
<findbugs.version>3.0.2</findbugs.version>
9392
<prometheus-rsocket-spring.version>1.2.1</prometheus-rsocket-spring.version>
9493
<joda-time.version>2.10.6</joda-time.version>
@@ -255,11 +254,6 @@
255254
<artifactId>json-unit-assertj</artifactId>
256255
<version>${json-unit.version}</version>
257256
</dependency>
258-
<dependency>
259-
<groupId>com.palantir.docker.compose</groupId>
260-
<artifactId>docker-compose-junit-jupiter</artifactId>
261-
<version>${docker-compose-rule.version}</version>
262-
</dependency>
263257
<dependency>
264258
<groupId>com.google.code.findbugs</groupId>
265259
<artifactId>jsr305</artifactId>

spring-cloud-dataflow-server/pom.xml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@
5050
<artifactId>spring-cloud-dataflow-rest-client</artifactId>
5151
<scope>test</scope>
5252
</dependency>
53+
<dependency>
54+
<groupId>org.springframework.cloud</groupId>
55+
<artifactId>spring-cloud-dataflow-common-test-docker-junit5</artifactId>
56+
<scope>test</scope>
57+
</dependency>
5358
<dependency>
5459
<groupId>net.javacrumbs.json-unit</groupId>
5560
<artifactId>json-unit-assertj</artifactId>
@@ -65,11 +70,6 @@
6570
<artifactId>junit-platform-runner</artifactId>
6671
<scope>test</scope>
6772
</dependency>
68-
<dependency>
69-
<groupId>com.palantir.docker.compose</groupId>
70-
<artifactId>docker-compose-junit-jupiter</artifactId>
71-
<scope>test</scope>
72-
</dependency>
7373
<dependency>
7474
<groupId>org.awaitility</groupId>
7575
<artifactId>awaitility</artifactId>
@@ -226,11 +226,4 @@
226226
</pluginRepositories>
227227
</profile>
228228
</profiles>
229-
230-
<repositories>
231-
<repository>
232-
<id>palantir</id>
233-
<url>https://dl.bintray.com/palantir/releases</url>
234-
</repository>
235-
</repositories>
236229
</project>

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/util/DockerComposeFactory.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 the original author or authors.
2+
* Copyright 2020-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,16 +21,17 @@
2121
import java.nio.file.Path;
2222
import java.util.Arrays;
2323

24-
import com.palantir.docker.compose.DockerComposeExtension;
25-
import com.palantir.docker.compose.configuration.DockerComposeFiles;
26-
import com.palantir.docker.compose.configuration.ProjectName;
27-
import com.palantir.docker.compose.connection.DockerMachine;
28-
import com.palantir.docker.compose.connection.waiting.HealthChecks;
2924
import org.junit.jupiter.api.extension.BeforeAllCallback;
3025
import org.junit.jupiter.api.extension.Extension;
3126
import org.slf4j.Logger;
3227
import org.slf4j.LoggerFactory;
3328

29+
import org.springframework.cloud.dataflow.common.test.docker.compose.configuration.DockerComposeFiles;
30+
import org.springframework.cloud.dataflow.common.test.docker.compose.configuration.ProjectName;
31+
import org.springframework.cloud.dataflow.common.test.docker.compose.connection.DockerMachine;
32+
import org.springframework.cloud.dataflow.common.test.docker.compose.connection.waiting.HealthChecks;
33+
import org.springframework.cloud.dataflow.common.test.docker.junit5.LegacyDockerComposeExtension;
34+
3435
/**
3536
* Factory utility that helps to install SCDF & Skipper from Docker Compose files.
3637
*
@@ -151,7 +152,7 @@ public static Extension startDockerCompose(Path tempFolder) {
151152
}
152153
logger.info("Extracted docker compose files = {}", Arrays.toString(dockerComposePaths));
153154

154-
return DockerComposeExtension.builder()
155+
return LegacyDockerComposeExtension.builder()
155156
.projectName(ProjectName.fromString("scdf"))
156157
.files(DockerComposeFiles.from(dockerComposePaths))
157158
.machine(dockerMachine)
@@ -163,6 +164,7 @@ public static Extension startDockerCompose(Path tempFolder) {
163164
// set to false to test with local dataflow and skipper images.
164165
.pullOnStartup(DockerComposeFactoryProperties.getBoolean(DockerComposeFactoryProperties.TEST_DOCKER_COMPOSE_PULLONSTARTUP, true))
165166
.build();
167+
166168
}
167169

168170
public static Path createTempDirectory() {

0 commit comments

Comments
 (0)