Skip to content

Commit

Permalink
Merge branch 'master' into ib/misc5
Browse files Browse the repository at this point in the history
  • Loading branch information
@ibodrov
ibodrov authored Jan 11, 2024
2 parents 9fc41c9 + 2c2962b commit 2c395bc
Show file tree
Hide file tree
Showing 183 changed files with 465 additions and 262 deletions.
25 changes: 25 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
# Change log

## [2.7.0] - 2024-01-08

### Added

- concord-cli: Add option for default task variables
([#848](https://github.com/walmartlabs/concord/pull/848)).

### Changed

- runtime-v2: resume event to json serialization fix
([#860](https://github.com/walmartlabs/concord/pull/860));
- project: drop siesta-server dependency
([#826](https://github.com/walmartlabs/concord/pull/826));
- resource-task: writeYaml: do not split YAML into multiple lines
([#854](https://github.com/walmartlabs/concord/pull/854));
- concord-server: logout any session on login failure
([#858](https://github.com/walmartlabs/concord/pull/858)).

### Breaking

- project: drop siesta-api dependency
([#857](https://github.com/walmartlabs/concord/pull/857)).



## [2.6.0] - 2023-12-28

### Added
Expand Down
2 changes: 1 addition & 1 deletion agent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion client2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion console2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion console2/src/api/common.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const parseTextError = async (resp: Response) => {

export const makeError = async (resp: Response): Promise<RequestError> => {
const contentType = resp.headers.get('Content-Type') || '';
if (contentType.indexOf('siesta') >= 0) {
if (contentType.indexOf('vnd.concord-validation-errors-v1+json') >= 0) {
return parseSiestaError(resp);
} else if (contentType.indexOf('json') >= 0) {
return parseJsonError(resp);
Expand Down
2 changes: 1 addition & 1 deletion dependency-manager/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion docker-images/agent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.docker</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion docker-images/ansible/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.docker</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion docker-images/base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord.docker</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion docker-images/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion docker-images/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.docker</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion forms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion imports/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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 @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/console/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/runtime-v1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/runtime-v2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/server/src/test/java/com/walmartlabs/concord/it/server/InventoryQueryIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private static void assertQuery(ApiClient client, String orgName, String invento

requestBuilder.header("Content-Type", contentType);
String acceptHeaderValue = "application/json";
acceptHeaderValue += ",application/vnd.siesta-validation-errors-v1+json";
acceptHeaderValue += ",application/vnd.concord-validation-errors-v1+json";
requestBuilder.header("Accept", acceptHeaderValue);
requestBuilder.method("POST", HttpRequest.BodyPublishers.ofString(data));

Expand Down
2 changes: 1 addition & 1 deletion it/tasks/broken-deps/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/tasks/client1-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/tasks/dependency-manager-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/tasks/serialization-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/tasks/suspend-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion it/testing-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.it</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion k8s/agent-operator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/tasks/ansible/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.plugins.basic</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/tasks/concord/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.walmartlabs.concord.plugins.basic</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/tasks/crypto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.plugins.basic</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/tasks/docker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.plugins.basic</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/tasks/dynamic-tasks/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.plugins.basic</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/tasks/example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.plugins.basic</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/tasks/files/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.plugins.basic</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/tasks/http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.plugins.basic</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/tasks/kv/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.plugins.basic</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/tasks/locale/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.walmartlabs.concord.plugins.basic</groupId>
<artifactId>parent</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Loading

0 comments on commit 2c395bc

Please sign in to comment.