Skip to content

Commit

Permalink
project: upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@ibodrov
ibodrov committed Apr 9, 2024
1 parent fde3292 commit 54c2024
Show file tree
Hide file tree
Showing 32 changed files with 261 additions and 218 deletions.
4 changes: 2 additions & 2 deletions client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-jetty12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
38 changes: 9 additions & 29 deletions client2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>

<!-- JSON processing: jackson -->
<dependency>
Expand Down Expand Up @@ -66,8 +70,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-jetty12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -133,37 +137,13 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.revapi</groupId>
<artifactId>revapi-maven-plugin</artifactId>
<configuration>
<analysisConfiguration>
<revapi.differences>
<differences>
<item>
<ignore>true</ignore>
<code>java.annotation.attributeValueChanged</code>
<old>class com.walmartlabs.concord.client2.UserEntry</old>
<justification>Adding field to json-serializable class</justification>
</item>
<item>
<ignore>true</ignore>
<code>java.field.serialVersionUIDUnchanged</code>
<old>field com.walmartlabs.concord.client2.UserEntry.serialVersionUID</old>
<justification>Adding field to json-serializable class</justification>
</item>
</differences>
</revapi.differences>
<revapi.ignore>
<item>
<code>java.class.nonPublicPartOfAPI</code>
</item>
<item>
<code>java.class.removed</code>
</item>
</revapi.ignore>
</analysisConfiguration>
<!-- lots of incompatible changes due to breaking changes in dependencies -->
<!-- re-enable after release -->
<skip>true</skip>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion it/compat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<server.image>walmartlabs/concord-server</server.image>
<prev.agent.image>walmartlabs/concord-agent:${prev.concord.version}</prev.agent.image>

<ryuk.image>quay.io/testcontainers/ryuk:0.2.3</ryuk.image>
<ryuk.image>testcontainers/ryuk:0.6.0</ryuk.image>
</properties>

<dependencies>
Expand Down
7 changes: 1 addition & 6 deletions it/runtime-v1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<db.image>library/postgres:10</db.image>
<server.image>walmartlabs/concord-server</server.image>
<agent.image>walmartlabs/concord-agent</agent.image>
<ryuk.image>quay.io/testcontainers/ryuk:0.2.3</ryuk.image>
<ryuk.image>testcontainers/ryuk:0.6.0</ryuk.image>
</properties>

<dependencies>
Expand Down Expand Up @@ -85,11 +85,6 @@
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.googlecode.junit-toolbox</groupId>
<artifactId>junit-toolbox</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
8 changes: 4 additions & 4 deletions it/runtime-v2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<db.image>library/postgres:10</db.image>
<server.image>walmartlabs/concord-server</server.image>
<agent.image>walmartlabs/concord-agent</agent.image>
<ryuk.image>quay.io/testcontainers/ryuk:0.2.3</ryuk.image>
<sshd.image>quay.io/testcontainers/sshd:latest</sshd.image>
<ryuk.image>testcontainers/ryuk:0.6.0</ryuk.image>
<sshd.image>testcontainers/sshd:latest</sshd.image>
</properties>

<dependencies>
Expand Down Expand Up @@ -96,8 +96,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-jetty12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 1 addition & 2 deletions it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/TemplateIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import ca.ibodrov.concord.testcontainers.ContainerType;
import ca.ibodrov.concord.testcontainers.junit5.ConcordRule;
import com.github.tomakehurst.wiremock.client.WireMock;
import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
import com.walmartlabs.concord.client2.*;
import com.walmartlabs.concord.common.IOUtils;
Expand Down Expand Up @@ -57,7 +56,7 @@ public class TemplateIT extends AbstractTest {
public static WireMockExtension rule = WireMockExtension.newInstance()
.options(wireMockConfig()
.dynamicPort()
.extensions(new ResponseTemplateTransformer(false)))
.globalTemplating(true))
.build();

@RegisterExtension
Expand Down
9 changes: 2 additions & 7 deletions it/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-jetty12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -157,11 +157,6 @@
<artifactId>commons-compress</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.googlecode.junit-toolbox</groupId>
<artifactId>junit-toolbox</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
Expand Down
18 changes: 10 additions & 8 deletions it/server/src/test/java/com/walmartlabs/concord/it/server/DependencyManagerIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
* =====
*/

import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
import com.walmartlabs.concord.client2.ProcessEntry;
import com.walmartlabs.concord.client2.StartProcessResponse;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -39,17 +39,19 @@
import static com.walmartlabs.concord.it.common.ServerClient.assertLog;
import static com.walmartlabs.concord.it.common.ServerClient.waitForStatus;

@Disabled("needs a fix for new wiremock version")
public class DependencyManagerIT extends AbstractServerIT {

@RegisterExtension
static WireMockExtension rule = WireMockExtension.newInstance()
.options(wireMockConfig()
.dynamicPort()
.extensions(new HttpTaskIT.RequestHeaders(), new ResponseTemplateTransformer(false)))
.globalTemplating(true)
.extensions(new HttpTaskIT.RequestHeaders()))
.build();

@BeforeEach
public void setUp() {
@BeforeAll
public static void setUp() {
rule.stubFor(get(urlEqualTo("/item.txt"))
.willReturn(aResponse()
.withStatus(200)
Expand All @@ -58,8 +60,8 @@ public void setUp() {
);
}

@AfterEach
public void tearDown() {
@AfterAll
public static void tearDown() {
rule.shutdownServer();
}

Expand Down
48 changes: 22 additions & 26 deletions it/server/src/test/java/com/walmartlabs/concord/it/server/HttpTaskIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,12 @@
import com.github.tomakehurst.wiremock.common.FileSource;
import com.github.tomakehurst.wiremock.extension.Parameters;
import com.github.tomakehurst.wiremock.extension.ResponseDefinitionTransformer;
import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
import com.github.tomakehurst.wiremock.http.HttpHeader;
import com.github.tomakehurst.wiremock.http.Request;
import com.github.tomakehurst.wiremock.http.ResponseDefinition;
import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
import com.walmartlabs.concord.client2.ProcessApi;
import com.walmartlabs.concord.client2.ProcessEntry;
import com.walmartlabs.concord.client2.StartProcessResponse;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -77,7 +74,8 @@ public class HttpTaskIT extends AbstractServerIT {
final WireMockExtension rule = WireMockExtension.newInstance()
.options(wireMockConfig()
.dynamicPort()
.extensions(new RequestHeaders(), new ResponseTemplateTransformer(false)))
.globalTemplating(true)
.extensions(new RequestHeaders()))
.build();

@BeforeEach
Expand Down Expand Up @@ -106,8 +104,6 @@ public void testGetAsString() throws Exception {
URI dir = HttpTaskIT.class.getResource("httpGetAsString").toURI();
byte[] payload = archive(dir);

ProcessApi processApi = new ProcessApi(getApiClient());

Map<String, Object> input = new HashMap<>();
input.put("archive", payload);
input.put("arguments.url", SERVER_URL + mockHttpPathPing);
Expand Down Expand Up @@ -435,8 +431,8 @@ private void stubForGetAsStringEndpoint(String url) {
.willReturn(aResponse()
.withStatus(200)
.withBody("{\n" +
" \"Success\": \"true\"\n" +
"}"))
" \"Success\": \"true\"\n" +
"}"))
);
}

Expand All @@ -446,10 +442,10 @@ private void stubForGetWithQueryEndpoint(String url) {
.willReturn(aResponse()
.withStatus(200)
.withBody("{\n" +
" \"message\": \"{{request.requestLine.query.message}}\", " +
" \"multiValue1\": \"{{request.requestLine.query.multiValue.[0]}}\", " +
" \"multiValue2\": \"{{request.requestLine.query.multiValue.[1]}}\"" +
"}")
" \"message\": \"{{request.requestLine.query.message}}\", " +
" \"multiValue1\": \"{{request.requestLine.query.multiValue.[0]}}\", " +
" \"multiValue2\": \"{{request.requestLine.query.multiValue.[1]}}\"" +
"}")
.withTransformers("response-template"))
);

Expand All @@ -461,8 +457,8 @@ private void stubForGetSecureEndpoint(String user, String password, String url)
.willReturn(aResponse()
.withStatus(200)
.withBody("{\n" +
" \"Authorized\": \"true\"\n" +
"}"))
" \"Authorized\": \"true\"\n" +
"}"))
);
}

Expand All @@ -472,8 +468,8 @@ private void stubForGetSecureTokenEndpoint(String authToken, String url) {
.willReturn(aResponse()
.withStatus(200)
.withBody("{\n" +
" \"Authorized\": \"true\"\n" +
"}"))
" \"Authorized\": \"true\"\n" +
"}"))
);
}

Expand All @@ -483,8 +479,8 @@ private void stubForPostSecureEndpoint(String user, String password, String url)
.willReturn(aResponse()
.withStatus(200)
.withBody("{\n" +
" \"Authorized\": \"true\"\n" +
"}"))
" \"Authorized\": \"true\"\n" +
"}"))
);
}

Expand All @@ -494,8 +490,8 @@ private void stubForPostSecureTokenEndpoint(String authToken, String url) {
.willReturn(aResponse()
.withStatus(200)
.withBody("{\n" +
" \"Authorized\": \"true\"\n" +
"}"))
" \"Authorized\": \"true\"\n" +
"}"))
);
}

Expand All @@ -505,8 +501,8 @@ private void stubForPatchSecureTokenEndpoint(String authToken, String url) {
.willReturn(aResponse()
.withStatus(200)
.withBody("{\n" +
" \"Authorized\": \"true\"\n" +
"}"))
" \"Authorized\": \"true\"\n" +
"}"))
);
}

Expand All @@ -522,8 +518,8 @@ private void stubForUnAuthorizedRequestEndpoint(String url) {
.willReturn(aResponse()
.withStatus(401)
.withBody("{\n" +
" \"Authorized\": \"false\"\n" +
"}"))
" \"Authorized\": \"false\"\n" +
"}"))
);
}

Expand All @@ -540,8 +536,8 @@ private void stubForFormUrlEncodedEndpoint(String url) {
.willReturn(aResponse()
.withStatus(200)
.withBody("{\n" +
" \"Success\": \"true\"\n" +
"}")));
" \"Success\": \"true\"\n" +
"}")));
}

private void stubForRedirects(String url) {
Expand Down
8 changes: 6 additions & 2 deletions it/server/src/test/java/com/walmartlabs/concord/it/server/NodeRosterIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,18 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;

import static com.github.tomakehurst.wiremock.client.WireMock.*;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
import static com.walmartlabs.concord.it.common.ITUtils.archive;
import static com.walmartlabs.concord.it.common.ServerClient.assertLog;
import static com.walmartlabs.concord.it.common.ServerClient.waitForCompletion;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;

public class NodeRosterIT extends AbstractServerIT {

Expand Down
4 changes: 2 additions & 2 deletions plugins/tasks/http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-jetty12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit 54c2024

Please sign in to comment.