From 8d6154482d591be461f9acf916c6465b872cd0cc Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Wed, 1 Nov 2023 16:39:28 +0100 Subject: [PATCH 01/52] console2: calculate process duration from process.latRunAt (#794) --- console2/src/components/organisms/ProcessActivity/Toolbar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console2/src/components/organisms/ProcessActivity/Toolbar.tsx b/console2/src/components/organisms/ProcessActivity/Toolbar.tsx index 1594193938..6bbd3393f1 100644 --- a/console2/src/components/organisms/ProcessActivity/Toolbar.tsx +++ b/console2/src/components/organisms/ProcessActivity/Toolbar.tsx @@ -146,7 +146,7 @@ const renderProcessStatus = (process?: ProcessEntry) => { let duration; if (process.status === ProcessStatus.RUNNING) { - duration = formatDuration(new Date().getTime() - parseDate(process.createdAt).getTime()); + duration = formatDuration(new Date().getTime() - parseDate(process.lastRunAt || process.createdAt).getTime()); } return ( <> From f40fb6b3a39aa4068e09dc86314198cee9b49347 Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Mon, 6 Nov 2023 14:04:42 +0100 Subject: [PATCH 02/52] its: test for task with client1 (#825) --- it/pom.xml | 1 + .../filtered-resources/version.properties | 1 + .../concord/it/runtime/v1/ITConstants.java | 19 ++++++ .../concord/it/runtime/v1/ProcessIT.java | 25 ++++++++ .../it/runtime/v1/client1Task/concord.yml | 8 +++ .../concord/it/runtime/v2/ProcessIT.java | 16 +++++ .../it/runtime/v2/client1Task/concord.yml | 9 +++ it/tasks/client1-test/pom.xml | 52 ++++++++++++++++ .../it/tasks/suspendtest/Client1TestTask.java | 55 ++++++++++++++++ .../tasks/suspendtest/Client1TestTaskV2.java | 62 +++++++++++++++++++ 10 files changed, 248 insertions(+) create mode 100644 it/runtime-v1/src/test/filtered-resources/version.properties create mode 100644 it/runtime-v1/src/test/resources/com/walmartlabs/concord/it/runtime/v1/client1Task/concord.yml create mode 100644 it/runtime-v2/src/test/resources/com/walmartlabs/concord/it/runtime/v2/client1Task/concord.yml create mode 100644 it/tasks/client1-test/pom.xml create mode 100644 it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTask.java create mode 100644 it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTaskV2.java diff --git a/it/pom.xml b/it/pom.xml index 23ad1112a6..1b9a397927 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -18,6 +18,7 @@ tasks/dependency-manager-test tasks/serialization-test tasks/suspend-test + tasks/client1-test common server diff --git a/it/runtime-v1/src/test/filtered-resources/version.properties b/it/runtime-v1/src/test/filtered-resources/version.properties new file mode 100644 index 0000000000..7e48b881dd --- /dev/null +++ b/it/runtime-v1/src/test/filtered-resources/version.properties @@ -0,0 +1 @@ +project.version = ${project.version} \ No newline at end of file diff --git a/it/runtime-v1/src/test/java/com/walmartlabs/concord/it/runtime/v1/ITConstants.java b/it/runtime-v1/src/test/java/com/walmartlabs/concord/it/runtime/v1/ITConstants.java index 192d6b0852..2d12545b88 100644 --- a/it/runtime-v1/src/test/java/com/walmartlabs/concord/it/runtime/v1/ITConstants.java +++ b/it/runtime-v1/src/test/java/com/walmartlabs/concord/it/runtime/v1/ITConstants.java @@ -20,10 +20,29 @@ * ===== */ +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + public final class ITConstants { + public static final String PROJECT_VERSION; public static final long DEFAULT_TEST_TIMEOUT = 120000; + static { + PROJECT_VERSION = getProperties("version.properties").getProperty("project.version"); + } + + private static Properties getProperties(String path) { + try (InputStream in = ClassLoader.getSystemResourceAsStream(path)) { + Properties props = new Properties(); + props.load(in); + return props; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + private ITConstants() { } } diff --git a/it/runtime-v1/src/test/java/com/walmartlabs/concord/it/runtime/v1/ProcessIT.java b/it/runtime-v1/src/test/java/com/walmartlabs/concord/it/runtime/v1/ProcessIT.java index b8e9f63405..5fbf46b5c9 100644 --- a/it/runtime-v1/src/test/java/com/walmartlabs/concord/it/runtime/v1/ProcessIT.java +++ b/it/runtime-v1/src/test/java/com/walmartlabs/concord/it/runtime/v1/ProcessIT.java @@ -24,8 +24,11 @@ import ca.ibodrov.concord.testcontainers.Payload; import ca.ibodrov.concord.testcontainers.ProcessListQuery; import ca.ibodrov.concord.testcontainers.junit5.ConcordRule; +import com.google.common.base.Charsets; +import com.google.common.io.Resources; import com.walmartlabs.concord.client.FormListEntry; import com.walmartlabs.concord.client.FormSubmitResponse; +import com.walmartlabs.concord.client.ProcessCheckpointEntry; import com.walmartlabs.concord.client.ProcessEntry; import com.walmartlabs.concord.client.ProcessEntry.StatusEnum; import com.walmartlabs.concord.it.common.JGitUtils; @@ -35,8 +38,10 @@ import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; +import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import java.net.URL; import java.util.Collections; import java.util.List; import java.util.Map; @@ -517,6 +522,22 @@ public void testEmptyExclusiveGroup() throws Exception { proc.assertLog(".*Invalid exclusive mode.*"); } + @Test + public void testTaskWithClient1() throws Exception { + String concordYml = resourceToString(ProcessIT.class.getResource("client1Task/concord.yml")) + .replaceAll("PROJECT_VERSION", ITConstants.PROJECT_VERSION); + + Payload payload = new Payload().concordYml(concordYml); + + ConcordProcess proc = concord.processes().start(payload); + proc.expectStatus(StatusEnum.FINISHED); + + // --- + + proc.assertLog(".*process entry: RUNNING.*"); + proc.assertLog(".*Works!.*"); + } + @SuppressWarnings("unchecked") private static void assertProcessErrorMessage(ProcessEntry p, String expected) { assertNotNull(p); @@ -536,4 +557,8 @@ private static void assertProcessErrorMessage(ProcessEntry p, String expected) { private static URI resource(String name) throws URISyntaxException { return ProcessIT.class.getResource(name).toURI(); } + + private static String resourceToString(URL resource) throws IOException { + return Resources.toString(resource, Charsets.UTF_8); + } } diff --git a/it/runtime-v1/src/test/resources/com/walmartlabs/concord/it/runtime/v1/client1Task/concord.yml b/it/runtime-v1/src/test/resources/com/walmartlabs/concord/it/runtime/v1/client1Task/concord.yml new file mode 100644 index 0000000000..b66dff02df --- /dev/null +++ b/it/runtime-v1/src/test/resources/com/walmartlabs/concord/it/runtime/v1/client1Task/concord.yml @@ -0,0 +1,8 @@ +configuration: + dependencies: + - "mvn://com.walmartlabs.concord.it.tasks:client1-test:PROJECT_VERSION" + +flows: + default: + - task: client1Test + - log: "Works!" \ No newline at end of file diff --git a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ProcessIT.java b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ProcessIT.java index 9748625836..24fbb7798d 100644 --- a/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ProcessIT.java +++ b/it/runtime-v2/src/test/java/com/walmartlabs/concord/it/runtime/v2/ProcessIT.java @@ -496,4 +496,20 @@ public void testForkVariablesAfterForm() throws Exception { fork.assertLog(".*parentInstanceId: " + proc.instanceId() + ".*"); fork.assertLog(".*txId: " + fork.instanceId() + ".*"); } + + @Test + public void testTaskWithClient1() throws Exception { + String concordYml = resourceToString(ProcessIT.class.getResource("client1Task/concord.yml")) + .replaceAll("PROJECT_VERSION", ITConstants.PROJECT_VERSION); + + Payload payload = new Payload().concordYml(concordYml); + + ConcordProcess proc = concord.processes().start(payload); + expectStatus(proc, ProcessEntry.StatusEnum.FINISHED); + + // --- + + proc.assertLog(".*process entry: RUNNING.*"); + proc.assertLog(".*Works!.*"); + } } diff --git a/it/runtime-v2/src/test/resources/com/walmartlabs/concord/it/runtime/v2/client1Task/concord.yml b/it/runtime-v2/src/test/resources/com/walmartlabs/concord/it/runtime/v2/client1Task/concord.yml new file mode 100644 index 0000000000..29d3e6f7d4 --- /dev/null +++ b/it/runtime-v2/src/test/resources/com/walmartlabs/concord/it/runtime/v2/client1Task/concord.yml @@ -0,0 +1,9 @@ +configuration: + runtime: concord-v2 + dependencies: + - "mvn://com.walmartlabs.concord.it.tasks:client1-test:PROJECT_VERSION" + +flows: + default: + - task: client1Test + - log: "Works!" \ No newline at end of file diff --git a/it/tasks/client1-test/pom.xml b/it/tasks/client1-test/pom.xml new file mode 100644 index 0000000000..b9bf7233b2 --- /dev/null +++ b/it/tasks/client1-test/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + + com.walmartlabs.concord.it + parent + 2.1.1-SNAPSHOT + ../../pom.xml + + + com.walmartlabs.concord.it.tasks + client1-test + jar + + + + com.walmartlabs.concord + concord-sdk + provided + + + com.walmartlabs.concord.runtime.v2 + concord-runtime-sdk-v2 + provided + + + com.walmartlabs.concord + concord-client + provided + + + javax.inject + javax.inject + provided + + + org.slf4j + slf4j-api + provided + + + + + + + org.eclipse.sisu + sisu-maven-plugin + + + + diff --git a/it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTask.java b/it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTask.java new file mode 100644 index 0000000000..95fc7d15d1 --- /dev/null +++ b/it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTask.java @@ -0,0 +1,55 @@ +package com.walmartlabs.concord.it.tasks.suspendtest; + +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2023 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + +import com.walmartlabs.concord.ApiClient; +import com.walmartlabs.concord.client.ApiClientConfiguration; +import com.walmartlabs.concord.client.ApiClientFactory; +import com.walmartlabs.concord.client.ProcessApi; +import com.walmartlabs.concord.client.ProcessEntry; +import com.walmartlabs.concord.sdk.Context; +import com.walmartlabs.concord.sdk.ContextUtils; +import com.walmartlabs.concord.sdk.Task; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.inject.Inject; +import javax.inject.Named; + +@Named("client1Test") +public class Client1TestTask implements Task { + + private static final Logger log = LoggerFactory.getLogger(Client1TestTask.class); + + private final ApiClientFactory factory; + + @Inject + public Client1TestTask(ApiClientFactory factory) { + this.factory = factory; + } + + @Override + public void execute(Context ctx) throws Exception { + ProcessApi api = new ProcessApi(factory.create(ApiClientConfiguration.builder().context(ctx).build())); + ProcessEntry p = api.get(ContextUtils.getTxId(ctx)); + log.info("process entry: {}", p.getStatus()); + } +} diff --git a/it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTaskV2.java b/it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTaskV2.java new file mode 100644 index 0000000000..8545d8b881 --- /dev/null +++ b/it/tasks/client1-test/src/main/java/com/walmartlabs/concord/it/tasks/suspendtest/Client1TestTaskV2.java @@ -0,0 +1,62 @@ +package com.walmartlabs.concord.it.tasks.suspendtest; + +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2023 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + +import com.walmartlabs.concord.ApiClient; +import com.walmartlabs.concord.client.ApiClientFactory; +import com.walmartlabs.concord.client.ProcessApi; +import com.walmartlabs.concord.client.ProcessEntry; +import com.walmartlabs.concord.runtime.v2.sdk.Context; +import com.walmartlabs.concord.runtime.v2.sdk.Task; +import com.walmartlabs.concord.runtime.v2.sdk.TaskResult; +import com.walmartlabs.concord.runtime.v2.sdk.Variables; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.inject.Inject; +import javax.inject.Named; + +@Named("client1Test") +public class Client1TestTaskV2 implements Task { + + private static final Logger log = LoggerFactory.getLogger(Client1TestTaskV2.class); + + private final Context ctx; + private final ApiClient apiClient; + private final ApiClientFactory factory; + + @Inject + public Client1TestTaskV2(Context ctx, ApiClient apiClient, ApiClientFactory factory) { + this.ctx = ctx; + this.apiClient = apiClient; + this.factory = factory; + } + + @Override + public TaskResult execute(Variables input) throws Exception { + ProcessApi api = new ProcessApi(apiClient); + + ProcessEntry p = api.get(ctx.processInstanceId()); + log.info("process entry: {}", p.getStatus()); + + return TaskResult.success(); + } +} From d2a907184281689867020fb5d71556d478538f5c Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 7 Nov 2023 13:10:34 -0500 Subject: [PATCH 03/52] project: attach javadoc jars only on release (#823) --- pom.xml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index e37a78b86d..e055628856 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,6 @@ 5.8.2 3.5.1 - 3.1.2 16.13.1 1.12.0 @@ -414,24 +413,12 @@ org.apache.maven.plugins maven-dependency-plugin - ${maven.dependency.plugin.version} + 3.1.2 org.apache.maven.plugins maven-javadoc-plugin 3.2.0 - - - attach-javadocs - - jar - - - - - true - none - @@ -467,6 +454,22 @@ false + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + true + none + + From fedee9f08df20382f2d37db0d1f74dd5fb84547c Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Wed, 8 Nov 2023 01:43:18 +0100 Subject: [PATCH 04/52] project: upgrade to source level 17 (#824) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e055628856..961f2d3f7d 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,8 @@ - 1.8 - 1.8 + 17 + 17 UTF-8 UTF-8 From d4040c1955051cdd246e1cb6a409c4a41d4b6e37 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Wed, 8 Nov 2023 15:20:46 -0500 Subject: [PATCH 05/52] concord-server: externalize config object Allow instantiation of ConcordServerModule with a custom config object. --- .../concord/server/ConcordServer.java | 3 ++- .../concord/server/ConcordServerModule.java | 23 +++++++++++++++++-- .../server/cfg/ConfigurationModule.java | 15 ++++++------ 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java b/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java index d4f06884a6..9e865ca4e3 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java @@ -55,7 +55,8 @@ public final class ConcordServer { */ public static ConcordServer withAutoWiring() throws Exception { ClassLoader cl = ConcordServer.class.getClassLoader(); - return withModules(new WireModule(new SpaceModule(new URLClassSpace(cl), BeanScanning.GLOBAL_INDEX))); + return withModules( + new WireModule(new SpaceModule(new URLClassSpace(cl), BeanScanning.GLOBAL_INDEX))); } /** diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServerModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServerModule.java index 6bbeeb0cda..f588a18979 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServerModule.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServerModule.java @@ -11,7 +11,7 @@ * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,6 +22,7 @@ import com.google.inject.Binder; import com.google.inject.Module; +import com.typesafe.config.Config; import com.walmartlabs.concord.db.DatabaseModule; import com.walmartlabs.concord.server.agent.AgentModule; import com.walmartlabs.concord.server.audit.AuditLogModule; @@ -38,6 +39,9 @@ import com.walmartlabs.concord.server.security.apikey.ApiKeyModule; import com.walmartlabs.concord.server.task.TaskSchedulerModule; import com.walmartlabs.concord.server.template.TemplateModule; +import com.walmartlabs.ollie.config.ConfigurationProcessor; +import com.walmartlabs.ollie.config.Environment; +import com.walmartlabs.ollie.config.EnvironmentSelector; import javax.inject.Named; @@ -50,9 +54,19 @@ @Named public class ConcordServerModule implements Module { + private final Config config; + + public ConcordServerModule() { + this(loadDefaultConfig()); + } + + public ConcordServerModule(Config config) { + this.config = config; + } + @Override public void configure(Binder binder) { - binder.install(new ConfigurationModule()); + binder.install(new ConfigurationModule(config)); binder.install(new MetricModule()); binder.install(new DatabaseConfigurationModule()); @@ -75,4 +89,9 @@ public void configure(Binder binder) { bindJaxRsResource(binder, ServerResource.class); } + + private static Config loadDefaultConfig() { + Environment env = new EnvironmentSelector().select(); + return new ConfigurationProcessor("concord-server", env, null, null).process(); + } } diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/cfg/ConfigurationModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/cfg/ConfigurationModule.java index 21b3482b34..67f91e7679 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/cfg/ConfigurationModule.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/cfg/ConfigurationModule.java @@ -22,20 +22,21 @@ import com.google.inject.Binder; import com.google.inject.Module; -import com.walmartlabs.ollie.config.ConfigurationProcessor; -import com.walmartlabs.ollie.config.Environment; -import com.walmartlabs.ollie.config.EnvironmentSelector; -import com.walmartlabs.ollie.config.OllieConfigurationModule; +import com.typesafe.config.Config; import static com.google.inject.Scopes.SINGLETON; public class ConfigurationModule implements Module { + private final Config config; + + public ConfigurationModule(Config config) { + this.config = config; + } + @Override public void configure(Binder binder) { - Environment env = new EnvironmentSelector().select(); - com.typesafe.config.Config config = new ConfigurationProcessor("concord-server", env, null, null).process(); - binder.install(new OllieConfigurationModule("com.walmartlabs.concord.server", config)); + binder.install(new com.walmartlabs.ollie.config.OllieConfigurationModule("com.walmartlabs.concord.server", config)); binder.bind(AgentConfiguration.class).in(SINGLETON); binder.bind(ApiKeyConfiguration.class).in(SINGLETON); From 7111b3c6c9e4fac716776726736c478d4f6b0ec4 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Wed, 8 Nov 2023 17:11:18 -0500 Subject: [PATCH 06/52] concord-targetplatform: add testcontainers postgresql dependency --- targetplatform/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index 9c2fc07791..e2c0c6919e 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -1179,6 +1179,11 @@ testcontainers ${testcontainers.version} + + org.testcontainers + postgresql + ${testcontainers.version} + uk.org.lidalia sysout-over-slf4j From 0d9d0d4685e9d1abf71bf4ce59a2135f64279b98 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Wed, 8 Nov 2023 17:11:49 -0500 Subject: [PATCH 07/52] concord-server: remove more @Named --- .../concord/server/ConcordServerModule.java | 11 ++- ...ependencyManagerConfigurationProvider.java | 2 - .../concord/server/audit/AuditLogModule.java | 3 + .../concord/server/events/EventModule.java | 35 +++++++++ .../concord/server/metrics/MetricModule.java | 8 ++- .../server/metrics/MetricsRegistrator.java | 8 +-- .../server/org/secret/SecretModule.java | 36 ++++++++++ .../secret/provider/SecretStoreProvider.java | 5 +- .../store/concord/ConcordSecretStore.java | 2 - .../{ => process}/ImportManagerProvider.java | 4 +- .../concord/server/process/ProcessModule.java | 33 ++++++++- .../processors/ExclusiveGroupProcessor.java | 71 ++++++++++--------- .../processors/ForkPolicyProcessor.java | 3 +- .../policy/ContainerPolicyApplier.java | 2 - .../processors/policy/FilePolicyApplier.java | 2 - .../policy/ProcessRuntimePolicyApplier.java | 2 - .../policy/ProcessTimeoutPolicyApplier.java | 2 - .../policy/WorkspacePolicyApplier.java | 2 - .../queue/ExternalProcessListenerHandler.java | 2 - .../process/queue/ProcessQueueManager.java | 4 +- .../dispatcher/ConcurrentProcessFilter.java | 2 - .../dispatcher/ExclusiveProcessFilter.java | 2 - .../waits/WaitProcessFinishHandler.java | 1 - .../process/waits/WaitProcessLockHandler.java | 2 - .../waits/WaitProcessSleepHandler.java | 2 - .../waits/WaitProcessStatusListener.java | 1 - .../server/security/SecurityModule.java | 11 ++- .../ldap/LdapContextFactoryProvider.java | 1 - .../security/ldap/LdapManagerProvider.java | 4 +- 29 files changed, 180 insertions(+), 83 deletions(-) create mode 100644 server/impl/src/main/java/com/walmartlabs/concord/server/events/EventModule.java create mode 100644 server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretModule.java rename server/impl/src/main/java/com/walmartlabs/concord/server/{ => process}/ImportManagerProvider.java (98%) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServerModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServerModule.java index f588a18979..14314e1d0a 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServerModule.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServerModule.java @@ -24,18 +24,22 @@ import com.google.inject.Module; import com.typesafe.config.Config; import com.walmartlabs.concord.db.DatabaseModule; +import com.walmartlabs.concord.dependencymanager.DependencyManagerConfiguration; import com.walmartlabs.concord.server.agent.AgentModule; import com.walmartlabs.concord.server.audit.AuditLogModule; import com.walmartlabs.concord.server.boot.BackgroundTasks; import com.walmartlabs.concord.server.cfg.ConfigurationModule; import com.walmartlabs.concord.server.cfg.DatabaseConfigurationModule; import com.walmartlabs.concord.server.console.ConsoleModule; +import com.walmartlabs.concord.server.events.EventModule; import com.walmartlabs.concord.server.metrics.MetricModule; +import com.walmartlabs.concord.server.org.secret.SecretModule; import com.walmartlabs.concord.server.org.triggers.TriggersModule; import com.walmartlabs.concord.server.policy.PolicyModule; import com.walmartlabs.concord.server.process.ProcessModule; import com.walmartlabs.concord.server.repository.RepositoryModule; import com.walmartlabs.concord.server.role.RoleModule; +import com.walmartlabs.concord.server.security.SecurityModule; import com.walmartlabs.concord.server.security.apikey.ApiKeyModule; import com.walmartlabs.concord.server.task.TaskSchedulerModule; import com.walmartlabs.concord.server.template.TemplateModule; @@ -75,15 +79,20 @@ public void configure(Binder binder) { binder.install(new TaskSchedulerModule()); binder.bind(BackgroundTasks.class).in(SINGLETON); + binder.bind(DependencyManagerConfiguration.class).toProvider(DependencyManagerConfigurationProvider.class); + binder.install(new AgentModule()); binder.install(new ApiKeyModule()); - binder.install(new ConsoleModule()); binder.install(new ApiServerModule()); binder.install(new AuditLogModule()); + binder.install(new ConsoleModule()); + binder.install(new EventModule()); binder.install(new PolicyModule()); binder.install(new ProcessModule()); binder.install(new RepositoryModule()); binder.install(new RoleModule()); + binder.install(new SecretModule()); + binder.install(new SecurityModule()); binder.install(new TemplateModule()); binder.install(new TriggersModule()); diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/DependencyManagerConfigurationProvider.java b/server/impl/src/main/java/com/walmartlabs/concord/server/DependencyManagerConfigurationProvider.java index fff50d3a6d..f9b1ddaef0 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/DependencyManagerConfigurationProvider.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/DependencyManagerConfigurationProvider.java @@ -24,11 +24,9 @@ import com.walmartlabs.concord.server.cfg.DependenciesConfiguration; import javax.inject.Inject; -import javax.inject.Named; import javax.inject.Provider; import javax.inject.Singleton; -@Named @Singleton public class DependencyManagerConfigurationProvider implements Provider { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/audit/AuditLogModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/audit/AuditLogModule.java index 67acf151cc..ee54ad8c78 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/audit/AuditLogModule.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/audit/AuditLogModule.java @@ -22,7 +22,9 @@ import com.google.inject.Binder; import com.google.inject.Module; +import com.walmartlabs.concord.server.sdk.audit.AuditLogListener; +import static com.google.inject.multibindings.Multibinder.newSetBinder; import static com.walmartlabs.concord.server.Utils.bindJaxRsResource; import static com.walmartlabs.concord.server.Utils.bindSingletonScheduledTask; @@ -30,6 +32,7 @@ public class AuditLogModule implements Module { @Override public void configure(Binder binder) { + newSetBinder(binder, AuditLogListener.class); bindSingletonScheduledTask(binder, AuditLogCleaner.class); bindJaxRsResource(binder, AuditLogResource.class); } diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/events/EventModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/events/EventModule.java new file mode 100644 index 0000000000..4a994d2928 --- /dev/null +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/events/EventModule.java @@ -0,0 +1,35 @@ +package com.walmartlabs.concord.server.events; + +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2023 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + +import com.google.inject.Binder; +import com.google.inject.Module; +import com.walmartlabs.concord.server.sdk.events.ProcessEventListener; + +import static com.google.inject.multibindings.Multibinder.newSetBinder; + +public class EventModule implements Module { + + @Override + public void configure(Binder binder) { + newSetBinder(binder, ProcessEventListener.class); + } +} diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/metrics/MetricModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/metrics/MetricModule.java index dfaf9a6634..7aaec78d29 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/metrics/MetricModule.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/metrics/MetricModule.java @@ -24,9 +24,11 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.matcher.Matchers; +import com.walmartlabs.concord.server.sdk.metrics.GaugeProvider; import com.walmartlabs.concord.server.sdk.metrics.WithTimer; import static com.google.inject.Scopes.SINGLETON; +import static com.google.inject.multibindings.Multibinder.newSetBinder; import static com.walmartlabs.concord.server.Utils.bindServletHolder; import static com.walmartlabs.concord.server.Utils.bindSingletonBackgroundTask; import static com.walmartlabs.concord.server.metrics.NoSyntheticMethodMatcher.INSTANCE; @@ -35,6 +37,10 @@ public class MetricModule implements Module { @Override public void configure(Binder binder) { + // common + + newSetBinder(binder, GaugeProvider.class); + // registry binder.bind(MetricRegistry.class).toProvider(MetricRegistryProvider.class).in(SINGLETON); @@ -50,9 +56,9 @@ public void configure(Binder binder) { // tasks - bindSingletonBackgroundTask(binder, MetricsRegistrator.class); bindSingletonBackgroundTask(binder, FailedTaskMetrics.class); bindSingletonBackgroundTask(binder, WorkerMetrics.class); + bindSingletonBackgroundTask(binder, MetricsRegistrator.class); // the /metrics endpoint diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/metrics/MetricsRegistrator.java b/server/impl/src/main/java/com/walmartlabs/concord/server/metrics/MetricsRegistrator.java index 6cf20fb500..bb7cd49222 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/metrics/MetricsRegistrator.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/metrics/MetricsRegistrator.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -33,10 +33,10 @@ public class MetricsRegistrator implements BackgroundTask { private final MetricRegistry registry; - private final Set> gauges; + private final Set gauges; @Inject - public MetricsRegistrator(MetricRegistry registry, Set> gauges) { + public MetricsRegistrator(MetricRegistry registry, Set gauges) { this.registry = registry; this.gauges = gauges; } diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretModule.java new file mode 100644 index 0000000000..87cc8b63f7 --- /dev/null +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/SecretModule.java @@ -0,0 +1,36 @@ +package com.walmartlabs.concord.server.org.secret; + +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2023 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + +import com.google.inject.Binder; +import com.google.inject.Module; +import com.walmartlabs.concord.server.org.secret.store.SecretStore; +import com.walmartlabs.concord.server.org.secret.store.concord.ConcordSecretStore; + +import static com.google.inject.multibindings.Multibinder.newSetBinder; + +public class SecretModule implements Module { + + @Override + public void configure(Binder binder) { + newSetBinder(binder, SecretStore.class).addBinding().to(ConcordSecretStore.class); + } +} diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/provider/SecretStoreProvider.java b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/provider/SecretStoreProvider.java index 6e02a80dfa..aabc08e68c 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/provider/SecretStoreProvider.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/provider/SecretStoreProvider.java @@ -27,16 +27,17 @@ import javax.inject.Named; import java.util.ArrayList; import java.util.Collection; +import java.util.Set; @Named public class SecretStoreProvider { - private final Collection stores; + private final Set stores; private final int maxSecretDataSize; private final String defaultSecretStoreType; @Inject - public SecretStoreProvider(Collection stores, + public SecretStoreProvider(Set stores, @Config("secretStore.maxSecretDataSize") int maxSecretDataSize, @Config("secretStore.default") String defaultStore) { this.stores = stores; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/store/concord/ConcordSecretStore.java b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/store/concord/ConcordSecretStore.java index 5410c1aac3..7ca1313cc1 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/store/concord/ConcordSecretStore.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/org/secret/store/concord/ConcordSecretStore.java @@ -30,8 +30,6 @@ import javax.inject.Singleton; import java.util.UUID; -@Named("concordSecretStore") -@Singleton public class ConcordSecretStore implements SecretStore { private static final String TYPE = "concord"; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/ImportManagerProvider.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ImportManagerProvider.java similarity index 98% rename from server/impl/src/main/java/com/walmartlabs/concord/server/ImportManagerProvider.java rename to server/impl/src/main/java/com/walmartlabs/concord/server/process/ImportManagerProvider.java index 5a42cb9bdf..2fbd7878f7 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/ImportManagerProvider.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ImportManagerProvider.java @@ -1,4 +1,4 @@ -package com.walmartlabs.concord.server; +package com.walmartlabs.concord.server.process; /*- * ***** @@ -35,13 +35,11 @@ import com.walmartlabs.concord.server.repository.RepositoryManager; import javax.inject.Inject; -import javax.inject.Named; import javax.inject.Provider; import java.nio.file.Path; import java.util.Objects; import java.util.UUID; -@Named public class ImportManagerProvider implements Provider { private final ImportManagerFactory factory; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessModule.java index 7e76673f0d..014cf6a908 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessModule.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessModule.java @@ -22,12 +22,21 @@ import com.google.inject.Binder; import com.google.inject.Module; +import com.walmartlabs.concord.imports.ImportManager; import com.walmartlabs.concord.server.process.locks.ProcessLocksWatchdog; +import com.walmartlabs.concord.server.process.pipelines.processors.ExclusiveGroupProcessor; +import com.walmartlabs.concord.server.process.pipelines.processors.policy.*; import com.walmartlabs.concord.server.process.queue.EnqueuedTaskProvider; +import com.walmartlabs.concord.server.process.queue.ExternalProcessListenerHandler; import com.walmartlabs.concord.server.process.queue.ProcessQueueWatchdog; +import com.walmartlabs.concord.server.process.queue.ProcessStatusListener; +import com.walmartlabs.concord.server.process.queue.dispatcher.ConcurrentProcessFilter; import com.walmartlabs.concord.server.process.queue.dispatcher.Dispatcher; -import com.walmartlabs.concord.server.process.waits.ProcessWaitWatchdog; +import com.walmartlabs.concord.server.process.queue.dispatcher.ExclusiveProcessFilter; +import com.walmartlabs.concord.server.process.queue.dispatcher.Filter; +import com.walmartlabs.concord.server.process.waits.*; import com.walmartlabs.concord.server.sdk.BackgroundTask; +import com.walmartlabs.concord.server.sdk.log.ProcessLogListener; import static com.google.inject.Scopes.SINGLETON; import static com.google.inject.multibindings.Multibinder.newSetBinder; @@ -37,6 +46,8 @@ public class ProcessModule implements Module { @Override public void configure(Binder binder) { + binder.bind(ImportManager.class).toProvider(ImportManagerProvider.class); + bindSingletonScheduledTask(binder, ProcessCleaner.class); bindSingletonScheduledTask(binder, ProcessLocksWatchdog.class); bindSingletonScheduledTask(binder, ProcessQueueWatchdog.class); @@ -46,5 +57,25 @@ public void configure(Binder binder) { newSetBinder(binder, BackgroundTask.class).addBinding().to(Dispatcher.class); newSetBinder(binder, BackgroundTask.class).addBinding().toProvider(EnqueuedTaskProvider.class).in(SINGLETON); + + newSetBinder(binder, ProcessStatusListener.class).addBinding().to(WaitProcessStatusListener.class); + newSetBinder(binder, ProcessStatusListener.class).addBinding().to(ExternalProcessListenerHandler.class); + + newSetBinder(binder, Filter.class).addBinding().to(ConcurrentProcessFilter.class); + newSetBinder(binder, Filter.class).addBinding().to(ExclusiveProcessFilter.class); + + newSetBinder(binder, ProcessWaitHandler.class).addBinding().to(WaitProcessFinishHandler.class); + newSetBinder(binder, ProcessWaitHandler.class).addBinding().to(WaitProcessLockHandler.class); + newSetBinder(binder, ProcessWaitHandler.class).addBinding().to(WaitProcessSleepHandler.class); + + newSetBinder(binder, ProcessLogListener.class); + + binder.install(new ExclusiveGroupProcessor.ModeProcessorModule()); + + newSetBinder(binder, PolicyApplier.class).addBinding().to(ContainerPolicyApplier.class); + newSetBinder(binder, PolicyApplier.class).addBinding().to(FilePolicyApplier.class); + newSetBinder(binder, PolicyApplier.class).addBinding().to(ProcessRuntimePolicyApplier.class); + newSetBinder(binder, PolicyApplier.class).addBinding().to(ProcessTimeoutPolicyApplier.class); + newSetBinder(binder, PolicyApplier.class).addBinding().to(WorkspacePolicyApplier.class); } } diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ExclusiveGroupProcessor.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ExclusiveGroupProcessor.java index f9777ce963..56839bd9b7 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ExclusiveGroupProcessor.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ExclusiveGroupProcessor.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,8 @@ * ===== */ +import com.google.inject.Binder; +import com.google.inject.Module; import com.walmartlabs.concord.db.AbstractDao; import com.walmartlabs.concord.db.MainDB; import com.walmartlabs.concord.runtime.v2.model.ExclusiveMode; @@ -37,12 +39,10 @@ import javax.inject.Inject; import javax.inject.Named; import java.time.OffsetDateTime; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; +import static com.google.inject.multibindings.Multibinder.newSetBinder; import static com.walmartlabs.concord.db.PgUtils.jsonbText; import static com.walmartlabs.concord.server.jooq.Tables.PROCESS_QUEUE; import static org.jooq.impl.DSL.*; @@ -60,7 +60,7 @@ public class ExclusiveGroupProcessor implements PayloadProcessor { @Inject public ExclusiveGroupProcessor(ProcessLogManager logManager, - List processors) { + Set processors) { this.logManager = logManager; this.processors = processors.stream().collect(Collectors.toMap(ModeProcessor::mode, v -> v)); @@ -94,6 +94,15 @@ public Payload process(Chain chain, Payload payload) { return payload; } + public static class ModeProcessorModule implements Module { + + @Override + public void configure(Binder binder) { + newSetBinder(binder, ModeProcessor.class).addBinding().to(CancelModeProcessor.class); + newSetBinder(binder, ModeProcessor.class).addBinding().to(CancelOldModeProcessor.class); + } + } + interface ModeProcessor { boolean process(Payload payload, ExclusiveMode exclusive); @@ -101,7 +110,6 @@ interface ModeProcessor { ExclusiveMode.Mode mode(); } - @Named static class CancelModeProcessor implements ModeProcessor { private static final long LOCK_KEY = 1562319227723L; @@ -152,7 +160,6 @@ public ExclusiveMode.Mode mode() { } } - @Named static class CancelOldModeProcessor implements ModeProcessor { private static final long LOCK_KEY = 1562319227723L; @@ -231,7 +238,7 @@ public ProcessKey newProcess() { } @Named - static class CancelModeDao extends AbstractDao { + static class CancelModeDao extends AbstractDao { private static final List RUNNING_STATUSES = Arrays.asList( ProcessStatus.NEW, @@ -255,11 +262,11 @@ public T txResult(TxResult t) { public boolean exists(DSLContext tx, UUID currentInstanceId, UUID parentInstanceId, UUID projectId, String exclusiveGroup) { SelectConditionStep> s = tx.selectOne() - .from(PROCESS_QUEUE) - .where(jsonbText(PROCESS_QUEUE.EXCLUSIVE, "group").eq(exclusiveGroup) - .and(PROCESS_QUEUE.PROJECT_ID.eq(projectId) - .and(PROCESS_QUEUE.INSTANCE_ID.notEqual(currentInstanceId) - .and(PROCESS_QUEUE.CURRENT_STATUS.in(RUNNING_STATUSES))))); + .from(PROCESS_QUEUE) + .where(jsonbText(PROCESS_QUEUE.EXCLUSIVE, "group").eq(exclusiveGroup) + .and(PROCESS_QUEUE.PROJECT_ID.eq(projectId) + .and(PROCESS_QUEUE.INSTANCE_ID.notEqual(currentInstanceId) + .and(PROCESS_QUEUE.CURRENT_STATUS.in(RUNNING_STATUSES))))); // parent's if (parentInstanceId != null) { @@ -271,7 +278,7 @@ public boolean exists(DSLContext tx, UUID currentInstanceId, UUID parentInstance } @Named - static class CancelOldModeDao extends AbstractDao { + static class CancelOldModeDao extends AbstractDao { private static final List CANCELLABLE_STATUSES = Arrays.asList( ProcessStatus.NEW, @@ -319,14 +326,14 @@ public ProcessKey anyNew(DSLContext tx, ProcessKey currentProcessKey, UUID proje .and(PROCESS_QUEUE.CURRENT_STATUS.in(CANCELLABLE_STATUSES))))); SelectJoinStep> children = tx.withRecursive("children").as( - select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID).from(ProcessQueue.PROCESS_QUEUE) - .where(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq(currentProcessKey.getInstanceId())) - .unionAll( - select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID) - .from(ProcessQueue.PROCESS_QUEUE) - .join(name("children")) - .on(ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID.eq( - field(name("children", "INSTANCE_ID"), UUID.class))))) + select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID).from(ProcessQueue.PROCESS_QUEUE) + .where(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq(currentProcessKey.getInstanceId())) + .unionAll( + select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID) + .from(ProcessQueue.PROCESS_QUEUE) + .join(name("children")) + .on(ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID.eq( + field(name("children", "INSTANCE_ID"), UUID.class))))) .select(field("children.INSTANCE_ID", UUID.class)) .from(name("children")); @@ -339,14 +346,14 @@ public ProcessKey anyNew(DSLContext tx, ProcessKey currentProcessKey, UUID proje private static SelectJoinStep> parents(DSLContext tx, UUID parentInstanceId) { return tx.withRecursive("parents").as( - select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID).from(ProcessQueue.PROCESS_QUEUE) - .where(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq(parentInstanceId)) - .unionAll( - select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID) - .from(ProcessQueue.PROCESS_QUEUE) - .join(name("parents")) - .on(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq( - field(name("parents", "PARENT_INSTANCE_ID"), UUID.class))))) + select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID).from(ProcessQueue.PROCESS_QUEUE) + .where(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq(parentInstanceId)) + .unionAll( + select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID) + .from(ProcessQueue.PROCESS_QUEUE) + .join(name("parents")) + .on(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq( + field(name("parents", "PARENT_INSTANCE_ID"), UUID.class))))) .select(field("parents.INSTANCE_ID", UUID.class)) .from(name("parents")); } diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ForkPolicyProcessor.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ForkPolicyProcessor.java index 6ccfcb2b61..5f08ff1c4b 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ForkPolicyProcessor.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ForkPolicyProcessor.java @@ -21,6 +21,7 @@ */ import com.walmartlabs.concord.db.AbstractDao; +import com.walmartlabs.concord.db.MainDB; import com.walmartlabs.concord.policyengine.CheckResult; import com.walmartlabs.concord.policyengine.ForkDepthRule; import com.walmartlabs.concord.policyengine.PolicyEngine; @@ -106,7 +107,7 @@ private String buildErrorMessage(List> private static class ForkDepthDao extends AbstractDao { @Inject - public ForkDepthDao(Configuration cfg) { + public ForkDepthDao(@MainDB Configuration cfg) { super(cfg); } diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ContainerPolicyApplier.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ContainerPolicyApplier.java index 777019044f..73b8c9466c 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ContainerPolicyApplier.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ContainerPolicyApplier.java @@ -33,7 +33,6 @@ import com.walmartlabs.concord.server.sdk.metrics.InjectCounter; import javax.inject.Inject; -import javax.inject.Named; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; @@ -42,7 +41,6 @@ import static com.walmartlabs.concord.server.process.pipelines.processors.policy.PolicyApplier.appendMsg; -@Named public class ContainerPolicyApplier implements PolicyApplier { private final ProcessLogManager logManager; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/FilePolicyApplier.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/FilePolicyApplier.java index 2e7ebd9082..1378b5ba10 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/FilePolicyApplier.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/FilePolicyApplier.java @@ -31,10 +31,8 @@ import com.walmartlabs.concord.server.sdk.metrics.InjectCounter; import javax.inject.Inject; -import javax.inject.Named; import java.nio.file.Path; -@Named public class FilePolicyApplier implements PolicyApplier { private final ProcessLogManager logManager; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ProcessRuntimePolicyApplier.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ProcessRuntimePolicyApplier.java index ce88740386..deda93a6ce 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ProcessRuntimePolicyApplier.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ProcessRuntimePolicyApplier.java @@ -32,7 +32,6 @@ import com.walmartlabs.concord.server.sdk.metrics.InjectCounter; import javax.inject.Inject; -import javax.inject.Named; import java.text.MessageFormat; import java.time.OffsetDateTime; import java.util.Objects; @@ -40,7 +39,6 @@ import java.util.UUID; import java.util.function.Supplier; -@Named public class ProcessRuntimePolicyApplier implements PolicyApplier { private static final String DEFAULT_PROCESS_TIMEOUT_MSG = "{0} runtime version is not allowed"; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ProcessTimeoutPolicyApplier.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ProcessTimeoutPolicyApplier.java index cedc37b767..3731e20538 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ProcessTimeoutPolicyApplier.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/ProcessTimeoutPolicyApplier.java @@ -32,11 +32,9 @@ import com.walmartlabs.concord.server.sdk.metrics.InjectCounter; import javax.inject.Inject; -import javax.inject.Named; import java.text.MessageFormat; import java.util.Map; -@Named public class ProcessTimeoutPolicyApplier implements PolicyApplier { private static final String DEFAULT_PROCESS_TIMEOUT_MSG = "Maximum 'processTimeout' value exceeded: current {0}, limit {1}"; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/WorkspacePolicyApplier.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/WorkspacePolicyApplier.java index e786c51b53..27f236fe7e 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/WorkspacePolicyApplier.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/policy/WorkspacePolicyApplier.java @@ -31,12 +31,10 @@ import com.walmartlabs.concord.server.sdk.metrics.InjectCounter; import javax.inject.Inject; -import javax.inject.Named; import java.nio.file.Path; import static com.walmartlabs.concord.server.process.pipelines.processors.policy.PolicyApplier.appendMsg; -@Named public class WorkspacePolicyApplier implements PolicyApplier { private final ProcessLogManager logManager; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ExternalProcessListenerHandler.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ExternalProcessListenerHandler.java index 5b834f8937..b061bb4c6e 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ExternalProcessListenerHandler.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ExternalProcessListenerHandler.java @@ -28,14 +28,12 @@ import org.jooq.DSLContext; import javax.inject.Inject; -import javax.inject.Named; import java.util.Collections; /** * Sends {@link EventType#PROCESS_STATUS} events to registered {@link com.walmartlabs.concord.server.sdk.events.ProcessEventListener} * instances. */ -@Named public class ExternalProcessListenerHandler implements ProcessStatusListener { private final ProcessEventManager eventManager; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ProcessQueueManager.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ProcessQueueManager.java index 491fc7992d..bfd45d44f2 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ProcessQueueManager.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ProcessQueueManager.java @@ -49,7 +49,7 @@ public class ProcessQueueManager { private final ProcessKeyCache keyCache; private final ProcessEventManager eventManager; private final ProcessLogManager processLogManager; - private final Collection statusListeners; + private final Set statusListeners; private static final Set TO_ENQUEUED_STATUSES = new HashSet<>(Arrays.asList( ProcessStatus.PREPARING, ProcessStatus.RESUMING, ProcessStatus.SUSPENDED @@ -60,7 +60,7 @@ public ProcessQueueManager(ProcessQueueDao queueDao, ProcessKeyCache keyCache, ProcessEventManager eventManager, ProcessLogManager processLogManager, - Collection statusListeners) { + Set statusListeners) { this.queueDao = queueDao; this.eventManager = eventManager; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/dispatcher/ConcurrentProcessFilter.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/dispatcher/ConcurrentProcessFilter.java index 98c34878f4..538cb542b8 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/dispatcher/ConcurrentProcessFilter.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/dispatcher/ConcurrentProcessFilter.java @@ -33,7 +33,6 @@ import org.jooq.DSLContext; import javax.inject.Inject; -import javax.inject.Named; import java.util.*; /** @@ -41,7 +40,6 @@ * The process won't be scheduled for execution until the number of currently running * processes in the same project exceeds the configured value. */ -@Named public class ConcurrentProcessFilter extends WaitProcessFinishFilter { private static final Set FINAL_STATUSES = ImmutableSet.of( diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/dispatcher/ExclusiveProcessFilter.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/dispatcher/ExclusiveProcessFilter.java index 80c3d534a3..9bef850d78 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/dispatcher/ExclusiveProcessFilter.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/dispatcher/ExclusiveProcessFilter.java @@ -27,7 +27,6 @@ import org.jooq.DSLContext; import javax.inject.Inject; -import javax.inject.Named; import java.util.*; /** @@ -35,7 +34,6 @@ * Exclusive processes can't be executed when there is another process * running in the same project and group. */ -@Named public class ExclusiveProcessFilter extends WaitProcessFinishFilter { private final ExclusiveProcessFilterDao dao; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessFinishHandler.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessFinishHandler.java index cce4f38cdf..fac6670c68 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessFinishHandler.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessFinishHandler.java @@ -43,7 +43,6 @@ /** * Handles the processes that are waiting for other processes to finish. */ -@Named @Singleton public class WaitProcessFinishHandler implements ProcessWaitHandler { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessLockHandler.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessLockHandler.java index e7a1358fd0..fd10fc7022 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessLockHandler.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessLockHandler.java @@ -26,14 +26,12 @@ import com.walmartlabs.concord.server.sdk.metrics.WithTimer; import javax.inject.Inject; -import javax.inject.Named; import javax.inject.Singleton; /** * Handles the processes that are waiting for locks. Resumes a suspended process * if the lock was acquired successfully. */ -@Named @Singleton public class WaitProcessLockHandler implements ProcessWaitHandler { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessSleepHandler.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessSleepHandler.java index 7d408fd5ba..1c3ae6e882 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessSleepHandler.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessSleepHandler.java @@ -23,7 +23,6 @@ import com.walmartlabs.concord.server.sdk.ProcessKey; import com.walmartlabs.concord.server.sdk.metrics.WithTimer; -import javax.inject.Named; import javax.inject.Singleton; import java.util.Date; @@ -31,7 +30,6 @@ * Handles the processes that are waiting for some timeout. Resumes a suspended process * if the timeout exceeded. */ -@Named @Singleton public class WaitProcessSleepHandler implements ProcessWaitHandler { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessStatusListener.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessStatusListener.java index 484986e934..a14d736869 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessStatusListener.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/waits/WaitProcessStatusListener.java @@ -29,7 +29,6 @@ import static com.walmartlabs.concord.server.jooq.Tables.PROCESS_WAIT_CONDITIONS; -@Named public class WaitProcessStatusListener implements ProcessStatusListener { @Override diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/security/SecurityModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/security/SecurityModule.java index 238b45f1f0..a988b17de3 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/security/SecurityModule.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/security/SecurityModule.java @@ -26,20 +26,16 @@ import com.walmartlabs.concord.server.security.github.GithubRealm; import com.walmartlabs.concord.server.security.internal.InternalRealm; import com.walmartlabs.concord.server.security.internal.LocalUserInfoProvider; -import com.walmartlabs.concord.server.security.ldap.LdapRealm; -import com.walmartlabs.concord.server.security.ldap.LdapUserInfoProvider; -import com.walmartlabs.concord.server.security.ldap.UserLdapGroupSynchronizer; +import com.walmartlabs.concord.server.security.ldap.*; import com.walmartlabs.concord.server.security.sessionkey.SessionKeyRealm; import com.walmartlabs.concord.server.user.UserInfoProvider; import org.apache.shiro.realm.Realm; - -import javax.inject.Named; +import org.apache.shiro.realm.ldap.LdapContextFactory; import static com.google.inject.Scopes.SINGLETON; import static com.google.inject.multibindings.Multibinder.newSetBinder; import static com.walmartlabs.concord.server.Utils.bindSingletonScheduledTask; -@Named public class SecurityModule implements Module { @Override @@ -50,6 +46,9 @@ public void configure(Binder binder) { newSetBinder(binder, Realm.class).addBinding().to(LdapRealm.class); newSetBinder(binder, Realm.class).addBinding().to(SessionKeyRealm.class); + binder.bind(LdapManager.class).toProvider(LdapManagerProvider.class); + binder.bind(LdapContextFactory.class).toProvider(LdapContextFactoryProvider.class); + bindSingletonScheduledTask(binder, UserLdapGroupSynchronizer.class); binder.bind(LocalUserInfoProvider.class).in(SINGLETON); diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/LdapContextFactoryProvider.java b/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/LdapContextFactoryProvider.java index 5886d5b355..290cb89cbe 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/LdapContextFactoryProvider.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/LdapContextFactoryProvider.java @@ -28,7 +28,6 @@ import javax.inject.Provider; import javax.naming.NamingException; -@Named public class LdapContextFactoryProvider implements Provider { private final LdapConfiguration cfg; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/LdapManagerProvider.java b/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/LdapManagerProvider.java index 63f8ded900..3105aba201 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/LdapManagerProvider.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/LdapManagerProvider.java @@ -24,18 +24,16 @@ import org.apache.shiro.realm.ldap.LdapContextFactory; import javax.inject.Inject; -import javax.inject.Named; import javax.inject.Provider; import java.time.Duration; -@Named public class LdapManagerProvider implements Provider { private final LdapManager ldapManager; @Inject public LdapManagerProvider(LdapConfiguration cfg, - LdapContextFactory ctxFactory) { + LdapContextFactory ctxFactory) { LdapManager manager = new LdapManagerImpl(cfg, ctxFactory); From d890f5f2d7ac9cbef56c81ec8399e488cea630d8 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Wed, 8 Nov 2023 17:12:05 -0500 Subject: [PATCH 08/52] it: add testing-server module --- it/pom.xml | 2 + it/testing-server/pom.xml | 49 ++++++++++ .../testingserver/TestingConcordServer.java | 97 +++++++++++++++++++ .../processors/ExclusiveGroupProcessor.java | 42 ++++---- 4 files changed, 169 insertions(+), 21 deletions(-) create mode 100644 it/testing-server/pom.xml create mode 100644 it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java diff --git a/it/pom.xml b/it/pom.xml index 1b9a397927..9b80ef8aa2 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -26,6 +26,8 @@ runtime-v1 runtime-v2 compat + + testing-server diff --git a/it/testing-server/pom.xml b/it/testing-server/pom.xml new file mode 100644 index 0000000000..79089f0176 --- /dev/null +++ b/it/testing-server/pom.xml @@ -0,0 +1,49 @@ + + + 4.0.0 + + + com.walmartlabs.concord.it + parent + 2.1.1-SNAPSHOT + ../pom.xml + + + testing-concord-server + jar + + + + com.walmartlabs.concord.server + concord-server + + + com.walmartlabs.concord.server.plugins.ansible + concord-ansible-plugin + + + com.walmartlabs.concord.server.plugins + concord-oneops-plugin + + + com.walmartlabs.concord.server.plugins.noderoster + concord-noderoster-plugin + + + com.walmartlabs.concord.server.plugins + pfed-sso + + + + + org.testcontainers + postgresql + + + com.typesafe + config + + + diff --git a/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java new file mode 100644 index 0000000000..2ed47ff7eb --- /dev/null +++ b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java @@ -0,0 +1,97 @@ +package com.walmartlabs.concord.it.testingserver; + +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2023 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + +import com.typesafe.config.Config; +import com.typesafe.config.ConfigFactory; +import com.typesafe.config.ConfigParseOptions; +import com.typesafe.config.ConfigResolveOptions; +import com.walmartlabs.concord.server.ConcordServer; +import com.walmartlabs.concord.server.ConcordServerModule; +import org.testcontainers.containers.PostgreSQLContainer; + +import java.security.SecureRandom; +import java.util.Base64; +import java.util.Map; + +public class TestingConcordServer implements AutoCloseable { + + private PostgreSQLContainer db; + private ConcordServer server; + + public TestingConcordServer start() throws Exception { + db = new PostgreSQLContainer<>("postgres:15-alpine"); + db.start(); + + server = ConcordServer.withModules(new ConcordServerModule(prepareConfig(db))) + .start(); + + return this; + } + + @Override + public void close() throws Exception { + this.stop(); + } + + public void stop() throws Exception { + if (server != null) { + server.stop(); + server = null; + } + + if (db != null) { + db.stop(); + db = null; + } + } + + private static Config prepareConfig(PostgreSQLContainer db) { + Config testConfig = ConfigFactory.parseMap(Map.of( + "db.url", db.getJdbcUrl(), + "db.appUsername", db.getUsername(), + "db.appPassword", db.getPassword(), + "db.inventoryUsername", db.getUsername(), + "db.inventoryPassword", db.getPassword(), + "db.changeLogParameters.defaultAdminToken", "foobar", + "secretStore.serverPassword", randomString(), + "secretStore.secretStoreSalt", randomString(), + "secretStore.projectSecretSalt", randomString() + )); + + Config defaultConfig = ConfigFactory.load("concord-server.conf", ConfigParseOptions.defaults(), ConfigResolveOptions.defaults().setAllowUnresolved(true)) + .getConfig("concord-server"); + + return testConfig.withFallback(defaultConfig).resolve(); + } + + private static String randomString() { + byte[] ab = new byte[64]; + new SecureRandom().nextBytes(ab); + return Base64.getEncoder().encodeToString(ab); + } + + public static void main(String[] args) throws Exception { + TestingConcordServer server = new TestingConcordServer().start(); + Thread.sleep(100000); + server.stop(); + } +} diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ExclusiveGroupProcessor.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ExclusiveGroupProcessor.java index 56839bd9b7..6f9eadf2a5 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ExclusiveGroupProcessor.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/ExclusiveGroupProcessor.java @@ -262,11 +262,11 @@ public T txResult(TxResult t) { public boolean exists(DSLContext tx, UUID currentInstanceId, UUID parentInstanceId, UUID projectId, String exclusiveGroup) { SelectConditionStep> s = tx.selectOne() - .from(PROCESS_QUEUE) - .where(jsonbText(PROCESS_QUEUE.EXCLUSIVE, "group").eq(exclusiveGroup) - .and(PROCESS_QUEUE.PROJECT_ID.eq(projectId) - .and(PROCESS_QUEUE.INSTANCE_ID.notEqual(currentInstanceId) - .and(PROCESS_QUEUE.CURRENT_STATUS.in(RUNNING_STATUSES))))); + .from(PROCESS_QUEUE) + .where(jsonbText(PROCESS_QUEUE.EXCLUSIVE, "group").eq(exclusiveGroup) + .and(PROCESS_QUEUE.PROJECT_ID.eq(projectId) + .and(PROCESS_QUEUE.INSTANCE_ID.notEqual(currentInstanceId) + .and(PROCESS_QUEUE.CURRENT_STATUS.in(RUNNING_STATUSES))))); // parent's if (parentInstanceId != null) { @@ -326,14 +326,14 @@ public ProcessKey anyNew(DSLContext tx, ProcessKey currentProcessKey, UUID proje .and(PROCESS_QUEUE.CURRENT_STATUS.in(CANCELLABLE_STATUSES))))); SelectJoinStep> children = tx.withRecursive("children").as( - select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID).from(ProcessQueue.PROCESS_QUEUE) - .where(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq(currentProcessKey.getInstanceId())) - .unionAll( - select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID) - .from(ProcessQueue.PROCESS_QUEUE) - .join(name("children")) - .on(ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID.eq( - field(name("children", "INSTANCE_ID"), UUID.class))))) + select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID).from(ProcessQueue.PROCESS_QUEUE) + .where(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq(currentProcessKey.getInstanceId())) + .unionAll( + select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID) + .from(ProcessQueue.PROCESS_QUEUE) + .join(name("children")) + .on(ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID.eq( + field(name("children", "INSTANCE_ID"), UUID.class))))) .select(field("children.INSTANCE_ID", UUID.class)) .from(name("children")); @@ -346,14 +346,14 @@ public ProcessKey anyNew(DSLContext tx, ProcessKey currentProcessKey, UUID proje private static SelectJoinStep> parents(DSLContext tx, UUID parentInstanceId) { return tx.withRecursive("parents").as( - select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID).from(ProcessQueue.PROCESS_QUEUE) - .where(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq(parentInstanceId)) - .unionAll( - select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID) - .from(ProcessQueue.PROCESS_QUEUE) - .join(name("parents")) - .on(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq( - field(name("parents", "PARENT_INSTANCE_ID"), UUID.class))))) + select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID).from(ProcessQueue.PROCESS_QUEUE) + .where(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq(parentInstanceId)) + .unionAll( + select(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID, ProcessQueue.PROCESS_QUEUE.PARENT_INSTANCE_ID) + .from(ProcessQueue.PROCESS_QUEUE) + .join(name("parents")) + .on(ProcessQueue.PROCESS_QUEUE.INSTANCE_ID.eq( + field(name("parents", "PARENT_INSTANCE_ID"), UUID.class))))) .select(field("parents.INSTANCE_ID", UUID.class)) .from(name("parents")); } From 46bef2322f46c0f3834e7f5390977f64239d38b3 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Thu, 9 Nov 2023 12:33:55 -0500 Subject: [PATCH 09/52] kafka-event-sink: bind resources in a module --- .../eventsink/kafka/KafkaConnector.java | 4 -- .../eventsink/kafka/KafkaEventSink.java | 2 - .../kafka/KafkaEventSinkConfiguration.java | 2 - .../plugins/eventsink/kafka/KafkaModule.java | 50 +++++++++++++++++++ 4 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaModule.java diff --git a/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaConnector.java b/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaConnector.java index 5155b392a3..8f95271106 100644 --- a/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaConnector.java +++ b/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaConnector.java @@ -28,14 +28,10 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Properties; -@Named -@Singleton public class KafkaConnector implements BackgroundTask { private static final Logger log = LoggerFactory.getLogger(KafkaConnector.class); diff --git a/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaEventSink.java b/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaEventSink.java index 301d7c521a..5dfd8af0a9 100644 --- a/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaEventSink.java +++ b/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaEventSink.java @@ -31,11 +31,9 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import javax.inject.Named; import java.util.Collections; import java.util.List; -@Named public class KafkaEventSink implements ProcessEventListener, ProcessLogListener, AuditLogListener { private static final Logger log = LoggerFactory.getLogger(KafkaEventSink.class); diff --git a/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaEventSinkConfiguration.java b/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaEventSinkConfiguration.java index b47f6cfaa8..45795101de 100644 --- a/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaEventSinkConfiguration.java +++ b/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaEventSinkConfiguration.java @@ -24,10 +24,8 @@ import javax.annotation.Nullable; import javax.inject.Inject; -import javax.inject.Named; import java.io.Serializable; -@Named public class KafkaEventSinkConfiguration implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaModule.java b/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaModule.java new file mode 100644 index 0000000000..29d25563d8 --- /dev/null +++ b/server/plugins/kafka-event-sink/src/main/java/com/walmartlabs/concord/server/plugins/eventsink/kafka/KafkaModule.java @@ -0,0 +1,50 @@ +package com.walmartlabs.concord.server.plugins.eventsink.kafka; + +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2023 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + +import com.google.inject.Binder; +import com.google.inject.Module; +import com.walmartlabs.concord.server.sdk.BackgroundTask; +import com.walmartlabs.concord.server.sdk.audit.AuditLogListener; +import com.walmartlabs.concord.server.sdk.events.ProcessEventListener; +import com.walmartlabs.concord.server.sdk.log.ProcessLogListener; + +import javax.inject.Named; + +import static com.google.inject.Scopes.SINGLETON; +import static com.google.inject.multibindings.Multibinder.newSetBinder; + +@Named +public class KafkaModule implements Module { + + @Override + public void configure(Binder binder) { + binder.bind(KafkaEventSinkConfiguration.class).in(SINGLETON); + + binder.bind(KafkaEventSink.class).in(SINGLETON); + newSetBinder(binder, ProcessEventListener.class).addBinding().to(KafkaEventSink.class); + newSetBinder(binder, ProcessLogListener.class).addBinding().to(KafkaEventSink.class); + newSetBinder(binder, AuditLogListener.class).addBinding().to(KafkaEventSink.class); + + binder.bind(KafkaConnector.class).in(SINGLETON); + newSetBinder(binder, BackgroundTask.class).addBinding().to(KafkaConnector.class); + } +} From fdd83f4aaa1bf972ad34285288664d2db7ce69fd Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Mon, 9 Oct 2023 20:09:15 -0400 Subject: [PATCH 10/52] project: skip tests that require custom docker config on GHA Allows use of standard GHA runners. --- .github/settings.xml | 13 +++++++++ .github/workflows/build.yml | 29 +++++-------------- it/server/pom.xml | 2 ++ .../concord/it/server/AbstractServerIT.java | 4 +++ .../concord/it/server/DockerAnsibleIT.java | 2 ++ .../concord/it/server/DockerIT.java | 2 ++ 6 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 .github/settings.xml diff --git a/.github/settings.xml b/.github/settings.xml new file mode 100644 index 0000000000..59d889141e --- /dev/null +++ b/.github/settings.xml @@ -0,0 +1,13 @@ + + + + + gha + + true + + + + + diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d118728506..ba849b4647 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,23 +14,12 @@ jobs: build: strategy: matrix: - jdk_version: ['17'] + jdk_version: [ '17' ] fail-fast: false - runs-on: self-hosted + runs-on: ubuntu-latest steps: - - name: Clear /tmp - run: | - docker run --rm -v /tmp:/data alpine find /data -ctime +2 -exec rm -rf '{}' \; 2>&1 > /dev/null || true - - - name: Clear old Docker resources - run: | - docker rm -f $(docker ps -aq) || true - docker volume rm $(docker volume ps -q) || true - docker system prune -af || true - docker image prune -af || true - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: @@ -42,21 +31,17 @@ jobs: username: ${{ secrets.OSS_DOCKERHUB_USERNAME }} password: ${{ secrets.OSS_DOCKERHUB_PASSWORD }} - - uses: actions/checkout@v3 - - name: Set up JDK uses: actions/setup-java@v3 with: java-version: '${{ matrix.jdk_version }}' distribution: 'temurin' - - name: Remove old Concord artifacts - run: | - rm -rf ~/.m2/repository/com/walmartlabs/concord - rm -rf ~/actions-runner/.m2/repository/com/walmartlabs/concord + - name: Checkout + uses: actions/checkout@v3 - name: Build and test with Maven - run: ./mvnw -B clean install -Pdocker -Pit -Pjdk${{ matrix.jdk_version }} - + run: ./mvnw -s .github/settings.xml -B clean install -Pgha -Pdocker -Pit -Pjdk${{ matrix.jdk_version }} + - name: Build with debian docker images - run: ./mvnw -C -B -f docker-images install -DskipTests -Pdocker -Pdebian -Pjdk${{ matrix.jdk_version }} + run: ./mvnw -s .github/settings.xml -C -B -f docker-images install -DskipTests -Pgha -Pdocker -Pdebian -Pjdk${{ matrix.jdk_version }} diff --git a/it/server/pom.xml b/it/server/pom.xml index 70c293ea02..ac7d42d62f 100644 --- a/it/server/pom.xml +++ b/it/server/pom.xml @@ -29,6 +29,7 @@ ldap-node:389 custom 8001 + false ${settings.localRepository} net-server-it osixia/openldap @@ -268,6 +269,7 @@ ldap://localhost:${it.ldap.port} ${project.version} ${it.server.port} + ${it.skipDocker} ${tmp.dir} diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/AbstractServerIT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/AbstractServerIT.java index c13c02546d..9d715ed5c0 100644 --- a/it/server/src/test/java/com/walmartlabs/concord/it/server/AbstractServerIT.java +++ b/it/server/src/test/java/com/walmartlabs/concord/it/server/AbstractServerIT.java @@ -214,4 +214,8 @@ protected static String env(String k, String def) { } return v; } + + public static boolean shouldSkipDockerTests() { + return Boolean.parseBoolean(System.getenv("IT_SKIP_DOCKER_TESTS")); + } } diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerAnsibleIT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerAnsibleIT.java index 2a2242a04c..a448bcab6a 100644 --- a/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerAnsibleIT.java +++ b/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerAnsibleIT.java @@ -24,6 +24,7 @@ import com.walmartlabs.concord.client.ProcessEntry; import com.walmartlabs.concord.client.StartProcessResponse; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIf; import java.io.File; import java.util.HashMap; @@ -35,6 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +@DisabledIf(value = "shouldSkipDockerTests", disabledReason = "Requires dockerd listening on a tcp socket. Not available in a typical CI environment") public class DockerAnsibleIT extends AbstractServerIT { @Test diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerIT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerIT.java index 04b298115f..ccaec122c2 100644 --- a/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerIT.java +++ b/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerIT.java @@ -24,6 +24,7 @@ import com.walmartlabs.concord.client.ProcessEntry; import com.walmartlabs.concord.client.StartProcessResponse; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIf; import java.util.HashMap; import java.util.Map; @@ -32,6 +33,7 @@ import static com.walmartlabs.concord.it.common.ServerClient.*; import static org.junit.jupiter.api.Assertions.assertNotNull; +@DisabledIf(value = "shouldSkipDockerTests", disabledReason = "Requires dockerd listening on a tcp socket. Not available in a typical CI environment") public class DockerIT extends AbstractServerIT { @Test From 7e6b84fce1dbe0e6faef7de6b3b4800c90655271 Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Fri, 10 Nov 2023 21:59:03 +0100 Subject: [PATCH 11/52] update java version in readme (#827) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 60ff3d9000..5aac69899c 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ different systems together using scenarios and plugins created by users. Dependencies: - [Git](https://git-scm.com/) 2.18+ -- [Java 8](https://adoptium.net/) +- [Java 17](https://adoptium.net/) - [Docker Community Edition](https://www.docker.com/community-edition) - [Docker Buildx](https://docs.docker.com/build/buildx/install/) - (Optional) [NodeJS and NPM](https://nodejs.org/en/download/) (Node 16 or greater) @@ -41,7 +41,7 @@ Available Maven profiles: - `docker` - build Docker images; - `debian` - build Debian-based Docker images instead of the default CentOS base; - `it` - run integration tests; -- `jdk17`, `jdk17-aarch64` - use a different JDK version for building artifacts and Docker images. +- ``jdk17-aarch64` - use a different JDK version for building artifacts and Docker images. Profiles can be combined, e.g. @@ -122,4 +122,4 @@ See the [examples](examples) directory. ## Development Notes -See [NOTES.md](NOTES.md). \ No newline at end of file +See [NOTES.md](NOTES.md). From ed6c6dd722960140f759434d7f31f1daa16a2a89 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Thu, 9 Nov 2023 17:18:10 -0500 Subject: [PATCH 12/52] oidc: rename the plugin module class --- .../concord/server/plugins/oidc/OidcCallbackFilter.java | 2 +- .../plugins/oidc/{PluginModule.java => OidcPluginModule.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename server/plugins/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/{PluginModule.java => OidcPluginModule.java} (98%) diff --git a/server/plugins/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/OidcCallbackFilter.java b/server/plugins/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/OidcCallbackFilter.java index e529d7fc5d..6ffe4c7138 100644 --- a/server/plugins/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/OidcCallbackFilter.java +++ b/server/plugins/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/OidcCallbackFilter.java @@ -68,7 +68,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha } CallbackLogic callback = pac4jConfig.getCallbackLogic(); - callback.perform(context, pac4jConfig, pac4jConfig.getHttpActionAdapter(), postLoginUrl, true, false, true, PluginModule.CLIENT_NAME); + callback.perform(context, pac4jConfig, pac4jConfig.getHttpActionAdapter(), postLoginUrl, true, false, true, OidcPluginModule.CLIENT_NAME); } @Override diff --git a/server/plugins/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/PluginModule.java b/server/plugins/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/OidcPluginModule.java similarity index 98% rename from server/plugins/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/PluginModule.java rename to server/plugins/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/OidcPluginModule.java index 1e2262785e..bc4b48b418 100644 --- a/server/plugins/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/PluginModule.java +++ b/server/plugins/oidc/src/main/java/com/walmartlabs/concord/server/plugins/oidc/OidcPluginModule.java @@ -41,7 +41,7 @@ import static com.google.inject.multibindings.Multibinder.newSetBinder; @Named -public class PluginModule extends AbstractModule { +public class OidcPluginModule extends AbstractModule { public static final String CLIENT_NAME = "oidc"; From f46c11faf79971d7026e82fff656d4acf56329b4 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Thu, 9 Nov 2023 17:18:43 -0500 Subject: [PATCH 13/52] testing-concord-server: allow modules to re-use the same config object --- .../testingserver/TestingConcordServer.java | 47 +++++++++++++++---- .../concord/server/ConcordServer.java | 8 +++- .../server/cfg/ConfigurationModule.java | 2 + 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java index 2ed47ff7eb..cb0b2b3194 100644 --- a/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java +++ b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java @@ -20,6 +20,7 @@ * ===== */ +import com.google.inject.Module; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import com.typesafe.config.ConfigParseOptions; @@ -30,25 +31,44 @@ import java.security.SecureRandom; import java.util.Base64; +import java.util.List; import java.util.Map; +import java.util.function.Function; +import java.util.stream.Stream; + +import static java.util.Objects.requireNonNull; public class TestingConcordServer implements AutoCloseable { private PostgreSQLContainer db; private ConcordServer server; + private Map extraConfiguration; + private List> extraModules; + + public TestingConcordServer(Map extraConfiguration, List> extraModules) { + this.extraConfiguration = requireNonNull(extraConfiguration); + this.extraModules = requireNonNull(extraModules); + } + + public TestingConcordServer() { + this(Map.of(), List.of()); + } - public TestingConcordServer start() throws Exception { + public synchronized TestingConcordServer start() throws Exception { db = new PostgreSQLContainer<>("postgres:15-alpine"); db.start(); - server = ConcordServer.withModules(new ConcordServerModule(prepareConfig(db))) + var config = prepareConfig(db); + var system = new ConcordServerModule(config); + var allModules = Stream.concat(extraModules.stream().map(f -> f.apply(config)), Stream.of(system)).toList(); + server = ConcordServer.withModules(allModules) .start(); return this; } @Override - public void close() throws Exception { + public synchronized void close() throws Exception { this.stop(); } @@ -64,8 +84,14 @@ public void stop() throws Exception { } } - private static Config prepareConfig(PostgreSQLContainer db) { - Config testConfig = ConfigFactory.parseMap(Map.of( + public PostgreSQLContainer getDb() { + return db; + } + + private Config prepareConfig(PostgreSQLContainer db) { + var extraConfig = ConfigFactory.parseMap(this.extraConfiguration); + + var testConfig = ConfigFactory.parseMap(Map.of( "db.url", db.getJdbcUrl(), "db.appUsername", db.getUsername(), "db.appPassword", db.getPassword(), @@ -77,10 +103,10 @@ private static Config prepareConfig(PostgreSQLContainer db) { "secretStore.projectSecretSalt", randomString() )); - Config defaultConfig = ConfigFactory.load("concord-server.conf", ConfigParseOptions.defaults(), ConfigResolveOptions.defaults().setAllowUnresolved(true)) + var defaultConfig = ConfigFactory.load("concord-server.conf", ConfigParseOptions.defaults(), ConfigResolveOptions.defaults().setAllowUnresolved(true)) .getConfig("concord-server"); - return testConfig.withFallback(defaultConfig).resolve(); + return extraConfig.withFallback(testConfig.withFallback(defaultConfig)).resolve(); } private static String randomString() { @@ -90,8 +116,9 @@ private static String randomString() { } public static void main(String[] args) throws Exception { - TestingConcordServer server = new TestingConcordServer().start(); - Thread.sleep(100000); - server.stop(); + try (TestingConcordServer server = new TestingConcordServer(Map.of("process.watchdogPeriod", "10 seconds"), List.of())) { + server.start(); + Thread.sleep(100000); + } } } diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java b/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java index 9e865ca4e3..333d8532ba 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java @@ -33,6 +33,8 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; +import java.util.Collection; +import java.util.List; public final class ConcordServer { @@ -59,10 +61,14 @@ public static ConcordServer withAutoWiring() throws Exception { new WireModule(new SpaceModule(new URLClassSpace(cl), BeanScanning.GLOBAL_INDEX))); } + public static ConcordServer withModules(Module... modules) throws Exception { + return withModules(List.of(modules)); + } + /** * Start ConcordServer using the provided modules. */ - public static ConcordServer withModules(Module... modules) throws Exception { + public static ConcordServer withModules(Collection modules) throws Exception { Injector injector = Guice.createInjector(modules); ConcordServer instance = new ConcordServer(); diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/cfg/ConfigurationModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/cfg/ConfigurationModule.java index 67f91e7679..196624fe01 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/cfg/ConfigurationModule.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/cfg/ConfigurationModule.java @@ -36,6 +36,8 @@ public ConfigurationModule(Config config) { @Override public void configure(Binder binder) { + binder.bind(Config.class).toInstance(config); + binder.install(new com.walmartlabs.ollie.config.OllieConfigurationModule("com.walmartlabs.concord.server", config)); binder.bind(AgentConfiguration.class).in(SINGLETON); From dc167a546837a0157e9605a97840e6bf37b17c08 Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Sun, 12 Nov 2023 22:10:40 +0100 Subject: [PATCH 14/52] runtime-v2: fix exit from parallel loop (#830) --- .../concord/it/server/CryptoIT.java | 2 +- .../runner/DefaultSynchronizationService.java | 13 +++++++ .../v2/runner/SynchronizationService.java | 4 ++ .../SynchronizationServiceListener.java | 11 +++++- .../runtime/v2/runner/vm/ExitCommand.java | 3 +- .../concord/runtime/v2/runner/MainTest.java | 37 +++++++++++++++++++ .../v2/runner/parallelLoopExit/concord.yml | 33 +++++++++++++++++ .../v2/runner/serialLoopExit/concord.yml | 32 ++++++++++++++++ 8 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/parallelLoopExit/concord.yml create mode 100644 runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/serialLoopExit/concord.yml diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/CryptoIT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/CryptoIT.java index 98389eb456..7f76bc688a 100644 --- a/it/server/src/test/java/com/walmartlabs/concord/it/server/CryptoIT.java +++ b/it/server/src/test/java/com/walmartlabs/concord/it/server/CryptoIT.java @@ -325,7 +325,7 @@ public void testDecryptInvalidString() throws Exception { // --- pir = waitForCompletion(processApi, spr.getInstanceId()); - assertEquals(ProcessEntry.StatusEnum.FAILED, pir.getStatus()); + assertEquals(ProcessEntry.StatusEnum.FAILED, pir.getStatus(), "Process logs: " + new String(getLog(pir.getLogFileName()))); } @Test diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/DefaultSynchronizationService.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/DefaultSynchronizationService.java index e327d93c11..2c1d8950fd 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/DefaultSynchronizationService.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/DefaultSynchronizationService.java @@ -29,6 +29,8 @@ public class DefaultSynchronizationService implements SynchronizationService { private final List callbacks = new ArrayList<>(); + private boolean stop; + @Override public boolean hasPoint() { synchronized (this) { @@ -43,6 +45,7 @@ public void maintain() { } callbacks.clear(); + stop = false; } @Override @@ -51,4 +54,14 @@ public void point(Runnable callback) { callbacks.add(callback); } } + + @Override + public void stop() { + this.stop = true; + } + + @Override + public boolean hasStop() { + return stop; + } } diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/SynchronizationService.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/SynchronizationService.java index 5975964abf..fea6b9149e 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/SynchronizationService.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/SynchronizationService.java @@ -27,4 +27,8 @@ public interface SynchronizationService { void maintain(); void point(Runnable callback); + + void stop(); + + boolean hasStop(); } diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/SynchronizationServiceListener.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/SynchronizationServiceListener.java index 87559c366d..c8f551abaf 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/SynchronizationServiceListener.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/SynchronizationServiceListener.java @@ -23,6 +23,8 @@ import com.walmartlabs.concord.svm.Runtime; import com.walmartlabs.concord.svm.*; +import java.util.Map; + public class SynchronizationServiceListener implements ExecutionListener { private final SynchronizationService delegate; @@ -33,7 +35,7 @@ public SynchronizationServiceListener(SynchronizationService delegate) { @Override public Result afterCommand(Runtime runtime, VM vm, State state, ThreadId threadId, Command cmd) { - if (delegate.hasPoint()) { + if (delegate.hasPoint() || delegate.hasStop()) { state.setStatus(threadId, ThreadStatus.SUSPENDED); return Result.BREAK; } @@ -43,6 +45,13 @@ public Result afterCommand(Runtime runtime, VM vm, State state, ThreadId threadI @Override public Result afterEval(Runtime runtime, VM vm, State state) { + if (delegate.hasStop()) { + for (Map.Entry e : state.threadStatus().entrySet()) { + state.setStatus(e.getKey(), ThreadStatus.DONE); + } + return Result.BREAK; + } + if (!delegate.hasPoint()) { return Result.BREAK; } diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/ExitCommand.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/ExitCommand.java index ee5722cb40..2739224fde 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/ExitCommand.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/ExitCommand.java @@ -21,6 +21,7 @@ */ import com.walmartlabs.concord.runtime.v2.model.ExitStep; +import com.walmartlabs.concord.runtime.v2.runner.SynchronizationService; import com.walmartlabs.concord.svm.Runtime; import com.walmartlabs.concord.svm.State; import com.walmartlabs.concord.svm.ThreadId; @@ -35,6 +36,6 @@ public ExitCommand(ExitStep step) { @Override protected void execute(Runtime runtime, State state, ThreadId threadId) { - state.dropAllFrames(); + runtime.getService(SynchronizationService.class).stop(); } } diff --git a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java index 1880b9b580..666c697db8 100644 --- a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java +++ b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java @@ -1577,6 +1577,43 @@ public void testUuidFunc() throws Exception { assertLog(log, ".*uuid: [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}.*"); } + @Test + public void testExitFromParallelLoop() throws Exception { + deploy("parallelLoopExit"); + + save(ProcessConfiguration.builder() + .build()); + + byte[] log = run(); + + assertNoLog(log, ".*should not reach here.*"); + + // thread in loop should execute at least one step + assertLog(log, ".*inner start: one.*"); + assertLog(log, ".*inner start: two.*"); + assertLog(log, ".*inner start: three.*"); + } + + @Test + public void testExitFromSerialLoop() throws Exception { + deploy("serialLoopExit"); + + save(ProcessConfiguration.builder() + .build()); + + byte[] log = run(); + + assertNoLog(log, ".*should not reach here.*"); + + assertLog(log, ".*inner start: one.*"); + assertLog(log, ".*inner end: one.*"); + assertLog(log, ".*inner start: two.*"); + + assertNoLog(log, ".*inner end: two.*"); + assertNoLog(log, ".*inner start: three.*"); + assertNoLog(log, ".*inner start: four.*"); + } + private void deploy(String resource) throws URISyntaxException, IOException { Path src = Paths.get(MainTest.class.getResource(resource).toURI()); IOUtils.copy(src, workDir); diff --git a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/parallelLoopExit/concord.yml b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/parallelLoopExit/concord.yml new file mode 100644 index 0000000000..51ca7005f8 --- /dev/null +++ b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/parallelLoopExit/concord.yml @@ -0,0 +1,33 @@ +configuration: + debug: true + runtime: concord-v2 + +flows: + default: + - call: "inner" + loop: + items: + - "one" + - "two" + - "three" + - "four" + mode: parallel + + - log: "should not reach here" + + inner: + - log: "inner start: ${item}" + + - if: ${item == "four"} + then: + - checkpoint: "${item}" + + - if: ${item == "two"} + then: + - exit + + - if: ${item == "three"} + then: + - expr: ${sleep.ms(1000)} + + - log: "inner end: ${item}" diff --git a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/serialLoopExit/concord.yml b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/serialLoopExit/concord.yml new file mode 100644 index 0000000000..06d97138e5 --- /dev/null +++ b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/serialLoopExit/concord.yml @@ -0,0 +1,32 @@ +configuration: + debug: true + runtime: concord-v2 + +flows: + default: + - call: "inner" + loop: + items: + - "one" + - "two" + - "three" + - "four" + + - log: "should not reach here" + + inner: + - log: "inner start: ${item}" + + - if: ${item == "four"} + then: + - checkpoint: "${item}" + + - if: ${item == "two"} + then: + - exit + + - if: ${item == "three"} + then: + - expr: ${sleep.ms(1000)} + + - log: "inner end: ${item}" From 33839d21477679972103e1746998b2818ae83b87 Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Mon, 13 Nov 2023 16:53:50 +0100 Subject: [PATCH 15/52] runtime-v2: parallel loop exit test up (#831) --- .../com/walmartlabs/concord/runtime/v2/runner/MainTest.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java index 666c697db8..86ea2ac895 100644 --- a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java +++ b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java @@ -1587,11 +1587,6 @@ public void testExitFromParallelLoop() throws Exception { byte[] log = run(); assertNoLog(log, ".*should not reach here.*"); - - // thread in loop should execute at least one step - assertLog(log, ".*inner start: one.*"); - assertLog(log, ".*inner start: two.*"); - assertLog(log, ".*inner start: three.*"); } @Test From 5326b1ded81bcfe707ec2f31bc91fbcf6a19025a Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Mon, 13 Nov 2023 19:08:43 +0100 Subject: [PATCH 16/52] Changelog 2.2.0 (#822) --- CHANGELOG.md | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46e8c41cbb..20a0fd0289 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Change log +## [2.2.0] - Unreleased + +### Added + +- pfed-sso: enable bearer token authentication +([#811](https://github.com/walmartlabs/concord/pull/811)). + +### Changed + +- runtime-v2: fix exit from parallel loop #830 +([#830](https://github.com/walmartlabs/concord/pull/830)); +- console2: calculate process duration from process last running timestamp +([#794](https://github.com/walmartlabs/concord/pull/794)); +- console2: do not drop secrets form values on error/password check fail +([#798](https://github.com/walmartlabs/concord/pull/798)); +- project: attach javadoc jars only on release +([#823](https://github.com/walmartlabs/concord/pull/823)); +- project: upgrade to source level 17 +([#824](https://github.com/walmartlabs/concord/pull/824)); +- project: remove more @Named usage +([#828](https://github.com/walmartlabs/concord/pull/828)). + ## [2.1.0] - 2023-10-10 ### Added @@ -31,9 +53,10 @@ - cli: active profiles fix ([#789](https://github.com/walmartlabs/concord/pull/789)). -## [2.0.0] - 2023-08-16 +## [2.0.0] - 2023-08-16 + # Breaking - project: drop support for JDK 8 and JDK 11. Make JDK 17 @@ -90,6 +113,8 @@ auth ([#764](https://github.com/walmartlabs/concord/pull/764)); - console2: do not remove project after rename; ([#770](https://github.com/walmartlabs/concord/pull/770)). + + ## [1.102.0] - 2023-05-22 ### Added @@ -124,6 +149,8 @@ improve error messages - runtime-v2: allow increment variables in expressions ([#740](https://github.com/walmartlabs/concord/pull/740)). + + ## [1.101.0] - 2023-03-29 ### Added @@ -170,6 +197,8 @@ forms - concord-server: remove more @Named usage ([#650](https://github.com/walmartlabs/concord/pull/650)). + + ## [1.99.0] - 2023-02-24 ### Added @@ -376,6 +405,7 @@ to support k8s 1.22+ ([#639](https://github.com/walmartlabs/concord/pull/639)). + ## [1.95.0] - 2022-04-16 ### Added @@ -417,6 +447,8 @@ files ([#593](https://github.com/walmartlabs/concord/pull/593)). - it: explicitly specify initialBranch for git tests ([#582](https://github.com/walmartlabs/concord/pull/582)). + + ## [1.93.3] - 2022-03-11 ### Changed From 531718a5c7ed32c7d1de5e8a975ed3064c6b48ee Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Mon, 13 Nov 2023 13:20:18 -0500 Subject: [PATCH 17/52] [maven-release-plugin] prepare release 2.2.0 --- agent/pom.xml | 2 +- cli/pom.xml | 2 +- client/pom.xml | 2 +- client2/pom.xml | 2 +- common/pom.xml | 2 +- console2/pom.xml | 2 +- dependency-manager/pom.xml | 2 +- docker-images/agent/pom.xml | 2 +- docker-images/ansible/pom.xml | 2 +- docker-images/base/pom.xml | 2 +- docker-images/pom.xml | 2 +- docker-images/server/pom.xml | 2 +- forms/pom.xml | 2 +- imports/pom.xml | 2 +- it/common/pom.xml | 2 +- it/compat/pom.xml | 2 +- it/console/pom.xml | 2 +- it/pom.xml | 2 +- it/runtime-v1/pom.xml | 2 +- it/runtime-v2/pom.xml | 2 +- it/server/pom.xml | 2 +- it/tasks/broken-deps/pom.xml | 2 +- it/tasks/client1-test/pom.xml | 2 +- it/tasks/dependency-manager-test/pom.xml | 2 +- it/tasks/serialization-test/pom.xml | 2 +- it/tasks/suspend-test/pom.xml | 2 +- it/testing-server/pom.xml | 6 ++---- k8s/agent-operator/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/tasks/ansible/pom.xml | 2 +- plugins/tasks/concord/pom.xml | 2 +- plugins/tasks/crypto/pom.xml | 2 +- plugins/tasks/docker/pom.xml | 2 +- plugins/tasks/dynamic-tasks/pom.xml | 2 +- plugins/tasks/example/pom.xml | 2 +- plugins/tasks/files/pom.xml | 2 +- plugins/tasks/http/pom.xml | 2 +- plugins/tasks/kv/pom.xml | 2 +- plugins/tasks/locale/pom.xml | 2 +- plugins/tasks/lock/pom.xml | 2 +- plugins/tasks/log/pom.xml | 2 +- plugins/tasks/misc/pom.xml | 2 +- plugins/tasks/noderoster/pom.xml | 2 +- plugins/tasks/resource/pom.xml | 2 +- plugins/tasks/slack/pom.xml | 2 +- plugins/tasks/sleep/pom.xml | 2 +- plugins/tasks/smtp/pom.xml | 2 +- plugins/tasks/throw/pom.xml | 2 +- plugins/tasks/variables/pom.xml | 2 +- plugins/templates/ansible/pom.xml | 2 +- policy-engine/pom.xml | 2 +- pom.xml | 4 ++-- repository/pom.xml | 2 +- runtime/common/pom.xml | 2 +- runtime/loader/pom.xml | 2 +- runtime/v1/impl/pom.xml | 2 +- runtime/v1/pom.xml | 2 +- runtime/v1/project-model/pom.xml | 2 +- runtime/v2/model/pom.xml | 2 +- runtime/v2/pom.xml | 2 +- runtime/v2/runner/pom.xml | 2 +- runtime/v2/sdk/pom.xml | 2 +- runtime/v2/vm/pom.xml | 2 +- sdk/pom.xml | 2 +- server/db/pom.xml | 2 +- server/dist/pom.xml | 2 +- server/impl/pom.xml | 2 +- server/liquibase-ext/pom.xml | 2 +- server/plugins/ansible/client/pom.xml | 2 +- server/plugins/ansible/client2/pom.xml | 2 +- server/plugins/ansible/db/pom.xml | 2 +- server/plugins/ansible/impl/pom.xml | 2 +- server/plugins/ansible/pom.xml | 2 +- server/plugins/kafka-event-sink/pom.xml | 2 +- server/plugins/noderoster/client/pom.xml | 2 +- server/plugins/noderoster/client2/pom.xml | 2 +- server/plugins/noderoster/db/pom.xml | 2 +- server/plugins/noderoster/impl/pom.xml | 2 +- server/plugins/noderoster/pom.xml | 2 +- server/plugins/oidc/pom.xml | 2 +- server/plugins/oneops/pom.xml | 2 +- server/plugins/pfed-sso/pom.xml | 2 +- server/plugins/pom.xml | 2 +- server/pom.xml | 2 +- server/queue-client/pom.xml | 2 +- server/sdk/pom.xml | 2 +- targetplatform/pom.xml | 4 ++-- 87 files changed, 90 insertions(+), 92 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index 64c4001982..bc61c4cc1e 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/cli/pom.xml b/cli/pom.xml index e4a5d95703..681eaf9086 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index 4fc0aef8c0..5ab08c51fe 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/client2/pom.xml b/client2/pom.xml index b4bd0b0986..50584094b1 100644 --- a/client2/pom.xml +++ b/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/common/pom.xml b/common/pom.xml index d3800d275d..f6459dddda 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/console2/pom.xml b/console2/pom.xml index 3df2f8be18..493ac04cb8 100644 --- a/console2/pom.xml +++ b/console2/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/dependency-manager/pom.xml b/dependency-manager/pom.xml index ca193853fa..721f543d69 100644 --- a/dependency-manager/pom.xml +++ b/dependency-manager/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/docker-images/agent/pom.xml b/docker-images/agent/pom.xml index 175d05b0d1..9c89eb9491 100644 --- a/docker-images/agent/pom.xml +++ b/docker-images/agent/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/docker-images/ansible/pom.xml b/docker-images/ansible/pom.xml index f1d448825c..572a718785 100644 --- a/docker-images/ansible/pom.xml +++ b/docker-images/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/docker-images/base/pom.xml b/docker-images/base/pom.xml index 0b87dbeaa2..b9795e3d1f 100644 --- a/docker-images/base/pom.xml +++ b/docker-images/base/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.docker parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/docker-images/pom.xml b/docker-images/pom.xml index dbf4362db9..25d206474a 100644 --- a/docker-images/pom.xml +++ b/docker-images/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/docker-images/server/pom.xml b/docker-images/server/pom.xml index 2210ff32ed..3a74a2c912 100644 --- a/docker-images/server/pom.xml +++ b/docker-images/server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/forms/pom.xml b/forms/pom.xml index 566ee416f3..ec7c39336d 100644 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/imports/pom.xml b/imports/pom.xml index c8a1628e0f..629bfef4ff 100644 --- a/imports/pom.xml +++ b/imports/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/it/common/pom.xml b/it/common/pom.xml index a57fe249c2..2bce0a7bba 100644 --- a/it/common/pom.xml +++ b/it/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/it/compat/pom.xml b/it/compat/pom.xml index dcf30a4d01..bf05093e7a 100644 --- a/it/compat/pom.xml +++ b/it/compat/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/it/console/pom.xml b/it/console/pom.xml index 343e8e99c5..83cb8ba23d 100644 --- a/it/console/pom.xml +++ b/it/console/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/it/pom.xml b/it/pom.xml index 9b80ef8aa2..f855d78e33 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/it/runtime-v1/pom.xml b/it/runtime-v1/pom.xml index 0de62eba74..8f644f5857 100644 --- a/it/runtime-v1/pom.xml +++ b/it/runtime-v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/it/runtime-v2/pom.xml b/it/runtime-v2/pom.xml index 45c8a8bfa9..5edd26961b 100644 --- a/it/runtime-v2/pom.xml +++ b/it/runtime-v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/it/server/pom.xml b/it/server/pom.xml index ac7d42d62f..f3192b8065 100644 --- a/it/server/pom.xml +++ b/it/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/it/tasks/broken-deps/pom.xml b/it/tasks/broken-deps/pom.xml index ae95bac95f..96b96685ca 100644 --- a/it/tasks/broken-deps/pom.xml +++ b/it/tasks/broken-deps/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/it/tasks/client1-test/pom.xml b/it/tasks/client1-test/pom.xml index b9bf7233b2..5736d29457 100644 --- a/it/tasks/client1-test/pom.xml +++ b/it/tasks/client1-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/it/tasks/dependency-manager-test/pom.xml b/it/tasks/dependency-manager-test/pom.xml index 2549ad444a..010bd2778f 100644 --- a/it/tasks/dependency-manager-test/pom.xml +++ b/it/tasks/dependency-manager-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/it/tasks/serialization-test/pom.xml b/it/tasks/serialization-test/pom.xml index 857a52ef46..cd125866b2 100644 --- a/it/tasks/serialization-test/pom.xml +++ b/it/tasks/serialization-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/it/tasks/suspend-test/pom.xml b/it/tasks/suspend-test/pom.xml index 9ec57b0391..6bd61beeea 100644 --- a/it/tasks/suspend-test/pom.xml +++ b/it/tasks/suspend-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/it/testing-server/pom.xml b/it/testing-server/pom.xml index 79089f0176..20afe54ab9 100644 --- a/it/testing-server/pom.xml +++ b/it/testing-server/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 com.walmartlabs.concord.it parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/k8s/agent-operator/pom.xml b/k8s/agent-operator/pom.xml index e03fd15f5e..f559b1857f 100644 --- a/k8s/agent-operator/pom.xml +++ b/k8s/agent-operator/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 9babe8bef3..58e5bfdc2a 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/plugins/tasks/ansible/pom.xml b/plugins/tasks/ansible/pom.xml index 23c59fa270..4227593185 100644 --- a/plugins/tasks/ansible/pom.xml +++ b/plugins/tasks/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/concord/pom.xml b/plugins/tasks/concord/pom.xml index b45109c03a..d8bf842f22 100644 --- a/plugins/tasks/concord/pom.xml +++ b/plugins/tasks/concord/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/crypto/pom.xml b/plugins/tasks/crypto/pom.xml index d2632dfc03..5ccbdddd36 100644 --- a/plugins/tasks/crypto/pom.xml +++ b/plugins/tasks/crypto/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/docker/pom.xml b/plugins/tasks/docker/pom.xml index a93215cb48..5fefd94149 100644 --- a/plugins/tasks/docker/pom.xml +++ b/plugins/tasks/docker/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/dynamic-tasks/pom.xml b/plugins/tasks/dynamic-tasks/pom.xml index 81b99350b6..0f043fd106 100644 --- a/plugins/tasks/dynamic-tasks/pom.xml +++ b/plugins/tasks/dynamic-tasks/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/example/pom.xml b/plugins/tasks/example/pom.xml index 0b14ddaaf2..44884ac443 100644 --- a/plugins/tasks/example/pom.xml +++ b/plugins/tasks/example/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/files/pom.xml b/plugins/tasks/files/pom.xml index 2c22a6b6d3..7d9417561c 100644 --- a/plugins/tasks/files/pom.xml +++ b/plugins/tasks/files/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/http/pom.xml b/plugins/tasks/http/pom.xml index 675ccad56e..4605c4c92d 100644 --- a/plugins/tasks/http/pom.xml +++ b/plugins/tasks/http/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/kv/pom.xml b/plugins/tasks/kv/pom.xml index 39005eced9..feb20456c7 100644 --- a/plugins/tasks/kv/pom.xml +++ b/plugins/tasks/kv/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/locale/pom.xml b/plugins/tasks/locale/pom.xml index aff649a2f6..d66a7411c8 100644 --- a/plugins/tasks/locale/pom.xml +++ b/plugins/tasks/locale/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/lock/pom.xml b/plugins/tasks/lock/pom.xml index 1901af9140..43506d0bdd 100644 --- a/plugins/tasks/lock/pom.xml +++ b/plugins/tasks/lock/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/log/pom.xml b/plugins/tasks/log/pom.xml index 89ab126290..e39f67e2c9 100644 --- a/plugins/tasks/log/pom.xml +++ b/plugins/tasks/log/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/misc/pom.xml b/plugins/tasks/misc/pom.xml index 4ab16563d2..b720e06cc2 100644 --- a/plugins/tasks/misc/pom.xml +++ b/plugins/tasks/misc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/noderoster/pom.xml b/plugins/tasks/noderoster/pom.xml index 33107a3a71..c0d31f712f 100644 --- a/plugins/tasks/noderoster/pom.xml +++ b/plugins/tasks/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/resource/pom.xml b/plugins/tasks/resource/pom.xml index 442e02b5b2..7e3683b1c2 100644 --- a/plugins/tasks/resource/pom.xml +++ b/plugins/tasks/resource/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/slack/pom.xml b/plugins/tasks/slack/pom.xml index 071c27a3b5..e85cf9124e 100644 --- a/plugins/tasks/slack/pom.xml +++ b/plugins/tasks/slack/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/sleep/pom.xml b/plugins/tasks/sleep/pom.xml index e1bf2fd684..fe41c388c0 100644 --- a/plugins/tasks/sleep/pom.xml +++ b/plugins/tasks/sleep/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/smtp/pom.xml b/plugins/tasks/smtp/pom.xml index ca5bd1131d..9f4683c74f 100644 --- a/plugins/tasks/smtp/pom.xml +++ b/plugins/tasks/smtp/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/throw/pom.xml b/plugins/tasks/throw/pom.xml index 907db95b47..a2fc457a00 100644 --- a/plugins/tasks/throw/pom.xml +++ b/plugins/tasks/throw/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/tasks/variables/pom.xml b/plugins/tasks/variables/pom.xml index a585ca4673..f3047cf3b7 100644 --- a/plugins/tasks/variables/pom.xml +++ b/plugins/tasks/variables/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/plugins/templates/ansible/pom.xml b/plugins/templates/ansible/pom.xml index 2205dc28fb..a0e72ccafd 100644 --- a/plugins/templates/ansible/pom.xml +++ b/plugins/templates/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/policy-engine/pom.xml b/policy-engine/pom.xml index acfae4c163..d926611d7c 100644 --- a/policy-engine/pom.xml +++ b/policy-engine/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 961f2d3f7d..9c5b6fc2c5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 pom ${project.groupId}:${project.artifactId} @@ -427,7 +427,7 @@ ${scm.connection} ${scm.connection} - HEAD + 2.2.0 diff --git a/repository/pom.xml b/repository/pom.xml index 70939ee58a..53a16e005b 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/runtime/common/pom.xml b/runtime/common/pom.xml index ea7f3e8754..e9cff5b373 100644 --- a/runtime/common/pom.xml +++ b/runtime/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/runtime/loader/pom.xml b/runtime/loader/pom.xml index b96696874c..5bbf4ad202 100644 --- a/runtime/loader/pom.xml +++ b/runtime/loader/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/runtime/v1/impl/pom.xml b/runtime/v1/impl/pom.xml index 0384f0ed4f..c7d9bccce2 100644 --- a/runtime/v1/impl/pom.xml +++ b/runtime/v1/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/runtime/v1/pom.xml b/runtime/v1/pom.xml index 29fe557fc9..04970083af 100644 --- a/runtime/v1/pom.xml +++ b/runtime/v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/runtime/v1/project-model/pom.xml b/runtime/v1/project-model/pom.xml index f066f72d90..06ef1cec48 100644 --- a/runtime/v1/project-model/pom.xml +++ b/runtime/v1/project-model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/runtime/v2/model/pom.xml b/runtime/v2/model/pom.xml index 038153c8d0..a3bfcc1d88 100644 --- a/runtime/v2/model/pom.xml +++ b/runtime/v2/model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/runtime/v2/pom.xml b/runtime/v2/pom.xml index ebb7fbcb82..798ccc4932 100644 --- a/runtime/v2/pom.xml +++ b/runtime/v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../../pom.xml diff --git a/runtime/v2/runner/pom.xml b/runtime/v2/runner/pom.xml index b7c2586c18..3c76580a67 100644 --- a/runtime/v2/runner/pom.xml +++ b/runtime/v2/runner/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/runtime/v2/sdk/pom.xml b/runtime/v2/sdk/pom.xml index e92f73ceee..d77e7b5fa9 100644 --- a/runtime/v2/sdk/pom.xml +++ b/runtime/v2/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/runtime/v2/vm/pom.xml b/runtime/v2/vm/pom.xml index 9bd12d2e5d..ded254805b 100644 --- a/runtime/v2/vm/pom.xml +++ b/runtime/v2/vm/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 54fcfe3f68..236248ba81 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/db/pom.xml b/server/db/pom.xml index 73218f9f0c..77e5b0f844 100644 --- a/server/db/pom.xml +++ b/server/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/dist/pom.xml b/server/dist/pom.xml index d7819e134d..aaa0d4f524 100644 --- a/server/dist/pom.xml +++ b/server/dist/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/impl/pom.xml b/server/impl/pom.xml index 2b82c384ac..eed10f1341 100644 --- a/server/impl/pom.xml +++ b/server/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/liquibase-ext/pom.xml b/server/liquibase-ext/pom.xml index bf1b1b9096..b688f41f2d 100644 --- a/server/liquibase-ext/pom.xml +++ b/server/liquibase-ext/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/ansible/client/pom.xml b/server/plugins/ansible/client/pom.xml index 9815b46cc0..8847fca460 100644 --- a/server/plugins/ansible/client/pom.xml +++ b/server/plugins/ansible/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/ansible/client2/pom.xml b/server/plugins/ansible/client2/pom.xml index e58d724ab5..ae5109f09a 100644 --- a/server/plugins/ansible/client2/pom.xml +++ b/server/plugins/ansible/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/ansible/db/pom.xml b/server/plugins/ansible/db/pom.xml index 90eba31aea..aba0989505 100644 --- a/server/plugins/ansible/db/pom.xml +++ b/server/plugins/ansible/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/ansible/impl/pom.xml b/server/plugins/ansible/impl/pom.xml index 15067be0d9..719413490a 100644 --- a/server/plugins/ansible/impl/pom.xml +++ b/server/plugins/ansible/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/ansible/pom.xml b/server/plugins/ansible/pom.xml index 2861633bc3..f447cd9d5a 100644 --- a/server/plugins/ansible/pom.xml +++ b/server/plugins/ansible/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/kafka-event-sink/pom.xml b/server/plugins/kafka-event-sink/pom.xml index 6783a1fc51..862e26295c 100644 --- a/server/plugins/kafka-event-sink/pom.xml +++ b/server/plugins/kafka-event-sink/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/noderoster/client/pom.xml b/server/plugins/noderoster/client/pom.xml index 0f2be8ccc5..e87e636f0f 100644 --- a/server/plugins/noderoster/client/pom.xml +++ b/server/plugins/noderoster/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/noderoster/client2/pom.xml b/server/plugins/noderoster/client2/pom.xml index 051c0e2061..69c1c1591b 100644 --- a/server/plugins/noderoster/client2/pom.xml +++ b/server/plugins/noderoster/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/noderoster/db/pom.xml b/server/plugins/noderoster/db/pom.xml index 69dffd73d2..e09c8bfa5f 100644 --- a/server/plugins/noderoster/db/pom.xml +++ b/server/plugins/noderoster/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/noderoster/impl/pom.xml b/server/plugins/noderoster/impl/pom.xml index 0086e06800..d19e8ead70 100644 --- a/server/plugins/noderoster/impl/pom.xml +++ b/server/plugins/noderoster/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/noderoster/pom.xml b/server/plugins/noderoster/pom.xml index f3ff9482ff..ea97141d60 100644 --- a/server/plugins/noderoster/pom.xml +++ b/server/plugins/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/oidc/pom.xml b/server/plugins/oidc/pom.xml index 9eaa2df207..52fb6f37cf 100644 --- a/server/plugins/oidc/pom.xml +++ b/server/plugins/oidc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/oneops/pom.xml b/server/plugins/oneops/pom.xml index 045d5c934a..443afffa4e 100644 --- a/server/plugins/oneops/pom.xml +++ b/server/plugins/oneops/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/plugins/pfed-sso/pom.xml b/server/plugins/pfed-sso/pom.xml index acca108b90..038631b46b 100644 --- a/server/plugins/pfed-sso/pom.xml +++ b/server/plugins/pfed-sso/pom.xml @@ -3,7 +3,7 @@ parent com.walmartlabs.concord.server.plugins - 2.1.1-SNAPSHOT + 2.2.0 4.0.0 diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml index 9e37a31038..620f7d0860 100644 --- a/server/plugins/pom.xml +++ b/server/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/pom.xml b/server/pom.xml index cc12484f5d..f1043233e7 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/queue-client/pom.xml b/server/queue-client/pom.xml index b4bd7887e3..557e2828f1 100644 --- a/server/queue-client/pom.xml +++ b/server/queue-client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/server/sdk/pom.xml b/server/sdk/pom.xml index aa8a97e38e..f822f4c807 100644 --- a/server/sdk/pom.xml +++ b/server/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.1.1-SNAPSHOT + 2.2.0 ../pom.xml diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index e2c0c6919e..e9fc12a901 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord concord-targetplatform - 2.1.1-SNAPSHOT + 2.2.0 pom @@ -1298,7 +1298,7 @@ ${scm.connection} ${scm.connection} - HEAD + 2.2.0 From 1fd2eca4e5dd2b0e1e0ebf9382b3b26c4ccab12f Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Mon, 13 Nov 2023 13:20:19 -0500 Subject: [PATCH 18/52] [maven-release-plugin] prepare for next development iteration --- agent/pom.xml | 2 +- cli/pom.xml | 2 +- client/pom.xml | 2 +- client2/pom.xml | 2 +- common/pom.xml | 2 +- console2/pom.xml | 2 +- dependency-manager/pom.xml | 2 +- docker-images/agent/pom.xml | 2 +- docker-images/ansible/pom.xml | 2 +- docker-images/base/pom.xml | 2 +- docker-images/pom.xml | 2 +- docker-images/server/pom.xml | 2 +- forms/pom.xml | 2 +- imports/pom.xml | 2 +- it/common/pom.xml | 2 +- it/compat/pom.xml | 2 +- it/console/pom.xml | 2 +- it/pom.xml | 2 +- it/runtime-v1/pom.xml | 2 +- it/runtime-v2/pom.xml | 2 +- it/server/pom.xml | 2 +- it/tasks/broken-deps/pom.xml | 2 +- it/tasks/client1-test/pom.xml | 2 +- it/tasks/dependency-manager-test/pom.xml | 2 +- it/tasks/serialization-test/pom.xml | 2 +- it/tasks/suspend-test/pom.xml | 2 +- it/testing-server/pom.xml | 2 +- k8s/agent-operator/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/tasks/ansible/pom.xml | 2 +- plugins/tasks/concord/pom.xml | 2 +- plugins/tasks/crypto/pom.xml | 2 +- plugins/tasks/docker/pom.xml | 2 +- plugins/tasks/dynamic-tasks/pom.xml | 2 +- plugins/tasks/example/pom.xml | 2 +- plugins/tasks/files/pom.xml | 2 +- plugins/tasks/http/pom.xml | 2 +- plugins/tasks/kv/pom.xml | 2 +- plugins/tasks/locale/pom.xml | 2 +- plugins/tasks/lock/pom.xml | 2 +- plugins/tasks/log/pom.xml | 2 +- plugins/tasks/misc/pom.xml | 2 +- plugins/tasks/noderoster/pom.xml | 2 +- plugins/tasks/resource/pom.xml | 2 +- plugins/tasks/slack/pom.xml | 2 +- plugins/tasks/sleep/pom.xml | 2 +- plugins/tasks/smtp/pom.xml | 2 +- plugins/tasks/throw/pom.xml | 2 +- plugins/tasks/variables/pom.xml | 2 +- plugins/templates/ansible/pom.xml | 2 +- policy-engine/pom.xml | 2 +- pom.xml | 4 ++-- repository/pom.xml | 2 +- runtime/common/pom.xml | 2 +- runtime/loader/pom.xml | 2 +- runtime/v1/impl/pom.xml | 2 +- runtime/v1/pom.xml | 2 +- runtime/v1/project-model/pom.xml | 2 +- runtime/v2/model/pom.xml | 2 +- runtime/v2/pom.xml | 2 +- runtime/v2/runner/pom.xml | 2 +- runtime/v2/sdk/pom.xml | 2 +- runtime/v2/vm/pom.xml | 2 +- sdk/pom.xml | 2 +- server/db/pom.xml | 2 +- server/dist/pom.xml | 2 +- server/impl/pom.xml | 2 +- server/liquibase-ext/pom.xml | 2 +- server/plugins/ansible/client/pom.xml | 2 +- server/plugins/ansible/client2/pom.xml | 2 +- server/plugins/ansible/db/pom.xml | 2 +- server/plugins/ansible/impl/pom.xml | 2 +- server/plugins/ansible/pom.xml | 2 +- server/plugins/kafka-event-sink/pom.xml | 2 +- server/plugins/noderoster/client/pom.xml | 2 +- server/plugins/noderoster/client2/pom.xml | 2 +- server/plugins/noderoster/db/pom.xml | 2 +- server/plugins/noderoster/impl/pom.xml | 2 +- server/plugins/noderoster/pom.xml | 2 +- server/plugins/oidc/pom.xml | 2 +- server/plugins/oneops/pom.xml | 2 +- server/plugins/pfed-sso/pom.xml | 2 +- server/plugins/pom.xml | 2 +- server/pom.xml | 2 +- server/queue-client/pom.xml | 2 +- server/sdk/pom.xml | 2 +- targetplatform/pom.xml | 4 ++-- 87 files changed, 89 insertions(+), 89 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index bc61c4cc1e..a1cff2027d 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/cli/pom.xml b/cli/pom.xml index 681eaf9086..c0485ddfa1 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index 5ab08c51fe..8af9c8c2a4 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/client2/pom.xml b/client2/pom.xml index 50584094b1..a61673ed55 100644 --- a/client2/pom.xml +++ b/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/common/pom.xml b/common/pom.xml index f6459dddda..1159d855d5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/console2/pom.xml b/console2/pom.xml index 493ac04cb8..da759610f9 100644 --- a/console2/pom.xml +++ b/console2/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/dependency-manager/pom.xml b/dependency-manager/pom.xml index 721f543d69..0cbf2cf8a3 100644 --- a/dependency-manager/pom.xml +++ b/dependency-manager/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/docker-images/agent/pom.xml b/docker-images/agent/pom.xml index 9c89eb9491..4bd148cad5 100644 --- a/docker-images/agent/pom.xml +++ b/docker-images/agent/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/docker-images/ansible/pom.xml b/docker-images/ansible/pom.xml index 572a718785..b11a9bd970 100644 --- a/docker-images/ansible/pom.xml +++ b/docker-images/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/docker-images/base/pom.xml b/docker-images/base/pom.xml index b9795e3d1f..4c91398b20 100644 --- a/docker-images/base/pom.xml +++ b/docker-images/base/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.docker parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/docker-images/pom.xml b/docker-images/pom.xml index 25d206474a..e6c20acecc 100644 --- a/docker-images/pom.xml +++ b/docker-images/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/docker-images/server/pom.xml b/docker-images/server/pom.xml index 3a74a2c912..802c912d19 100644 --- a/docker-images/server/pom.xml +++ b/docker-images/server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/forms/pom.xml b/forms/pom.xml index ec7c39336d..fcbe3e9e31 100644 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/imports/pom.xml b/imports/pom.xml index 629bfef4ff..3dbefdddf1 100644 --- a/imports/pom.xml +++ b/imports/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/it/common/pom.xml b/it/common/pom.xml index 2bce0a7bba..ccb6b2943a 100644 --- a/it/common/pom.xml +++ b/it/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/it/compat/pom.xml b/it/compat/pom.xml index bf05093e7a..f243891fbf 100644 --- a/it/compat/pom.xml +++ b/it/compat/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/it/console/pom.xml b/it/console/pom.xml index 83cb8ba23d..82b9840b49 100644 --- a/it/console/pom.xml +++ b/it/console/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/it/pom.xml b/it/pom.xml index f855d78e33..e37b26a3fd 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/it/runtime-v1/pom.xml b/it/runtime-v1/pom.xml index 8f644f5857..1c47c5f0da 100644 --- a/it/runtime-v1/pom.xml +++ b/it/runtime-v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/it/runtime-v2/pom.xml b/it/runtime-v2/pom.xml index 5edd26961b..90712164de 100644 --- a/it/runtime-v2/pom.xml +++ b/it/runtime-v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/it/server/pom.xml b/it/server/pom.xml index f3192b8065..4565759125 100644 --- a/it/server/pom.xml +++ b/it/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/it/tasks/broken-deps/pom.xml b/it/tasks/broken-deps/pom.xml index 96b96685ca..6541c28f68 100644 --- a/it/tasks/broken-deps/pom.xml +++ b/it/tasks/broken-deps/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/client1-test/pom.xml b/it/tasks/client1-test/pom.xml index 5736d29457..a2b1f86911 100644 --- a/it/tasks/client1-test/pom.xml +++ b/it/tasks/client1-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/dependency-manager-test/pom.xml b/it/tasks/dependency-manager-test/pom.xml index 010bd2778f..d3b9a2a436 100644 --- a/it/tasks/dependency-manager-test/pom.xml +++ b/it/tasks/dependency-manager-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/serialization-test/pom.xml b/it/tasks/serialization-test/pom.xml index cd125866b2..14426ec3c7 100644 --- a/it/tasks/serialization-test/pom.xml +++ b/it/tasks/serialization-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/suspend-test/pom.xml b/it/tasks/suspend-test/pom.xml index 6bd61beeea..2521017065 100644 --- a/it/tasks/suspend-test/pom.xml +++ b/it/tasks/suspend-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/it/testing-server/pom.xml b/it/testing-server/pom.xml index 20afe54ab9..23b03d94db 100644 --- a/it/testing-server/pom.xml +++ b/it/testing-server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/k8s/agent-operator/pom.xml b/k8s/agent-operator/pom.xml index f559b1857f..9b6fe9b607 100644 --- a/k8s/agent-operator/pom.xml +++ b/k8s/agent-operator/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 58e5bfdc2a..c39df5554c 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/plugins/tasks/ansible/pom.xml b/plugins/tasks/ansible/pom.xml index 4227593185..23c3b5c97e 100644 --- a/plugins/tasks/ansible/pom.xml +++ b/plugins/tasks/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/concord/pom.xml b/plugins/tasks/concord/pom.xml index d8bf842f22..de5c8dd418 100644 --- a/plugins/tasks/concord/pom.xml +++ b/plugins/tasks/concord/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/crypto/pom.xml b/plugins/tasks/crypto/pom.xml index 5ccbdddd36..db5499df31 100644 --- a/plugins/tasks/crypto/pom.xml +++ b/plugins/tasks/crypto/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/docker/pom.xml b/plugins/tasks/docker/pom.xml index 5fefd94149..85de83fade 100644 --- a/plugins/tasks/docker/pom.xml +++ b/plugins/tasks/docker/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/dynamic-tasks/pom.xml b/plugins/tasks/dynamic-tasks/pom.xml index 0f043fd106..b064c915a2 100644 --- a/plugins/tasks/dynamic-tasks/pom.xml +++ b/plugins/tasks/dynamic-tasks/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/example/pom.xml b/plugins/tasks/example/pom.xml index 44884ac443..a6c52b6640 100644 --- a/plugins/tasks/example/pom.xml +++ b/plugins/tasks/example/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/files/pom.xml b/plugins/tasks/files/pom.xml index 7d9417561c..0231123176 100644 --- a/plugins/tasks/files/pom.xml +++ b/plugins/tasks/files/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/http/pom.xml b/plugins/tasks/http/pom.xml index 4605c4c92d..f8b7f24869 100644 --- a/plugins/tasks/http/pom.xml +++ b/plugins/tasks/http/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/kv/pom.xml b/plugins/tasks/kv/pom.xml index feb20456c7..780f82309f 100644 --- a/plugins/tasks/kv/pom.xml +++ b/plugins/tasks/kv/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/locale/pom.xml b/plugins/tasks/locale/pom.xml index d66a7411c8..9d30e165b7 100644 --- a/plugins/tasks/locale/pom.xml +++ b/plugins/tasks/locale/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/lock/pom.xml b/plugins/tasks/lock/pom.xml index 43506d0bdd..eea9c2d1de 100644 --- a/plugins/tasks/lock/pom.xml +++ b/plugins/tasks/lock/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/log/pom.xml b/plugins/tasks/log/pom.xml index e39f67e2c9..4b01932393 100644 --- a/plugins/tasks/log/pom.xml +++ b/plugins/tasks/log/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/misc/pom.xml b/plugins/tasks/misc/pom.xml index b720e06cc2..d73dcf82b8 100644 --- a/plugins/tasks/misc/pom.xml +++ b/plugins/tasks/misc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/noderoster/pom.xml b/plugins/tasks/noderoster/pom.xml index c0d31f712f..03c1b20b24 100644 --- a/plugins/tasks/noderoster/pom.xml +++ b/plugins/tasks/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/resource/pom.xml b/plugins/tasks/resource/pom.xml index 7e3683b1c2..493f7ec494 100644 --- a/plugins/tasks/resource/pom.xml +++ b/plugins/tasks/resource/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/slack/pom.xml b/plugins/tasks/slack/pom.xml index e85cf9124e..e4d00cffaa 100644 --- a/plugins/tasks/slack/pom.xml +++ b/plugins/tasks/slack/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/sleep/pom.xml b/plugins/tasks/sleep/pom.xml index fe41c388c0..d04050994e 100644 --- a/plugins/tasks/sleep/pom.xml +++ b/plugins/tasks/sleep/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/smtp/pom.xml b/plugins/tasks/smtp/pom.xml index 9f4683c74f..3598a04b64 100644 --- a/plugins/tasks/smtp/pom.xml +++ b/plugins/tasks/smtp/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/throw/pom.xml b/plugins/tasks/throw/pom.xml index a2fc457a00..51b3b34930 100644 --- a/plugins/tasks/throw/pom.xml +++ b/plugins/tasks/throw/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/variables/pom.xml b/plugins/tasks/variables/pom.xml index f3047cf3b7..6a1186f7f4 100644 --- a/plugins/tasks/variables/pom.xml +++ b/plugins/tasks/variables/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/plugins/templates/ansible/pom.xml b/plugins/templates/ansible/pom.xml index a0e72ccafd..866d9399cb 100644 --- a/plugins/templates/ansible/pom.xml +++ b/plugins/templates/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/policy-engine/pom.xml b/policy-engine/pom.xml index d926611d7c..ad6d73c8e8 100644 --- a/policy-engine/pom.xml +++ b/policy-engine/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 9c5b6fc2c5..5e303f87e5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} @@ -427,7 +427,7 @@ ${scm.connection} ${scm.connection} - 2.2.0 + HEAD diff --git a/repository/pom.xml b/repository/pom.xml index 53a16e005b..9eddc95851 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/runtime/common/pom.xml b/runtime/common/pom.xml index e9cff5b373..35eca9b277 100644 --- a/runtime/common/pom.xml +++ b/runtime/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/runtime/loader/pom.xml b/runtime/loader/pom.xml index 5bbf4ad202..0ac070c793 100644 --- a/runtime/loader/pom.xml +++ b/runtime/loader/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v1/impl/pom.xml b/runtime/v1/impl/pom.xml index c7d9bccce2..2ca78abd63 100644 --- a/runtime/v1/impl/pom.xml +++ b/runtime/v1/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/runtime/v1/pom.xml b/runtime/v1/pom.xml index 04970083af..ad8d774685 100644 --- a/runtime/v1/pom.xml +++ b/runtime/v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v1/project-model/pom.xml b/runtime/v1/project-model/pom.xml index 06ef1cec48..dabb8345e3 100644 --- a/runtime/v1/project-model/pom.xml +++ b/runtime/v1/project-model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/model/pom.xml b/runtime/v2/model/pom.xml index a3bfcc1d88..d094ec19d8 100644 --- a/runtime/v2/model/pom.xml +++ b/runtime/v2/model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/pom.xml b/runtime/v2/pom.xml index 798ccc4932..a74224b544 100644 --- a/runtime/v2/pom.xml +++ b/runtime/v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v2/runner/pom.xml b/runtime/v2/runner/pom.xml index 3c76580a67..d07572c0ba 100644 --- a/runtime/v2/runner/pom.xml +++ b/runtime/v2/runner/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/sdk/pom.xml b/runtime/v2/sdk/pom.xml index d77e7b5fa9..d9c443cc76 100644 --- a/runtime/v2/sdk/pom.xml +++ b/runtime/v2/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/vm/pom.xml b/runtime/v2/vm/pom.xml index ded254805b..1d21acd9c7 100644 --- a/runtime/v2/vm/pom.xml +++ b/runtime/v2/vm/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 236248ba81..fdd6abef4e 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/db/pom.xml b/server/db/pom.xml index 77e5b0f844..2bb83df2af 100644 --- a/server/db/pom.xml +++ b/server/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/dist/pom.xml b/server/dist/pom.xml index aaa0d4f524..0b6e87c0ff 100644 --- a/server/dist/pom.xml +++ b/server/dist/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/impl/pom.xml b/server/impl/pom.xml index eed10f1341..231a72b5ce 100644 --- a/server/impl/pom.xml +++ b/server/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/liquibase-ext/pom.xml b/server/liquibase-ext/pom.xml index b688f41f2d..675b38e152 100644 --- a/server/liquibase-ext/pom.xml +++ b/server/liquibase-ext/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/client/pom.xml b/server/plugins/ansible/client/pom.xml index 8847fca460..2d3f14c7df 100644 --- a/server/plugins/ansible/client/pom.xml +++ b/server/plugins/ansible/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/client2/pom.xml b/server/plugins/ansible/client2/pom.xml index ae5109f09a..e771c64394 100644 --- a/server/plugins/ansible/client2/pom.xml +++ b/server/plugins/ansible/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/db/pom.xml b/server/plugins/ansible/db/pom.xml index aba0989505..c80066bfe3 100644 --- a/server/plugins/ansible/db/pom.xml +++ b/server/plugins/ansible/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/impl/pom.xml b/server/plugins/ansible/impl/pom.xml index 719413490a..dace30aea2 100644 --- a/server/plugins/ansible/impl/pom.xml +++ b/server/plugins/ansible/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/pom.xml b/server/plugins/ansible/pom.xml index f447cd9d5a..b11ec91f47 100644 --- a/server/plugins/ansible/pom.xml +++ b/server/plugins/ansible/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/kafka-event-sink/pom.xml b/server/plugins/kafka-event-sink/pom.xml index 862e26295c..bcdc617558 100644 --- a/server/plugins/kafka-event-sink/pom.xml +++ b/server/plugins/kafka-event-sink/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/client/pom.xml b/server/plugins/noderoster/client/pom.xml index e87e636f0f..e2b26f9ea8 100644 --- a/server/plugins/noderoster/client/pom.xml +++ b/server/plugins/noderoster/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/client2/pom.xml b/server/plugins/noderoster/client2/pom.xml index 69c1c1591b..d309dd2ebd 100644 --- a/server/plugins/noderoster/client2/pom.xml +++ b/server/plugins/noderoster/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/db/pom.xml b/server/plugins/noderoster/db/pom.xml index e09c8bfa5f..68ab61fed2 100644 --- a/server/plugins/noderoster/db/pom.xml +++ b/server/plugins/noderoster/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/impl/pom.xml b/server/plugins/noderoster/impl/pom.xml index d19e8ead70..f093cfb0a8 100644 --- a/server/plugins/noderoster/impl/pom.xml +++ b/server/plugins/noderoster/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/pom.xml b/server/plugins/noderoster/pom.xml index ea97141d60..108a70a11e 100644 --- a/server/plugins/noderoster/pom.xml +++ b/server/plugins/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/oidc/pom.xml b/server/plugins/oidc/pom.xml index 52fb6f37cf..34ab2a74ea 100644 --- a/server/plugins/oidc/pom.xml +++ b/server/plugins/oidc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/oneops/pom.xml b/server/plugins/oneops/pom.xml index 443afffa4e..06ef9f04f9 100644 --- a/server/plugins/oneops/pom.xml +++ b/server/plugins/oneops/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/pfed-sso/pom.xml b/server/plugins/pfed-sso/pom.xml index 038631b46b..32ad474415 100644 --- a/server/plugins/pfed-sso/pom.xml +++ b/server/plugins/pfed-sso/pom.xml @@ -3,7 +3,7 @@ parent com.walmartlabs.concord.server.plugins - 2.2.0 + 2.2.1-SNAPSHOT 4.0.0 diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml index 620f7d0860..9a7bc0a29f 100644 --- a/server/plugins/pom.xml +++ b/server/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/pom.xml b/server/pom.xml index f1043233e7..c87e5ba2dd 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/queue-client/pom.xml b/server/queue-client/pom.xml index 557e2828f1..3fb67e6429 100644 --- a/server/queue-client/pom.xml +++ b/server/queue-client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/server/sdk/pom.xml b/server/sdk/pom.xml index f822f4c807..799bd05149 100644 --- a/server/sdk/pom.xml +++ b/server/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.0 + 2.2.1-SNAPSHOT ../pom.xml diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index e9fc12a901..65a74e4a3b 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord concord-targetplatform - 2.2.0 + 2.2.1-SNAPSHOT pom @@ -1298,7 +1298,7 @@ ${scm.connection} ${scm.connection} - 2.2.0 + HEAD From 56a602b4f170bf5fd74b387939e7a612a650e35b Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Mon, 13 Nov 2023 17:03:57 -0500 Subject: [PATCH 19/52] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20a0fd0289..56679e7d42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change log -## [2.2.0] - Unreleased +## [2.2.0] - 2023-11-13 ### Added From 04334bc61da0ed6c0d058b1f3dfd817c7a577bf0 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 14 Nov 2023 09:20:45 -0500 Subject: [PATCH 20/52] project: attach source jars only on release --- pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml index 5e303f87e5..53dcb4d9b7 100644 --- a/pom.xml +++ b/pom.xml @@ -295,6 +295,9 @@ + + true + org.apache.maven.plugins @@ -470,6 +473,21 @@ none + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + false + + From 44f18174dc2707e01e28af96de65880772df160a Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 14 Nov 2023 09:21:44 -0500 Subject: [PATCH 21/52] testing-concord-server: add getter for the server instance --- .../concord/it/testingserver/TestingConcordServer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java index cb0b2b3194..e5d8acaebf 100644 --- a/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java +++ b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java @@ -84,6 +84,10 @@ public void stop() throws Exception { } } + public ConcordServer getServer() { + return server; + } + public PostgreSQLContainer getDb() { return db; } From 43f3c520e8a33a66ad84794dc69e0b08c0fe5cf6 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Wed, 15 Nov 2023 20:00:03 -0500 Subject: [PATCH 22/52] concord-server: remove more @Named --- .../process/ProcessHeartbeatResource.java | 5 ----- .../server/process/ProcessKvResource.java | 4 ---- .../server/process/ProcessLogResourceV2.java | 4 ---- .../concord/server/process/ProcessModule.java | 21 +++++++++++++++++-- .../server/process/ProcessResource.java | 21 +++++++++---------- .../server/process/ProcessResourceV2.java | 8 ------- .../checkpoint/ProcessCheckpointResource.java | 5 ----- .../ProcessCheckpointV2Resource.java | 2 -- .../process/event/ProcessEventResource.java | 2 -- .../server/process/form/FormResource.java | 2 -- .../process/locks/ProcessLocksResource.java | 2 -- 11 files changed, 29 insertions(+), 47 deletions(-) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessHeartbeatResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessHeartbeatResource.java index 7d2ce1a8e6..4d0be8c847 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessHeartbeatResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessHeartbeatResource.java @@ -26,15 +26,11 @@ import org.sonatype.siesta.Resource; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import java.util.UUID; -@Named -@Singleton @Path("/api/v1/process") @Tag(name = "ProcessHeartbeat") public class ProcessHeartbeatResource implements Resource { @@ -46,7 +42,6 @@ public ProcessHeartbeatResource(ProcessQueueDao queueDao) { this.queueDao = queueDao; } - @POST @Path("{id}/ping") @Operation(description = "Process heartbeat", operationId = "pingProcess") diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessKvResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessKvResource.java index 8ea1abca40..75a2bc7f31 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessKvResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessKvResource.java @@ -31,14 +31,10 @@ import org.sonatype.siesta.Resource; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import java.util.UUID; -@Named -@Singleton @Path("/api/v1/process") @Tag(name = "Process KV store") public class ProcessKvResource implements Resource { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessLogResourceV2.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessLogResourceV2.java index 17160e76c4..f11b8a3237 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessLogResourceV2.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessLogResourceV2.java @@ -39,8 +39,6 @@ import org.sonatype.siesta.ValidationErrorsException; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -56,8 +54,6 @@ /** * API to work with segmented process logs. */ -@Named -@Singleton @Path("/api/v2/process") @Tag(name = "ProcessLogV2") public class ProcessLogResourceV2 implements Resource { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessModule.java index 014cf6a908..484bff5efe 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessModule.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessModule.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,6 +23,11 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.walmartlabs.concord.imports.ImportManager; +import com.walmartlabs.concord.server.process.checkpoint.ProcessCheckpointResource; +import com.walmartlabs.concord.server.process.checkpoint.ProcessCheckpointV2Resource; +import com.walmartlabs.concord.server.process.event.ProcessEventResource; +import com.walmartlabs.concord.server.process.form.FormResource; +import com.walmartlabs.concord.server.process.locks.ProcessLocksResource; import com.walmartlabs.concord.server.process.locks.ProcessLocksWatchdog; import com.walmartlabs.concord.server.process.pipelines.processors.ExclusiveGroupProcessor; import com.walmartlabs.concord.server.process.pipelines.processors.policy.*; @@ -40,6 +45,7 @@ import static com.google.inject.Scopes.SINGLETON; import static com.google.inject.multibindings.Multibinder.newSetBinder; +import static com.walmartlabs.concord.server.Utils.bindJaxRsResource; import static com.walmartlabs.concord.server.Utils.bindSingletonScheduledTask; public class ProcessModule implements Module { @@ -77,5 +83,16 @@ public void configure(Binder binder) { newSetBinder(binder, PolicyApplier.class).addBinding().to(ProcessRuntimePolicyApplier.class); newSetBinder(binder, PolicyApplier.class).addBinding().to(ProcessTimeoutPolicyApplier.class); newSetBinder(binder, PolicyApplier.class).addBinding().to(WorkspacePolicyApplier.class); + + bindJaxRsResource(binder, FormResource.class); + bindJaxRsResource(binder, ProcessCheckpointResource.class); + bindJaxRsResource(binder, ProcessCheckpointV2Resource.class); + bindJaxRsResource(binder, ProcessEventResource.class); + bindJaxRsResource(binder, ProcessHeartbeatResource.class); + bindJaxRsResource(binder, ProcessKvResource.class); + bindJaxRsResource(binder, ProcessLocksResource.class); + bindJaxRsResource(binder, ProcessLogResourceV2.class); + bindJaxRsResource(binder, ProcessResource.class); + bindJaxRsResource(binder, ProcessResourceV2.class); } } diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java index 9f830ee941..7f12cfabc6 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java @@ -79,15 +79,16 @@ import org.sonatype.siesta.ValidationErrorsException; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import javax.servlet.http.HttpServletRequest; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import javax.ws.rs.*; import javax.ws.rs.core.*; import javax.ws.rs.core.Response.Status; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; @@ -98,8 +99,6 @@ import static com.walmartlabs.concord.server.process.state.ProcessStateManager.path; import static com.walmartlabs.concord.server.process.state.ProcessStateManager.zipTo; -@Named -@Singleton @javax.ws.rs.Path("/api/v1/process") @Tag(name = "Process") public class ProcessResource implements Resource { @@ -260,7 +259,6 @@ public StartProcessResponse start(@PathParam("entryPoint") String entryPoint, /** * Starts a new process instance. - * */ @POST @Consumes(MediaType.MULTIPART_FORM_DATA) @@ -478,9 +476,9 @@ public ProcessEntry waitForCompletion(@PathParam("id") UUID instanceId, ProcessStatus s = r.status(); if (s == ProcessStatus.FINISHED || - s == ProcessStatus.FAILED || - s == ProcessStatus.CANCELLED || - s == ProcessStatus.TIMED_OUT) { + s == ProcessStatus.FAILED || + s == ProcessStatus.CANCELLED || + s == ProcessStatus.TIMED_OUT) { return r; } @@ -758,6 +756,7 @@ public Response getLog(@PathParam("id") UUID instanceId, /** * Appends a process' log. + * * @deprecated in favor of the /api/v2/process/{id}/log* endpoints */ @POST @@ -1033,7 +1032,7 @@ private void assertProcessAccess(ProcessEntry pe, String downloadEntity) { } throw new UnauthorizedException("The current user (" + principal.getUsername() + ") doesn't have " + - "the necessary permissions to the download " + downloadEntity + " : " + pe.instanceId()); + "the necessary permissions to the download " + downloadEntity + " : " + pe.instanceId()); } private void assertResourceAccess(ProcessEntry pe, String resource) { @@ -1109,7 +1108,7 @@ private static Optional copyToTmp(InputStream in) { private static RuntimeException syncIsForbidden() { return new ConcordApplicationException("The 'sync' mode is no longer available. " + - "Please use sync=false and poll for the status updates.", Status.BAD_REQUEST); + "Please use sync=false and poll for the status updates.", Status.BAD_REQUEST); } private void assertAttachmentsPolicy(Path tmpDir, ProcessEntry entry) throws IOException { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResourceV2.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResourceV2.java index 4134bbc28f..6bb436327e 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResourceV2.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResourceV2.java @@ -43,31 +43,23 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.extensions.Extension; import io.swagger.v3.oas.annotations.extensions.ExtensionProperty; -import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.parameters.RequestBody; import io.swagger.v3.oas.annotations.tags.Tag; -import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonatype.siesta.Resource; import org.sonatype.siesta.ValidationErrorsException; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import javax.ws.rs.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; import java.util.*; import static com.walmartlabs.concord.server.Utils.unwrap; -@Named -@Singleton @Path("/api/v2/process") @Tag(name = "ProcessV2") public class ProcessResourceV2 implements Resource { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java index 2d45878fb1..f1ed6ff698 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointResource.java @@ -23,7 +23,6 @@ import com.walmartlabs.concord.common.IOUtils; import com.walmartlabs.concord.common.TemporaryPath; import com.walmartlabs.concord.server.MultipartUtils; -import com.walmartlabs.concord.server.org.secret.SecretResource; import com.walmartlabs.concord.server.process.ProcessEntry; import com.walmartlabs.concord.server.process.ProcessEntry.ProcessCheckpointEntry; import com.walmartlabs.concord.server.process.ProcessManager; @@ -45,8 +44,6 @@ import org.sonatype.siesta.ValidationErrorsException; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import javax.validation.Valid; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; @@ -58,8 +55,6 @@ import java.util.List; import java.util.UUID; -@Named -@Singleton @Path("/api/v1/process") @Tag(name = "Checkpoint") public class ProcessCheckpointResource implements Resource { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointV2Resource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointV2Resource.java index 7289656e3e..ab2005f0a4 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointV2Resource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/checkpoint/ProcessCheckpointV2Resource.java @@ -39,8 +39,6 @@ import javax.ws.rs.core.MediaType; import java.util.UUID; -@Named -@Singleton @Path("/api/v2/process") @Tag(name = "CheckpointV2") public class ProcessCheckpointV2Resource implements Resource { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/event/ProcessEventResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/event/ProcessEventResource.java index 2e49c69c0f..a788a455b1 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/event/ProcessEventResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/event/ProcessEventResource.java @@ -49,8 +49,6 @@ import static com.walmartlabs.concord.server.Utils.unwrap; -@Named -@Singleton @Path("/api/v1/process") @Tag(name = "Process Events") public class ProcessEventResource implements Resource { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResource.java index f885e810b6..124eac37ef 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/form/FormResource.java @@ -42,8 +42,6 @@ import static com.walmartlabs.concord.server.process.state.ProcessStateManager.path; -@Named -@Singleton @Path("/api/v1/process") @Tag(name = "Process Forms") public class FormResource implements Resource { diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksResource.java index d25ea20733..f08b22eaaa 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/locks/ProcessLocksResource.java @@ -39,8 +39,6 @@ import javax.ws.rs.core.Response; import java.util.UUID; -@Named -@Singleton @Path("/api/v1/process") @Tag(name = "Process Locks") public class ProcessLocksResource implements Resource { From 6436ad0c2ff4fda27d7e7ed63c45632de1675103 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Wed, 15 Nov 2023 19:54:24 -0500 Subject: [PATCH 23/52] concord-server: auto-wire modules in dist instead of impl Gives the option of excluding sisu from the classpath if auto-wiring is not required. --- .../testingserver/TestingConcordServer.java | 25 +++++++++++++++---- .../walmartlabs/concord/server/dist/Main.java | 13 ++++++++-- .../concord/server/ConcordServer.java | 14 ----------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java index e5d8acaebf..bcca549988 100644 --- a/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java +++ b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -40,10 +40,11 @@ public class TestingConcordServer implements AutoCloseable { + private final Map extraConfiguration; + private final List> extraModules; + private PostgreSQLContainer db; private ConcordServer server; - private Map extraConfiguration; - private List> extraModules; public TestingConcordServer(Map extraConfiguration, List> extraModules) { this.extraConfiguration = requireNonNull(extraConfiguration); @@ -119,10 +120,24 @@ private static String randomString() { return Base64.getEncoder().encodeToString(ab); } + /** + * Just an example. + */ public static void main(String[] args) throws Exception { try (TestingConcordServer server = new TestingConcordServer(Map.of("process.watchdogPeriod", "10 seconds"), List.of())) { server.start(); - Thread.sleep(100000); + + System.out.println(""" + ============================================================== + + UI: http://localhost:8001/ + DB: + JDBC URL: %s + username: %s + password: %s + """.formatted(server.getDb().getJdbcUrl(), server.getDb().getUsername(), server.getDb().getPassword())); + + Thread.currentThread().join(); } } } diff --git a/server/dist/src/main/java/com/walmartlabs/concord/server/dist/Main.java b/server/dist/src/main/java/com/walmartlabs/concord/server/dist/Main.java index 38627a69e4..d3cdd93996 100644 --- a/server/dist/src/main/java/com/walmartlabs/concord/server/dist/Main.java +++ b/server/dist/src/main/java/com/walmartlabs/concord/server/dist/Main.java @@ -22,6 +22,10 @@ import com.walmartlabs.concord.server.ConcordServer; import com.walmartlabs.concord.server.Version; +import org.eclipse.sisu.space.BeanScanning; +import org.eclipse.sisu.space.SpaceModule; +import org.eclipse.sisu.space.URLClassSpace; +import org.eclipse.sisu.wire.WireModule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.bridge.SLF4JBridgeHandler; @@ -38,10 +42,15 @@ public static void main(String[] args) throws Exception { long t1 = System.currentTimeMillis(); - ConcordServer.withAutoWiring() - .start(); + autoWire().start(); long t2 = System.currentTimeMillis(); log.info("main -> started in {}ms", (t2 - t1)); } + + public static ConcordServer autoWire() throws Exception { + // works as a plugin system by automatically wiring all @Named modules and beans in the classpath + ClassLoader cl = ConcordServer.class.getClassLoader(); + return ConcordServer.withModules(new WireModule(new SpaceModule(new URLClassSpace(cl), BeanScanning.GLOBAL_INDEX))); + } } diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java b/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java index 333d8532ba..bbf0f63547 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/ConcordServer.java @@ -25,10 +25,6 @@ import com.google.inject.Module; import com.walmartlabs.concord.server.boot.BackgroundTasks; import com.walmartlabs.concord.server.boot.HttpServer; -import org.eclipse.sisu.space.BeanScanning; -import org.eclipse.sisu.space.SpaceModule; -import org.eclipse.sisu.space.URLClassSpace; -import org.eclipse.sisu.wire.WireModule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,16 +47,6 @@ public final class ConcordServer { private final Object controlMutex = new Object(); - /** - * Start ConcordServer by scanning the local class path for the implementations of - * {@link HttpServer} or {@link BackgroundTasks}. - */ - public static ConcordServer withAutoWiring() throws Exception { - ClassLoader cl = ConcordServer.class.getClassLoader(); - return withModules( - new WireModule(new SpaceModule(new URLClassSpace(cl), BeanScanning.GLOBAL_INDEX))); - } - public static ConcordServer withModules(Module... modules) throws Exception { return withModules(List.of(modules)); } From 10946b91c69465d7a03b20c3a2d60cc35a9d454c Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Wed, 15 Nov 2023 21:55:23 -0500 Subject: [PATCH 24/52] project: use compiler release, upgrade checkstyle --- pom.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 53dcb4d9b7..48bf3d311f 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,9 @@ - 17 - 17 + 17 + ${maven.compiler.release + ${maven.compiler.release} UTF-8 UTF-8 @@ -106,10 +107,6 @@ maven-compiler-plugin 3.11.0 - - ${maven.compiler.source} - ${maven.compiler.target} - @@ -146,10 +143,9 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.2.1 checkstyle.xml - UTF-8 true true false From 96f82e04a5116472ef9eae699a50f3b78d056611 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 21 Nov 2023 10:14:26 -0500 Subject: [PATCH 25/52] concord-server: explicitly bind ObjectMapper --- .../concord/server/ApiServerModule.java | 11 ++++++++ ...ializer.java => ObjectMapperProvider.java} | 26 +++++++++---------- .../concord/server/TestObjectMapper.java | 4 +-- 3 files changed, 25 insertions(+), 16 deletions(-) rename server/impl/src/main/java/com/walmartlabs/concord/server/{ObjectMapperInitializer.java => ObjectMapperProvider.java} (58%) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/ApiServerModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/ApiServerModule.java index d0f13ab6ae..fb07707b21 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/ApiServerModule.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/ApiServerModule.java @@ -20,8 +20,10 @@ * ===== */ +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Binder; import com.google.inject.Module; +import com.google.inject.name.Names; import com.walmartlabs.concord.server.boot.*; import com.walmartlabs.concord.server.boot.filters.*; import com.walmartlabs.concord.server.boot.servlets.FormServletHolder; @@ -31,6 +33,8 @@ import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.web.mgt.WebSecurityManager; import org.eclipse.jetty.servlet.FilterHolder; +import org.sonatype.siesta.Component; +import org.sonatype.siesta.jackson2.ObjectMapperResolver; import javax.servlet.ServletContextListener; import javax.servlet.http.HttpServlet; @@ -44,7 +48,14 @@ public class ApiServerModule implements Module { @Override public void configure(Binder binder) { + // Jackson + + binder.bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class).in(SINGLETON); + binder.bind(ObjectMapper.class).annotatedWith(Names.named("siesta")).toProvider(ObjectMapperProvider.class).in(SINGLETON); + newSetBinder(binder, Component.class).addBinding().to(ObjectMapperResolver.class); + // Jetty + binder.bind(HttpServer.class).in(SINGLETON); // Filter diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperInitializer.java b/server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperProvider.java similarity index 58% rename from server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperInitializer.java rename to server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperProvider.java index 4184391c0e..eaa5068ac2 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperInitializer.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperProvider.java @@ -4,7 +4,7 @@ * ***** * Concord * ----- - * Copyright (C) 2017 - 2018 Walmart Inc. + * Copyright (C) 2017 - 2023 Walmart Inc. * ----- * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,24 +20,24 @@ * ===== */ +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.guava.GuavaModule; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import org.eclipse.sisu.EagerSingleton; -import javax.inject.Inject; -import javax.inject.Named; +import javax.inject.Provider; -@Named -@EagerSingleton -public class ObjectMapperInitializer { +public class ObjectMapperProvider implements Provider { - @Inject - public ObjectMapperInitializer(@Named("siesta") javax.inject.Provider mapperProvider) { - ObjectMapper om = mapperProvider.get(); - om.registerModule(new GuavaModule()); - om.registerModule(new Jdk8Module()); - om.registerModule(new JavaTimeModule()); + @Override + public ObjectMapper get() { + return new ObjectMapper() + .registerModule(new GuavaModule()) + .registerModule(new Jdk8Module()) + .registerModule(new JavaTimeModule()) + .setSerializationInclusion(JsonInclude.Include.NON_NULL) + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); } } diff --git a/server/impl/src/test/java/com/walmartlabs/concord/server/TestObjectMapper.java b/server/impl/src/test/java/com/walmartlabs/concord/server/TestObjectMapper.java index c42e4a53b7..83306020f8 100644 --- a/server/impl/src/test/java/com/walmartlabs/concord/server/TestObjectMapper.java +++ b/server/impl/src/test/java/com/walmartlabs/concord/server/TestObjectMapper.java @@ -28,9 +28,7 @@ public final class TestObjectMapper { public static final ObjectMapper INSTANCE = createObjectMapper(); private static ObjectMapper createObjectMapper() { - ObjectMapper om = new ObjectMapperProvider().get(); - new ObjectMapperInitializer(() -> om); - return om; + return new ObjectMapperProvider().get(); } private TestObjectMapper() { From 254b3b5cf2477722314f1e82dd837ba3143cbe83 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 21 Nov 2023 10:14:51 -0500 Subject: [PATCH 26/52] concord-agent: bind classes explicitly --- agent/pom.xml | 4 + .../com/walmartlabs/concord/agent/Agent.java | 5 -- .../concord/agent/AgentModule.java | 81 +++++++++++++++++++ .../concord/agent/ObjectMapperProvider.java | 26 ++++-- .../concord/agent/cfg/AgentConfiguration.java | 4 - .../concord/agent/cfg/ConfigProvider.java | 41 ---------- .../agent/cfg/DockerConfiguration.java | 4 - .../concord/agent/cfg/GitConfiguration.java | 2 - .../agent/cfg/ImportConfiguration.java | 4 - .../agent/cfg/PreForkConfiguration.java | 4 - .../cfg/RepositoryCacheConfiguration.java | 4 - .../agent/cfg/RunnerV1Configuration.java | 4 - .../agent/cfg/RunnerV2Configuration.java | 4 - .../agent/cfg/ServerConfiguration.java | 4 - .../executors/runner/DefaultDependencies.java | 4 - .../agent/executors/runner/ProcessPool.java | 4 - .../agent/remote/ApiClientFactory.java | 4 - .../agent/remote/QueueClientProvider.java | 4 - 18 files changed, 106 insertions(+), 101 deletions(-) create mode 100644 agent/src/main/java/com/walmartlabs/concord/agent/AgentModule.java delete mode 100644 agent/src/main/java/com/walmartlabs/concord/agent/cfg/ConfigProvider.java diff --git a/agent/pom.xml b/agent/pom.xml index a1cff2027d..0d3c386718 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -129,6 +129,10 @@ com.fasterxml.jackson.datatype jackson-datatype-jdk8 + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + com.google.code.findbugs jsr305 diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/Agent.java b/agent/src/main/java/com/walmartlabs/concord/agent/Agent.java index cbf69159d1..c2c1e5c04f 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/Agent.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/Agent.java @@ -37,18 +37,13 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; import java.util.UUID; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -@Named -@Singleton public class Agent { private static final Logger log = LoggerFactory.getLogger(Agent.class); diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/AgentModule.java b/agent/src/main/java/com/walmartlabs/concord/agent/AgentModule.java new file mode 100644 index 0000000000..376083f01f --- /dev/null +++ b/agent/src/main/java/com/walmartlabs/concord/agent/AgentModule.java @@ -0,0 +1,81 @@ +package com.walmartlabs.concord.agent; + +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2023 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.inject.Binder; +import com.google.inject.Module; +import com.typesafe.config.Config; +import com.walmartlabs.concord.agent.cfg.*; +import com.walmartlabs.concord.agent.executors.runner.DefaultDependencies; +import com.walmartlabs.concord.agent.executors.runner.ProcessPool; +import com.walmartlabs.concord.agent.remote.ApiClientFactory; +import com.walmartlabs.concord.agent.remote.QueueClientProvider; +import com.walmartlabs.concord.server.queueclient.QueueClient; +import com.walmartlabs.ollie.config.ConfigurationProcessor; +import com.walmartlabs.ollie.config.Environment; +import com.walmartlabs.ollie.config.EnvironmentSelector; + +import javax.inject.Named; + +import static com.google.inject.Scopes.SINGLETON; + +@Named +public class AgentModule implements Module { + + private final Config config; + + public AgentModule() { + this(loadDefaultConfig()); + } + + public AgentModule(Config config) { + this.config = config; + } + + @Override + public void configure(Binder binder) { + binder.bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class); + binder.bind(Config.class).toInstance(config); + + binder.bind(AgentConfiguration.class).in(SINGLETON); + binder.bind(DockerConfiguration.class).in(SINGLETON); + binder.bind(GitConfiguration.class).in(SINGLETON); + binder.bind(ImportConfiguration.class).in(SINGLETON); + binder.bind(PreForkConfiguration.class).in(SINGLETON); + binder.bind(RepositoryCacheConfiguration.class).in(SINGLETON); + binder.bind(RunnerV1Configuration.class).in(SINGLETON); + binder.bind(RunnerV2Configuration.class).in(SINGLETON); + binder.bind(ServerConfiguration.class).in(SINGLETON); + + binder.bind(DefaultDependencies.class).in(SINGLETON); + binder.bind(ProcessPool.class).in(SINGLETON); + binder.bind(ApiClientFactory.class).in(SINGLETON); + binder.bind(QueueClient.class).toProvider(QueueClientProvider.class).in(SINGLETON); + + binder.bind(Agent.class).in(SINGLETON); + } + + private static Config loadDefaultConfig() { + Environment env = new EnvironmentSelector().select(); + return new ConfigurationProcessor("concord-agent", env, null, null).process(); + } +} diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/ObjectMapperProvider.java b/agent/src/main/java/com/walmartlabs/concord/agent/ObjectMapperProvider.java index 857544fc15..e54760d6c1 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/ObjectMapperProvider.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/ObjectMapperProvider.java @@ -20,18 +20,34 @@ * ===== */ +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.guava.GuavaModule; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import javax.inject.Named; import javax.inject.Provider; -import javax.inject.Singleton; -@Named -@Singleton public class ObjectMapperProvider implements Provider { @Override public ObjectMapper get() { - return new ObjectMapper(); + ObjectMapper mapper = new ObjectMapper() + .registerModule(new Jdk8Module()) + .registerModule(new GuavaModule()) + .registerModule(new JavaTimeModule()); + + // Write dates as ISO-8601 + mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + + // Ignore unknown properties + mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + + // Ignore nulls + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + + return mapper; } } diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/AgentConfiguration.java b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/AgentConfiguration.java index eadd5478fc..4c5c99a486 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/AgentConfiguration.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/AgentConfiguration.java @@ -25,8 +25,6 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.nio.file.Path; import java.time.Duration; import java.util.List; @@ -37,8 +35,6 @@ import static com.walmartlabs.concord.agent.cfg.Utils.getOrCreatePath; import static com.walmartlabs.concord.agent.cfg.Utils.getStringOrDefault; -@Named -@Singleton public class AgentConfiguration { private static final Logger log = LoggerFactory.getLogger(AgentConfiguration.class); diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/ConfigProvider.java b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/ConfigProvider.java deleted file mode 100644 index efa3b9947e..0000000000 --- a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/ConfigProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.walmartlabs.concord.agent.cfg; - -/*- - * ***** - * Concord - * ----- - * Copyright (C) 2017 - 2019 Walmart Inc. - * ----- - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ===== - */ - -import com.typesafe.config.Config; -import com.walmartlabs.ollie.config.ConfigurationProcessor; -import com.walmartlabs.ollie.config.Environment; -import com.walmartlabs.ollie.config.EnvironmentSelector; - -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Singleton; - -@Named -@Singleton -public class ConfigProvider implements Provider { - - @Override - public Config get() { - Environment env = new EnvironmentSelector().select(); - return new ConfigurationProcessor("concord-agent", env).process(); - } -} diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/DockerConfiguration.java b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/DockerConfiguration.java index 90fde7f7f9..da7bc9cca4 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/DockerConfiguration.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/DockerConfiguration.java @@ -23,13 +23,9 @@ import com.typesafe.config.Config; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.util.List; import java.util.concurrent.TimeUnit; -@Named -@Singleton public class DockerConfiguration { private final String dockerHost; diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/GitConfiguration.java b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/GitConfiguration.java index 6dcce8e6e4..85bdcab673 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/GitConfiguration.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/GitConfiguration.java @@ -29,8 +29,6 @@ import static com.walmartlabs.concord.agent.cfg.Utils.getStringOrDefault; -@Named -@Singleton public class GitConfiguration { private final String token; diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/ImportConfiguration.java b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/ImportConfiguration.java index 7cde1f8ca7..f1f5756ba0 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/ImportConfiguration.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/ImportConfiguration.java @@ -23,14 +23,10 @@ import com.typesafe.config.Config; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.util.Collections; import java.util.HashSet; import java.util.Set; -@Named -@Singleton public class ImportConfiguration { private final Set disabledProcessors; diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/PreForkConfiguration.java b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/PreForkConfiguration.java index 68758b065c..de38930cee 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/PreForkConfiguration.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/PreForkConfiguration.java @@ -23,12 +23,8 @@ import com.typesafe.config.Config; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.util.concurrent.TimeUnit; -@Named -@Singleton public class PreForkConfiguration { private final boolean enabled; diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RepositoryCacheConfiguration.java b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RepositoryCacheConfiguration.java index 81ef969da0..c1454e31a1 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RepositoryCacheConfiguration.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RepositoryCacheConfiguration.java @@ -23,15 +23,11 @@ import com.typesafe.config.Config; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.nio.file.Path; import java.time.Duration; import static com.walmartlabs.concord.agent.cfg.Utils.getOrCreatePath; -@Named -@Singleton public class RepositoryCacheConfiguration { private final Path cacheDir; diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RunnerV1Configuration.java b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RunnerV1Configuration.java index 90246a638f..dc57172c37 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RunnerV1Configuration.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RunnerV1Configuration.java @@ -23,11 +23,7 @@ import com.typesafe.config.Config; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; -@Named -@Singleton public class RunnerV1Configuration extends AbstractRunnerConfiguration { @Inject diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RunnerV2Configuration.java b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RunnerV2Configuration.java index 1f12aee1a6..8128b7dd67 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RunnerV2Configuration.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/RunnerV2Configuration.java @@ -23,11 +23,7 @@ import com.typesafe.config.Config; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; -@Named -@Singleton public class RunnerV2Configuration extends AbstractRunnerConfiguration { @Inject diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/ServerConfiguration.java b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/ServerConfiguration.java index eabe02609c..5e6bfb4523 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/cfg/ServerConfiguration.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/cfg/ServerConfiguration.java @@ -25,14 +25,10 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.util.concurrent.TimeUnit; import static com.walmartlabs.concord.agent.cfg.Utils.getStringOrDefault; -@Named -@Singleton public class ServerConfiguration { private static final Logger log = LoggerFactory.getLogger(ServerConfiguration.class); diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/executors/runner/DefaultDependencies.java b/agent/src/main/java/com/walmartlabs/concord/agent/executors/runner/DefaultDependencies.java index 70ad0e3387..4c5d88f5e2 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/executors/runner/DefaultDependencies.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/executors/runner/DefaultDependencies.java @@ -23,8 +23,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Named; -import javax.inject.Singleton; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -37,8 +35,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -@Named -@Singleton public class DefaultDependencies { private static final Logger log = LoggerFactory.getLogger(DefaultDependencies.class); diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/executors/runner/ProcessPool.java b/agent/src/main/java/com/walmartlabs/concord/agent/executors/runner/ProcessPool.java index a389be7e8d..54dd575a65 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/executors/runner/ProcessPool.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/executors/runner/ProcessPool.java @@ -29,16 +29,12 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.io.IOException; import java.nio.file.Path; import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -@Named -@Singleton public class ProcessPool { private static final Logger log = LoggerFactory.getLogger(ProcessPool.class); diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/remote/ApiClientFactory.java b/agent/src/main/java/com/walmartlabs/concord/agent/remote/ApiClientFactory.java index 92e2fde99b..0b2403c212 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/remote/ApiClientFactory.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/remote/ApiClientFactory.java @@ -30,8 +30,6 @@ import com.walmartlabs.concord.common.IOUtils; import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; import java.io.IOException; import java.nio.file.Path; import java.util.HashMap; @@ -39,8 +37,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -@Named -@Singleton public class ApiClientFactory { private static final String SESSION_COOKIE_NAME = "JSESSIONID"; diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/remote/QueueClientProvider.java b/agent/src/main/java/com/walmartlabs/concord/agent/remote/QueueClientProvider.java index 789a565b8a..63f6945bd2 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/remote/QueueClientProvider.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/remote/QueueClientProvider.java @@ -26,13 +26,9 @@ import com.walmartlabs.concord.server.queueclient.QueueClientConfiguration; import javax.inject.Inject; -import javax.inject.Named; import javax.inject.Provider; -import javax.inject.Singleton; import java.net.URISyntaxException; -@Named -@Singleton public class QueueClientProvider implements Provider { private final AgentConfiguration agentCfg; From d89279a378d60b7be0d02a5a83165c1dad8e8603 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 21 Nov 2023 10:15:13 -0500 Subject: [PATCH 27/52] testing-concord-server: add agent wrapper, simple test --- it/testing-server/pom.xml | 15 +++ .../it/testingserver/TestingConcordAgent.java | 97 +++++++++++++++ .../testingserver/TestingConcordServer.java | 116 +++++++++++------- .../it/testingserver/TestingConcordIT.java | 109 ++++++++++++++++ 4 files changed, 296 insertions(+), 41 deletions(-) create mode 100644 it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordAgent.java create mode 100644 it/testing-server/src/test/java/com/walmartlabs/concord/it/testingserver/TestingConcordIT.java diff --git a/it/testing-server/pom.xml b/it/testing-server/pom.xml index 23b03d94db..d4cba3fc79 100644 --- a/it/testing-server/pom.xml +++ b/it/testing-server/pom.xml @@ -35,6 +35,10 @@ + + com.walmartlabs.concord + concord-agent + org.testcontainers postgresql @@ -43,5 +47,16 @@ com.typesafe config + + + com.walmartlabs.concord + concord-client2 + test + + + org.junit.jupiter + junit-jupiter-api + test + diff --git a/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordAgent.java b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordAgent.java new file mode 100644 index 0000000000..531378e33b --- /dev/null +++ b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordAgent.java @@ -0,0 +1,97 @@ +package com.walmartlabs.concord.it.testingserver; + +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2023 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + +import com.google.inject.Guice; +import com.google.inject.Module; +import com.typesafe.config.Config; +import com.typesafe.config.ConfigFactory; +import com.typesafe.config.ConfigParseOptions; +import com.typesafe.config.ConfigResolveOptions; +import com.walmartlabs.concord.agent.Agent; +import com.walmartlabs.concord.agent.AgentModule; + +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Stream; + +/** + * A helper class for running concord-agent. + * The agent runs in the same JVM as TestingConcordAgent. + */ +public class TestingConcordAgent implements AutoCloseable { + + private final Map extraConfiguration; + private final List> extraModules; + private final int apiPort; + private final String agentApiKey; + + private Agent agent; + + public TestingConcordAgent(TestingConcordServer testingConcordServer) { + this(testingConcordServer, Map.of(), List.of()); + } + + public TestingConcordAgent(TestingConcordServer testingConcordServer, Map extraConfiguration, List> extraModules) { + this.apiPort = testingConcordServer.getApiPort(); + this.agentApiKey = testingConcordServer.getAgentApiKey(); + this.extraConfiguration = extraConfiguration; + this.extraModules = extraModules; + } + + public synchronized void start() { + var config = prepareConfig(); + var system = new AgentModule(config); + var allModules = Stream.concat(extraModules.stream().map(f -> f.apply(config)), Stream.of(system)).toList(); + var injector = Guice.createInjector(allModules); + agent = injector.getInstance(Agent.class); + agent.start(); + } + + public synchronized void stop() { + if (agent != null) { + agent.stop(); + agent = null; + } + } + + @Override + public void close() { + this.stop(); + } + + private Config prepareConfig() { + var extraConfig = ConfigFactory.parseMap(this.extraConfiguration); + + var testConfig = ConfigFactory.parseMap(Map.of( + "maintenanceModeListenerPort", 0, + "server.apiBaseUrl", "http://localhost:" + apiPort, + "server.websocketUrl", "ws://localhost:" + apiPort + "/websocket", + "server.apiKey", agentApiKey + )); + + var defaultConfig = ConfigFactory.load("concord-agent.conf", ConfigParseOptions.defaults(), ConfigResolveOptions.defaults().setAllowUnresolved(true)) + .getConfig("concord-agent"); + + return extraConfig.withFallback(testConfig.withFallback(defaultConfig)).resolve(); + } +} diff --git a/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java index bcca549988..4f1260828e 100644 --- a/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java +++ b/it/testing-server/src/main/java/com/walmartlabs/concord/it/testingserver/TestingConcordServer.java @@ -20,6 +20,7 @@ * ===== */ +import com.google.common.collect.ImmutableMap; import com.google.inject.Module; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; @@ -36,28 +37,39 @@ import java.util.function.Function; import java.util.stream.Stream; +import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +/** + * A helper class for running concord-server. It runs PostgreSQL in Docker + * and the server runs in the same JVM as TestingConcordServer. + */ public class TestingConcordServer implements AutoCloseable { + private final PostgreSQLContainer db; private final Map extraConfiguration; private final List> extraModules; + private final int apiPort; + private final String adminApiKey; + private final String agentApiKey; - private PostgreSQLContainer db; private ConcordServer server; - public TestingConcordServer(Map extraConfiguration, List> extraModules) { - this.extraConfiguration = requireNonNull(extraConfiguration); - this.extraModules = requireNonNull(extraModules); + public TestingConcordServer(PostgreSQLContainer db) { + this(db, 8001, Map.of(), List.of()); } - public TestingConcordServer() { - this(Map.of(), List.of()); + public TestingConcordServer(PostgreSQLContainer db, int apiPort, Map extraConfiguration, List> extraModules) { + this.db = requireNonNull(db); + this.extraConfiguration = requireNonNull(extraConfiguration); + this.apiPort = apiPort; + this.extraModules = requireNonNull(extraModules); + this.adminApiKey = randomString(8); + this.agentApiKey = randomString(16); } public synchronized TestingConcordServer start() throws Exception { - db = new PostgreSQLContainer<>("postgres:15-alpine"); - db.start(); + checkArgument(db.isRunning(), "The database container is not running"); var config = prepareConfig(db); var system = new ConcordServerModule(config); @@ -68,21 +80,24 @@ public synchronized TestingConcordServer start() throws Exception { return this; } - @Override - public synchronized void close() throws Exception { - this.stop(); - } - - public void stop() throws Exception { + public synchronized void stop() throws Exception { if (server != null) { server.stop(); server = null; } + } - if (db != null) { - db.stop(); - db = null; - } + @Override + public void close() throws Exception { + this.stop(); + } + + public int getApiPort() { + return apiPort; + } + + public String getApiBaseUrl() { + return "http://localhost:" + apiPort; } public ConcordServer getServer() { @@ -93,20 +108,30 @@ public PostgreSQLContainer getDb() { return db; } + public String getAdminApiKey() { + return adminApiKey; + } + + public String getAgentApiKey() { + return agentApiKey; + } + private Config prepareConfig(PostgreSQLContainer db) { var extraConfig = ConfigFactory.parseMap(this.extraConfiguration); - var testConfig = ConfigFactory.parseMap(Map.of( - "db.url", db.getJdbcUrl(), - "db.appUsername", db.getUsername(), - "db.appPassword", db.getPassword(), - "db.inventoryUsername", db.getUsername(), - "db.inventoryPassword", db.getPassword(), - "db.changeLogParameters.defaultAdminToken", "foobar", - "secretStore.serverPassword", randomString(), - "secretStore.secretStoreSalt", randomString(), - "secretStore.projectSecretSalt", randomString() - )); + var testConfig = ConfigFactory.parseMap(ImmutableMap.builder() + .put("server.port", String.valueOf(apiPort)) + .put("db.url", db.getJdbcUrl()) + .put("db.appUsername", db.getUsername()) + .put("db.appPassword", db.getPassword()) + .put("db.inventoryUsername", db.getUsername()) + .put("db.inventoryPassword", db.getPassword()) + .put("db.changeLogParameters.defaultAdminToken", adminApiKey) + .put("db.changeLogParameters.defaultAgentToken", agentApiKey) + .put("secretStore.serverPassword", randomString(64)) + .put("secretStore.secretStoreSalt", randomString(64)) + .put("secretStore.projectSecretSalt", randomString(64)) + .build()); var defaultConfig = ConfigFactory.load("concord-server.conf", ConfigParseOptions.defaults(), ConfigResolveOptions.defaults().setAllowUnresolved(true)) .getConfig("concord-server"); @@ -114,8 +139,8 @@ private Config prepareConfig(PostgreSQLContainer db) { return extraConfig.withFallback(testConfig.withFallback(defaultConfig)).resolve(); } - private static String randomString() { - byte[] ab = new byte[64]; + private static String randomString(int minLength) { + byte[] ab = new byte[minLength]; new SecureRandom().nextBytes(ab); return Base64.getEncoder().encodeToString(ab); } @@ -124,20 +149,29 @@ private static String randomString() { * Just an example. */ public static void main(String[] args) throws Exception { - try (TestingConcordServer server = new TestingConcordServer(Map.of("process.watchdogPeriod", "10 seconds"), List.of())) { + try (var db = new PostgreSQLContainer<>("postgres:15-alpine"); + var server = new TestingConcordServer(db, 8001, Map.of("process.watchdogPeriod", "10 seconds"), List.of())) { + db.start(); server.start(); - - System.out.println(""" - ============================================================== + System.out.printf(""" + ============================================================== + + UI: http://localhost:8001/ + DB: + JDBC URL: %s + username: %s + password: %s - UI: http://localhost:8001/ - DB: - JDBC URL: %s - username: %s - password: %s - """.formatted(server.getDb().getJdbcUrl(), server.getDb().getUsername(), server.getDb().getPassword())); + admin API key: %s + agent API key: %s + %n""", db.getJdbcUrl(), + db.getUsername(), + db.getPassword(), + server.getAdminApiKey(), + server.getAgentApiKey()); Thread.currentThread().join(); } } } + diff --git a/it/testing-server/src/test/java/com/walmartlabs/concord/it/testingserver/TestingConcordIT.java b/it/testing-server/src/test/java/com/walmartlabs/concord/it/testingserver/TestingConcordIT.java new file mode 100644 index 0000000000..0e93548756 --- /dev/null +++ b/it/testing-server/src/test/java/com/walmartlabs/concord/it/testingserver/TestingConcordIT.java @@ -0,0 +1,109 @@ +package com.walmartlabs.concord.it.testingserver; + +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2023 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + +import com.walmartlabs.concord.client2.ApiClientConfiguration; +import com.walmartlabs.concord.client2.DefaultApiClientFactory; +import com.walmartlabs.concord.client2.ProcessApi; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.testcontainers.containers.PostgreSQLContainer; + +import java.io.IOException; +import java.net.ServerSocket; +import java.time.Duration; +import java.util.List; +import java.util.Map; + +import static com.walmartlabs.concord.client2.ProcessEntry.StatusEnum.FINISHED; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +/** + * A test that tests TestingConcordServer and TestingConcordAgent can run together in the same JVM. + */ +public class TestingConcordIT { + + private PostgreSQLContainer db; + private TestingConcordServer concordServer; + private TestingConcordAgent concordAgent; + + @Before + public void setUp() throws Exception { + db = new PostgreSQLContainer<>("postgres:15-alpine"); + db.start(); + + int apiPort = getFreePort(); + concordServer = new TestingConcordServer(db, apiPort, Map.of(), List.of()); + concordServer.start(); + + concordAgent = new TestingConcordAgent(concordServer); + concordAgent.start(); + } + + @After + public void tearDown() throws Exception { + if (concordAgent != null) { + concordAgent.close(); + concordAgent = null; + } + + if (concordServer != null) { + concordServer.close(); + concordServer = null; + } + + if (db != null) { + db.close(); + db = null; + } + } + + @Test(timeout = 120_000) + public void testRunningSimpleProcess() throws Exception { + var client = new DefaultApiClientFactory(concordServer.getApiBaseUrl()) + .create(ApiClientConfiguration.builder() + .apiKey(concordServer.getAdminApiKey()) + .build()); + + var processApi = new ProcessApi(client); + var response = processApi.startProcess(Map.of("concord.yml", """ + configuration: + runtime: "concord-v2" + flows: + default: + - log: "Hello!" + """.getBytes())); + assertNotNull(response.getInstanceId()); + + var process = processApi.waitForCompletion(response.getInstanceId(), Duration.ofSeconds(60).toMillis()); + assertEquals(FINISHED, process.getStatus()); + } + + private static int getFreePort() { + try (var socket = new ServerSocket(0)) { + return socket.getLocalPort(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} From a7c946ddfdd0a64e7a65b58108324c41529d2557 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 14 Nov 2023 11:53:08 -0500 Subject: [PATCH 28/52] update changelog --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56679e7d42..3b24e3e696 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Change log +## [2.3.0] - Unreleased + +### Added + +- testing-concord-server: add getter for the server instance +([#832](https://github.com/walmartlabs/concord/pull/832)). + +### Changed + +- project: attach source jars only on release +([#832](https://github.com/walmartlabs/concord/pull/832)). + + + ## [2.2.0] - 2023-11-13 ### Added From a5216c53b3349356ab123046d3c370e73fd96717 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Thu, 16 Nov 2023 09:07:26 -0500 Subject: [PATCH 29/52] Update CHANGELOG.md --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b24e3e696..be349cbfd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,10 @@ ### Changed - project: attach source jars only on release -([#832](https://github.com/walmartlabs/concord/pull/832)). +([#832](https://github.com/walmartlabs/concord/pull/832)); +- concord-server: auto-wire modules in concord-server/dist +instead of impl +([#834](https://github.com/walmartlabs/concord/pull/834)). From 59ebcbd6a735cf266a5753e5e7d0bd6d2efcb78e Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 21 Nov 2023 16:26:03 -0500 Subject: [PATCH 30/52] Update CHANGELOG.md --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be349cbfd9..b1a631f474 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,9 @@ ### Added - testing-concord-server: add getter for the server instance -([#832](https://github.com/walmartlabs/concord/pull/832)). +([#832](https://github.com/walmartlabs/concord/pull/832)); +- testing-concord-server: add agent wrapper, simple test +([835](https://github.com/walmartlabs/concord/pull/835)). ### Changed From 3c16f8d5aaef606a88e8b3440570ebafdc6e8b82 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 21 Nov 2023 19:11:11 -0500 Subject: [PATCH 31/52] [maven-release-plugin] prepare release 2.3.0 --- agent/pom.xml | 2 +- cli/pom.xml | 2 +- client/pom.xml | 2 +- client2/pom.xml | 2 +- common/pom.xml | 2 +- console2/pom.xml | 2 +- dependency-manager/pom.xml | 2 +- docker-images/agent/pom.xml | 2 +- docker-images/ansible/pom.xml | 2 +- docker-images/base/pom.xml | 2 +- docker-images/pom.xml | 2 +- docker-images/server/pom.xml | 2 +- forms/pom.xml | 2 +- imports/pom.xml | 2 +- it/common/pom.xml | 2 +- it/compat/pom.xml | 2 +- it/console/pom.xml | 2 +- it/pom.xml | 2 +- it/runtime-v1/pom.xml | 2 +- it/runtime-v2/pom.xml | 2 +- it/server/pom.xml | 2 +- it/tasks/broken-deps/pom.xml | 2 +- it/tasks/client1-test/pom.xml | 2 +- it/tasks/dependency-manager-test/pom.xml | 2 +- it/tasks/serialization-test/pom.xml | 2 +- it/tasks/suspend-test/pom.xml | 2 +- it/testing-server/pom.xml | 2 +- k8s/agent-operator/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/tasks/ansible/pom.xml | 2 +- plugins/tasks/concord/pom.xml | 2 +- plugins/tasks/crypto/pom.xml | 2 +- plugins/tasks/docker/pom.xml | 2 +- plugins/tasks/dynamic-tasks/pom.xml | 2 +- plugins/tasks/example/pom.xml | 2 +- plugins/tasks/files/pom.xml | 2 +- plugins/tasks/http/pom.xml | 2 +- plugins/tasks/kv/pom.xml | 2 +- plugins/tasks/locale/pom.xml | 2 +- plugins/tasks/lock/pom.xml | 2 +- plugins/tasks/log/pom.xml | 2 +- plugins/tasks/misc/pom.xml | 2 +- plugins/tasks/noderoster/pom.xml | 2 +- plugins/tasks/resource/pom.xml | 2 +- plugins/tasks/slack/pom.xml | 2 +- plugins/tasks/sleep/pom.xml | 2 +- plugins/tasks/smtp/pom.xml | 2 +- plugins/tasks/throw/pom.xml | 2 +- plugins/tasks/variables/pom.xml | 2 +- plugins/templates/ansible/pom.xml | 2 +- policy-engine/pom.xml | 2 +- pom.xml | 4 ++-- repository/pom.xml | 2 +- runtime/common/pom.xml | 2 +- runtime/loader/pom.xml | 2 +- runtime/v1/impl/pom.xml | 2 +- runtime/v1/pom.xml | 2 +- runtime/v1/project-model/pom.xml | 2 +- runtime/v2/model/pom.xml | 2 +- runtime/v2/pom.xml | 2 +- runtime/v2/runner/pom.xml | 2 +- runtime/v2/sdk/pom.xml | 2 +- runtime/v2/vm/pom.xml | 2 +- sdk/pom.xml | 2 +- server/db/pom.xml | 2 +- server/dist/pom.xml | 2 +- server/impl/pom.xml | 2 +- server/liquibase-ext/pom.xml | 2 +- server/plugins/ansible/client/pom.xml | 2 +- server/plugins/ansible/client2/pom.xml | 2 +- server/plugins/ansible/db/pom.xml | 2 +- server/plugins/ansible/impl/pom.xml | 2 +- server/plugins/ansible/pom.xml | 2 +- server/plugins/kafka-event-sink/pom.xml | 2 +- server/plugins/noderoster/client/pom.xml | 2 +- server/plugins/noderoster/client2/pom.xml | 2 +- server/plugins/noderoster/db/pom.xml | 2 +- server/plugins/noderoster/impl/pom.xml | 2 +- server/plugins/noderoster/pom.xml | 2 +- server/plugins/oidc/pom.xml | 2 +- server/plugins/oneops/pom.xml | 2 +- server/plugins/pfed-sso/pom.xml | 2 +- server/plugins/pom.xml | 2 +- server/pom.xml | 2 +- server/queue-client/pom.xml | 2 +- server/sdk/pom.xml | 2 +- targetplatform/pom.xml | 4 ++-- 87 files changed, 89 insertions(+), 89 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index 0d3c386718..e91ff33a8c 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/cli/pom.xml b/cli/pom.xml index c0485ddfa1..7fceef2a25 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index 8af9c8c2a4..d80bf56a67 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/client2/pom.xml b/client2/pom.xml index a61673ed55..045796cd24 100644 --- a/client2/pom.xml +++ b/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/common/pom.xml b/common/pom.xml index 1159d855d5..50be290f00 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/console2/pom.xml b/console2/pom.xml index da759610f9..ff82c61c37 100644 --- a/console2/pom.xml +++ b/console2/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/dependency-manager/pom.xml b/dependency-manager/pom.xml index 0cbf2cf8a3..9d9f2bd75a 100644 --- a/dependency-manager/pom.xml +++ b/dependency-manager/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/docker-images/agent/pom.xml b/docker-images/agent/pom.xml index 4bd148cad5..10ab487fad 100644 --- a/docker-images/agent/pom.xml +++ b/docker-images/agent/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/docker-images/ansible/pom.xml b/docker-images/ansible/pom.xml index b11a9bd970..8f524a2ea2 100644 --- a/docker-images/ansible/pom.xml +++ b/docker-images/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/docker-images/base/pom.xml b/docker-images/base/pom.xml index 4c91398b20..967b2696ff 100644 --- a/docker-images/base/pom.xml +++ b/docker-images/base/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.docker parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/docker-images/pom.xml b/docker-images/pom.xml index e6c20acecc..662079e0e9 100644 --- a/docker-images/pom.xml +++ b/docker-images/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/docker-images/server/pom.xml b/docker-images/server/pom.xml index 802c912d19..f557834155 100644 --- a/docker-images/server/pom.xml +++ b/docker-images/server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/forms/pom.xml b/forms/pom.xml index fcbe3e9e31..3759987178 100644 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/imports/pom.xml b/imports/pom.xml index 3dbefdddf1..d46b4c4825 100644 --- a/imports/pom.xml +++ b/imports/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/it/common/pom.xml b/it/common/pom.xml index ccb6b2943a..6ec054050f 100644 --- a/it/common/pom.xml +++ b/it/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/it/compat/pom.xml b/it/compat/pom.xml index f243891fbf..263a6fa34f 100644 --- a/it/compat/pom.xml +++ b/it/compat/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/it/console/pom.xml b/it/console/pom.xml index 82b9840b49..1cc9e5ae3c 100644 --- a/it/console/pom.xml +++ b/it/console/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/it/pom.xml b/it/pom.xml index e37b26a3fd..407e09eac6 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/it/runtime-v1/pom.xml b/it/runtime-v1/pom.xml index 1c47c5f0da..4e19cf7678 100644 --- a/it/runtime-v1/pom.xml +++ b/it/runtime-v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/it/runtime-v2/pom.xml b/it/runtime-v2/pom.xml index 90712164de..c547abd75f 100644 --- a/it/runtime-v2/pom.xml +++ b/it/runtime-v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/it/server/pom.xml b/it/server/pom.xml index 4565759125..5b2db11f60 100644 --- a/it/server/pom.xml +++ b/it/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/it/tasks/broken-deps/pom.xml b/it/tasks/broken-deps/pom.xml index 6541c28f68..2a7dbaeebc 100644 --- a/it/tasks/broken-deps/pom.xml +++ b/it/tasks/broken-deps/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/it/tasks/client1-test/pom.xml b/it/tasks/client1-test/pom.xml index a2b1f86911..7bb01839b0 100644 --- a/it/tasks/client1-test/pom.xml +++ b/it/tasks/client1-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/it/tasks/dependency-manager-test/pom.xml b/it/tasks/dependency-manager-test/pom.xml index d3b9a2a436..b97834e667 100644 --- a/it/tasks/dependency-manager-test/pom.xml +++ b/it/tasks/dependency-manager-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/it/tasks/serialization-test/pom.xml b/it/tasks/serialization-test/pom.xml index 14426ec3c7..b58ef33758 100644 --- a/it/tasks/serialization-test/pom.xml +++ b/it/tasks/serialization-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/it/tasks/suspend-test/pom.xml b/it/tasks/suspend-test/pom.xml index 2521017065..81d2569e5a 100644 --- a/it/tasks/suspend-test/pom.xml +++ b/it/tasks/suspend-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/it/testing-server/pom.xml b/it/testing-server/pom.xml index d4cba3fc79..11dd17769d 100644 --- a/it/testing-server/pom.xml +++ b/it/testing-server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/k8s/agent-operator/pom.xml b/k8s/agent-operator/pom.xml index 9b6fe9b607..a0fb015495 100644 --- a/k8s/agent-operator/pom.xml +++ b/k8s/agent-operator/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index c39df5554c..76be442e71 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/plugins/tasks/ansible/pom.xml b/plugins/tasks/ansible/pom.xml index 23c3b5c97e..01ae2b04f8 100644 --- a/plugins/tasks/ansible/pom.xml +++ b/plugins/tasks/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/concord/pom.xml b/plugins/tasks/concord/pom.xml index de5c8dd418..fe7ea25c10 100644 --- a/plugins/tasks/concord/pom.xml +++ b/plugins/tasks/concord/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/crypto/pom.xml b/plugins/tasks/crypto/pom.xml index db5499df31..a8fac1a256 100644 --- a/plugins/tasks/crypto/pom.xml +++ b/plugins/tasks/crypto/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/docker/pom.xml b/plugins/tasks/docker/pom.xml index 85de83fade..a76783f085 100644 --- a/plugins/tasks/docker/pom.xml +++ b/plugins/tasks/docker/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/dynamic-tasks/pom.xml b/plugins/tasks/dynamic-tasks/pom.xml index b064c915a2..ab37bc1620 100644 --- a/plugins/tasks/dynamic-tasks/pom.xml +++ b/plugins/tasks/dynamic-tasks/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/example/pom.xml b/plugins/tasks/example/pom.xml index a6c52b6640..471af95910 100644 --- a/plugins/tasks/example/pom.xml +++ b/plugins/tasks/example/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/files/pom.xml b/plugins/tasks/files/pom.xml index 0231123176..29b2f68fd5 100644 --- a/plugins/tasks/files/pom.xml +++ b/plugins/tasks/files/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/http/pom.xml b/plugins/tasks/http/pom.xml index f8b7f24869..84f3c593b3 100644 --- a/plugins/tasks/http/pom.xml +++ b/plugins/tasks/http/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/kv/pom.xml b/plugins/tasks/kv/pom.xml index 780f82309f..75757a0a54 100644 --- a/plugins/tasks/kv/pom.xml +++ b/plugins/tasks/kv/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/locale/pom.xml b/plugins/tasks/locale/pom.xml index 9d30e165b7..016b5dcff0 100644 --- a/plugins/tasks/locale/pom.xml +++ b/plugins/tasks/locale/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/lock/pom.xml b/plugins/tasks/lock/pom.xml index eea9c2d1de..c844c3ebe5 100644 --- a/plugins/tasks/lock/pom.xml +++ b/plugins/tasks/lock/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/log/pom.xml b/plugins/tasks/log/pom.xml index 4b01932393..32d4165e15 100644 --- a/plugins/tasks/log/pom.xml +++ b/plugins/tasks/log/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/misc/pom.xml b/plugins/tasks/misc/pom.xml index d73dcf82b8..68f9bba473 100644 --- a/plugins/tasks/misc/pom.xml +++ b/plugins/tasks/misc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/noderoster/pom.xml b/plugins/tasks/noderoster/pom.xml index 03c1b20b24..c019c36278 100644 --- a/plugins/tasks/noderoster/pom.xml +++ b/plugins/tasks/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/resource/pom.xml b/plugins/tasks/resource/pom.xml index 493f7ec494..fef86add11 100644 --- a/plugins/tasks/resource/pom.xml +++ b/plugins/tasks/resource/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/slack/pom.xml b/plugins/tasks/slack/pom.xml index e4d00cffaa..513e3ce775 100644 --- a/plugins/tasks/slack/pom.xml +++ b/plugins/tasks/slack/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/sleep/pom.xml b/plugins/tasks/sleep/pom.xml index d04050994e..11f0ec24ab 100644 --- a/plugins/tasks/sleep/pom.xml +++ b/plugins/tasks/sleep/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/smtp/pom.xml b/plugins/tasks/smtp/pom.xml index 3598a04b64..ce30e3c5e5 100644 --- a/plugins/tasks/smtp/pom.xml +++ b/plugins/tasks/smtp/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/throw/pom.xml b/plugins/tasks/throw/pom.xml index 51b3b34930..f14f413d1b 100644 --- a/plugins/tasks/throw/pom.xml +++ b/plugins/tasks/throw/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/tasks/variables/pom.xml b/plugins/tasks/variables/pom.xml index 6a1186f7f4..f30dceccb1 100644 --- a/plugins/tasks/variables/pom.xml +++ b/plugins/tasks/variables/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/plugins/templates/ansible/pom.xml b/plugins/templates/ansible/pom.xml index 866d9399cb..286c5b2c8c 100644 --- a/plugins/templates/ansible/pom.xml +++ b/plugins/templates/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/policy-engine/pom.xml b/policy-engine/pom.xml index ad6d73c8e8..d17125323b 100644 --- a/policy-engine/pom.xml +++ b/policy-engine/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 48bf3d311f..beb6c55a5b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 pom ${project.groupId}:${project.artifactId} @@ -426,7 +426,7 @@ ${scm.connection} ${scm.connection} - HEAD + 2.3.0 diff --git a/repository/pom.xml b/repository/pom.xml index 9eddc95851..522f6ffeb7 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/runtime/common/pom.xml b/runtime/common/pom.xml index 35eca9b277..252d12f0ee 100644 --- a/runtime/common/pom.xml +++ b/runtime/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/runtime/loader/pom.xml b/runtime/loader/pom.xml index 0ac070c793..113ebd48f1 100644 --- a/runtime/loader/pom.xml +++ b/runtime/loader/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/runtime/v1/impl/pom.xml b/runtime/v1/impl/pom.xml index 2ca78abd63..44c10d36df 100644 --- a/runtime/v1/impl/pom.xml +++ b/runtime/v1/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/runtime/v1/pom.xml b/runtime/v1/pom.xml index ad8d774685..0ce2438249 100644 --- a/runtime/v1/pom.xml +++ b/runtime/v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/runtime/v1/project-model/pom.xml b/runtime/v1/project-model/pom.xml index dabb8345e3..e7f745c39d 100644 --- a/runtime/v1/project-model/pom.xml +++ b/runtime/v1/project-model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/runtime/v2/model/pom.xml b/runtime/v2/model/pom.xml index d094ec19d8..a6c5cc390e 100644 --- a/runtime/v2/model/pom.xml +++ b/runtime/v2/model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/runtime/v2/pom.xml b/runtime/v2/pom.xml index a74224b544..251b14d3f4 100644 --- a/runtime/v2/pom.xml +++ b/runtime/v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../../pom.xml diff --git a/runtime/v2/runner/pom.xml b/runtime/v2/runner/pom.xml index d07572c0ba..a0cb4f95d0 100644 --- a/runtime/v2/runner/pom.xml +++ b/runtime/v2/runner/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/runtime/v2/sdk/pom.xml b/runtime/v2/sdk/pom.xml index d9c443cc76..18b9689591 100644 --- a/runtime/v2/sdk/pom.xml +++ b/runtime/v2/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/runtime/v2/vm/pom.xml b/runtime/v2/vm/pom.xml index 1d21acd9c7..63fbe678a3 100644 --- a/runtime/v2/vm/pom.xml +++ b/runtime/v2/vm/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index fdd6abef4e..36c6f6330b 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/db/pom.xml b/server/db/pom.xml index 2bb83df2af..29add6d0e5 100644 --- a/server/db/pom.xml +++ b/server/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/dist/pom.xml b/server/dist/pom.xml index 0b6e87c0ff..fda06f68a4 100644 --- a/server/dist/pom.xml +++ b/server/dist/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/impl/pom.xml b/server/impl/pom.xml index 231a72b5ce..cbf5260f12 100644 --- a/server/impl/pom.xml +++ b/server/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/liquibase-ext/pom.xml b/server/liquibase-ext/pom.xml index 675b38e152..eefb36390f 100644 --- a/server/liquibase-ext/pom.xml +++ b/server/liquibase-ext/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/ansible/client/pom.xml b/server/plugins/ansible/client/pom.xml index 2d3f14c7df..0c0aa0db2e 100644 --- a/server/plugins/ansible/client/pom.xml +++ b/server/plugins/ansible/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/ansible/client2/pom.xml b/server/plugins/ansible/client2/pom.xml index e771c64394..57fb1146e3 100644 --- a/server/plugins/ansible/client2/pom.xml +++ b/server/plugins/ansible/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/ansible/db/pom.xml b/server/plugins/ansible/db/pom.xml index c80066bfe3..ee729a30ed 100644 --- a/server/plugins/ansible/db/pom.xml +++ b/server/plugins/ansible/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/ansible/impl/pom.xml b/server/plugins/ansible/impl/pom.xml index dace30aea2..ce97be270e 100644 --- a/server/plugins/ansible/impl/pom.xml +++ b/server/plugins/ansible/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/ansible/pom.xml b/server/plugins/ansible/pom.xml index b11ec91f47..3dd6a7c1bd 100644 --- a/server/plugins/ansible/pom.xml +++ b/server/plugins/ansible/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/kafka-event-sink/pom.xml b/server/plugins/kafka-event-sink/pom.xml index bcdc617558..3850269559 100644 --- a/server/plugins/kafka-event-sink/pom.xml +++ b/server/plugins/kafka-event-sink/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/noderoster/client/pom.xml b/server/plugins/noderoster/client/pom.xml index e2b26f9ea8..7f13159669 100644 --- a/server/plugins/noderoster/client/pom.xml +++ b/server/plugins/noderoster/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/noderoster/client2/pom.xml b/server/plugins/noderoster/client2/pom.xml index d309dd2ebd..51b2876188 100644 --- a/server/plugins/noderoster/client2/pom.xml +++ b/server/plugins/noderoster/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/noderoster/db/pom.xml b/server/plugins/noderoster/db/pom.xml index 68ab61fed2..45781e7403 100644 --- a/server/plugins/noderoster/db/pom.xml +++ b/server/plugins/noderoster/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/noderoster/impl/pom.xml b/server/plugins/noderoster/impl/pom.xml index f093cfb0a8..7e2261c9b8 100644 --- a/server/plugins/noderoster/impl/pom.xml +++ b/server/plugins/noderoster/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/noderoster/pom.xml b/server/plugins/noderoster/pom.xml index 108a70a11e..aac150a3be 100644 --- a/server/plugins/noderoster/pom.xml +++ b/server/plugins/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/oidc/pom.xml b/server/plugins/oidc/pom.xml index 34ab2a74ea..0f2ad1666e 100644 --- a/server/plugins/oidc/pom.xml +++ b/server/plugins/oidc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/oneops/pom.xml b/server/plugins/oneops/pom.xml index 06ef9f04f9..4e63d410b9 100644 --- a/server/plugins/oneops/pom.xml +++ b/server/plugins/oneops/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/plugins/pfed-sso/pom.xml b/server/plugins/pfed-sso/pom.xml index 32ad474415..e6257bb7cc 100644 --- a/server/plugins/pfed-sso/pom.xml +++ b/server/plugins/pfed-sso/pom.xml @@ -3,7 +3,7 @@ parent com.walmartlabs.concord.server.plugins - 2.2.1-SNAPSHOT + 2.3.0 4.0.0 diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml index 9a7bc0a29f..8b35940c09 100644 --- a/server/plugins/pom.xml +++ b/server/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/pom.xml b/server/pom.xml index c87e5ba2dd..8ac83228c2 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/queue-client/pom.xml b/server/queue-client/pom.xml index 3fb67e6429..bb9f50e80e 100644 --- a/server/queue-client/pom.xml +++ b/server/queue-client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/server/sdk/pom.xml b/server/sdk/pom.xml index 799bd05149..276a44da83 100644 --- a/server/sdk/pom.xml +++ b/server/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.2.1-SNAPSHOT + 2.3.0 ../pom.xml diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index 65a74e4a3b..190f8a2008 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord concord-targetplatform - 2.2.1-SNAPSHOT + 2.3.0 pom @@ -1298,7 +1298,7 @@ ${scm.connection} ${scm.connection} - HEAD + 2.3.0 From 4efb05cdae39a2ab9f5d535025f679361ac5699d Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 21 Nov 2023 19:11:12 -0500 Subject: [PATCH 32/52] [maven-release-plugin] prepare for next development iteration --- agent/pom.xml | 2 +- cli/pom.xml | 2 +- client/pom.xml | 2 +- client2/pom.xml | 2 +- common/pom.xml | 2 +- console2/pom.xml | 2 +- dependency-manager/pom.xml | 2 +- docker-images/agent/pom.xml | 2 +- docker-images/ansible/pom.xml | 2 +- docker-images/base/pom.xml | 2 +- docker-images/pom.xml | 2 +- docker-images/server/pom.xml | 2 +- forms/pom.xml | 2 +- imports/pom.xml | 2 +- it/common/pom.xml | 2 +- it/compat/pom.xml | 2 +- it/console/pom.xml | 2 +- it/pom.xml | 2 +- it/runtime-v1/pom.xml | 2 +- it/runtime-v2/pom.xml | 2 +- it/server/pom.xml | 2 +- it/tasks/broken-deps/pom.xml | 2 +- it/tasks/client1-test/pom.xml | 2 +- it/tasks/dependency-manager-test/pom.xml | 2 +- it/tasks/serialization-test/pom.xml | 2 +- it/tasks/suspend-test/pom.xml | 2 +- it/testing-server/pom.xml | 2 +- k8s/agent-operator/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/tasks/ansible/pom.xml | 2 +- plugins/tasks/concord/pom.xml | 2 +- plugins/tasks/crypto/pom.xml | 2 +- plugins/tasks/docker/pom.xml | 2 +- plugins/tasks/dynamic-tasks/pom.xml | 2 +- plugins/tasks/example/pom.xml | 2 +- plugins/tasks/files/pom.xml | 2 +- plugins/tasks/http/pom.xml | 2 +- plugins/tasks/kv/pom.xml | 2 +- plugins/tasks/locale/pom.xml | 2 +- plugins/tasks/lock/pom.xml | 2 +- plugins/tasks/log/pom.xml | 2 +- plugins/tasks/misc/pom.xml | 2 +- plugins/tasks/noderoster/pom.xml | 2 +- plugins/tasks/resource/pom.xml | 2 +- plugins/tasks/slack/pom.xml | 2 +- plugins/tasks/sleep/pom.xml | 2 +- plugins/tasks/smtp/pom.xml | 2 +- plugins/tasks/throw/pom.xml | 2 +- plugins/tasks/variables/pom.xml | 2 +- plugins/templates/ansible/pom.xml | 2 +- policy-engine/pom.xml | 2 +- pom.xml | 4 ++-- repository/pom.xml | 2 +- runtime/common/pom.xml | 2 +- runtime/loader/pom.xml | 2 +- runtime/v1/impl/pom.xml | 2 +- runtime/v1/pom.xml | 2 +- runtime/v1/project-model/pom.xml | 2 +- runtime/v2/model/pom.xml | 2 +- runtime/v2/pom.xml | 2 +- runtime/v2/runner/pom.xml | 2 +- runtime/v2/sdk/pom.xml | 2 +- runtime/v2/vm/pom.xml | 2 +- sdk/pom.xml | 2 +- server/db/pom.xml | 2 +- server/dist/pom.xml | 2 +- server/impl/pom.xml | 2 +- server/liquibase-ext/pom.xml | 2 +- server/plugins/ansible/client/pom.xml | 2 +- server/plugins/ansible/client2/pom.xml | 2 +- server/plugins/ansible/db/pom.xml | 2 +- server/plugins/ansible/impl/pom.xml | 2 +- server/plugins/ansible/pom.xml | 2 +- server/plugins/kafka-event-sink/pom.xml | 2 +- server/plugins/noderoster/client/pom.xml | 2 +- server/plugins/noderoster/client2/pom.xml | 2 +- server/plugins/noderoster/db/pom.xml | 2 +- server/plugins/noderoster/impl/pom.xml | 2 +- server/plugins/noderoster/pom.xml | 2 +- server/plugins/oidc/pom.xml | 2 +- server/plugins/oneops/pom.xml | 2 +- server/plugins/pfed-sso/pom.xml | 2 +- server/plugins/pom.xml | 2 +- server/pom.xml | 2 +- server/queue-client/pom.xml | 2 +- server/sdk/pom.xml | 2 +- targetplatform/pom.xml | 4 ++-- 87 files changed, 89 insertions(+), 89 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index e91ff33a8c..26c76fd933 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/cli/pom.xml b/cli/pom.xml index 7fceef2a25..8823efb0ea 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index d80bf56a67..374f927e8c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/client2/pom.xml b/client2/pom.xml index 045796cd24..31478f2224 100644 --- a/client2/pom.xml +++ b/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/common/pom.xml b/common/pom.xml index 50be290f00..1dd57ab397 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/console2/pom.xml b/console2/pom.xml index ff82c61c37..31389eb14e 100644 --- a/console2/pom.xml +++ b/console2/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/dependency-manager/pom.xml b/dependency-manager/pom.xml index 9d9f2bd75a..e9413eb1ec 100644 --- a/dependency-manager/pom.xml +++ b/dependency-manager/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/docker-images/agent/pom.xml b/docker-images/agent/pom.xml index 10ab487fad..9dfee21231 100644 --- a/docker-images/agent/pom.xml +++ b/docker-images/agent/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/docker-images/ansible/pom.xml b/docker-images/ansible/pom.xml index 8f524a2ea2..003677e460 100644 --- a/docker-images/ansible/pom.xml +++ b/docker-images/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/docker-images/base/pom.xml b/docker-images/base/pom.xml index 967b2696ff..ed268a0ea5 100644 --- a/docker-images/base/pom.xml +++ b/docker-images/base/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.docker parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/docker-images/pom.xml b/docker-images/pom.xml index 662079e0e9..e0b2cbfa29 100644 --- a/docker-images/pom.xml +++ b/docker-images/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/docker-images/server/pom.xml b/docker-images/server/pom.xml index f557834155..df441b6b4a 100644 --- a/docker-images/server/pom.xml +++ b/docker-images/server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/forms/pom.xml b/forms/pom.xml index 3759987178..3d2ad295c7 100644 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/imports/pom.xml b/imports/pom.xml index d46b4c4825..271c3e4ab8 100644 --- a/imports/pom.xml +++ b/imports/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/it/common/pom.xml b/it/common/pom.xml index 6ec054050f..8adb37094b 100644 --- a/it/common/pom.xml +++ b/it/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/it/compat/pom.xml b/it/compat/pom.xml index 263a6fa34f..46185fbf2c 100644 --- a/it/compat/pom.xml +++ b/it/compat/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/it/console/pom.xml b/it/console/pom.xml index 1cc9e5ae3c..17475e477b 100644 --- a/it/console/pom.xml +++ b/it/console/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/it/pom.xml b/it/pom.xml index 407e09eac6..e4bbea4d5f 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/it/runtime-v1/pom.xml b/it/runtime-v1/pom.xml index 4e19cf7678..886ab151f9 100644 --- a/it/runtime-v1/pom.xml +++ b/it/runtime-v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/it/runtime-v2/pom.xml b/it/runtime-v2/pom.xml index c547abd75f..08fb2aef92 100644 --- a/it/runtime-v2/pom.xml +++ b/it/runtime-v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/it/server/pom.xml b/it/server/pom.xml index 5b2db11f60..fccb687736 100644 --- a/it/server/pom.xml +++ b/it/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/it/tasks/broken-deps/pom.xml b/it/tasks/broken-deps/pom.xml index 2a7dbaeebc..d0a131e0ec 100644 --- a/it/tasks/broken-deps/pom.xml +++ b/it/tasks/broken-deps/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/client1-test/pom.xml b/it/tasks/client1-test/pom.xml index 7bb01839b0..def1f891e0 100644 --- a/it/tasks/client1-test/pom.xml +++ b/it/tasks/client1-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/dependency-manager-test/pom.xml b/it/tasks/dependency-manager-test/pom.xml index b97834e667..f5a645f2b6 100644 --- a/it/tasks/dependency-manager-test/pom.xml +++ b/it/tasks/dependency-manager-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/serialization-test/pom.xml b/it/tasks/serialization-test/pom.xml index b58ef33758..5fde37831f 100644 --- a/it/tasks/serialization-test/pom.xml +++ b/it/tasks/serialization-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/suspend-test/pom.xml b/it/tasks/suspend-test/pom.xml index 81d2569e5a..86604bdff8 100644 --- a/it/tasks/suspend-test/pom.xml +++ b/it/tasks/suspend-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/it/testing-server/pom.xml b/it/testing-server/pom.xml index 11dd17769d..0622dec8ad 100644 --- a/it/testing-server/pom.xml +++ b/it/testing-server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/k8s/agent-operator/pom.xml b/k8s/agent-operator/pom.xml index a0fb015495..872b7e7613 100644 --- a/k8s/agent-operator/pom.xml +++ b/k8s/agent-operator/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 76be442e71..96840c1186 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/plugins/tasks/ansible/pom.xml b/plugins/tasks/ansible/pom.xml index 01ae2b04f8..b04b41bc25 100644 --- a/plugins/tasks/ansible/pom.xml +++ b/plugins/tasks/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/concord/pom.xml b/plugins/tasks/concord/pom.xml index fe7ea25c10..b2cacb09f5 100644 --- a/plugins/tasks/concord/pom.xml +++ b/plugins/tasks/concord/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/crypto/pom.xml b/plugins/tasks/crypto/pom.xml index a8fac1a256..1ba526adf4 100644 --- a/plugins/tasks/crypto/pom.xml +++ b/plugins/tasks/crypto/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/docker/pom.xml b/plugins/tasks/docker/pom.xml index a76783f085..7339e2e6cc 100644 --- a/plugins/tasks/docker/pom.xml +++ b/plugins/tasks/docker/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/dynamic-tasks/pom.xml b/plugins/tasks/dynamic-tasks/pom.xml index ab37bc1620..8e6cdbf183 100644 --- a/plugins/tasks/dynamic-tasks/pom.xml +++ b/plugins/tasks/dynamic-tasks/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/example/pom.xml b/plugins/tasks/example/pom.xml index 471af95910..87ab3e5198 100644 --- a/plugins/tasks/example/pom.xml +++ b/plugins/tasks/example/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/files/pom.xml b/plugins/tasks/files/pom.xml index 29b2f68fd5..3ccecf85e7 100644 --- a/plugins/tasks/files/pom.xml +++ b/plugins/tasks/files/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/http/pom.xml b/plugins/tasks/http/pom.xml index 84f3c593b3..a3dca758b6 100644 --- a/plugins/tasks/http/pom.xml +++ b/plugins/tasks/http/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/kv/pom.xml b/plugins/tasks/kv/pom.xml index 75757a0a54..5fc8d7e0d1 100644 --- a/plugins/tasks/kv/pom.xml +++ b/plugins/tasks/kv/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/locale/pom.xml b/plugins/tasks/locale/pom.xml index 016b5dcff0..967c52ef01 100644 --- a/plugins/tasks/locale/pom.xml +++ b/plugins/tasks/locale/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/lock/pom.xml b/plugins/tasks/lock/pom.xml index c844c3ebe5..638cd97f9c 100644 --- a/plugins/tasks/lock/pom.xml +++ b/plugins/tasks/lock/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/log/pom.xml b/plugins/tasks/log/pom.xml index 32d4165e15..7b3c87da3f 100644 --- a/plugins/tasks/log/pom.xml +++ b/plugins/tasks/log/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/misc/pom.xml b/plugins/tasks/misc/pom.xml index 68f9bba473..caad0a1c46 100644 --- a/plugins/tasks/misc/pom.xml +++ b/plugins/tasks/misc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/noderoster/pom.xml b/plugins/tasks/noderoster/pom.xml index c019c36278..a03793d8c9 100644 --- a/plugins/tasks/noderoster/pom.xml +++ b/plugins/tasks/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/resource/pom.xml b/plugins/tasks/resource/pom.xml index fef86add11..010aa96ffb 100644 --- a/plugins/tasks/resource/pom.xml +++ b/plugins/tasks/resource/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/slack/pom.xml b/plugins/tasks/slack/pom.xml index 513e3ce775..a52c1e911a 100644 --- a/plugins/tasks/slack/pom.xml +++ b/plugins/tasks/slack/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/sleep/pom.xml b/plugins/tasks/sleep/pom.xml index 11f0ec24ab..2e06e28b68 100644 --- a/plugins/tasks/sleep/pom.xml +++ b/plugins/tasks/sleep/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/smtp/pom.xml b/plugins/tasks/smtp/pom.xml index ce30e3c5e5..223f5621da 100644 --- a/plugins/tasks/smtp/pom.xml +++ b/plugins/tasks/smtp/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/throw/pom.xml b/plugins/tasks/throw/pom.xml index f14f413d1b..83ba89ee2c 100644 --- a/plugins/tasks/throw/pom.xml +++ b/plugins/tasks/throw/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/variables/pom.xml b/plugins/tasks/variables/pom.xml index f30dceccb1..26a0249d2d 100644 --- a/plugins/tasks/variables/pom.xml +++ b/plugins/tasks/variables/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/plugins/templates/ansible/pom.xml b/plugins/templates/ansible/pom.xml index 286c5b2c8c..967420d678 100644 --- a/plugins/templates/ansible/pom.xml +++ b/plugins/templates/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/policy-engine/pom.xml b/policy-engine/pom.xml index d17125323b..846a57ae76 100644 --- a/policy-engine/pom.xml +++ b/policy-engine/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index beb6c55a5b..13095d7e6a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} @@ -426,7 +426,7 @@ ${scm.connection} ${scm.connection} - 2.3.0 + HEAD diff --git a/repository/pom.xml b/repository/pom.xml index 522f6ffeb7..184260846d 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/runtime/common/pom.xml b/runtime/common/pom.xml index 252d12f0ee..f8d675106a 100644 --- a/runtime/common/pom.xml +++ b/runtime/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/runtime/loader/pom.xml b/runtime/loader/pom.xml index 113ebd48f1..4270b9fe60 100644 --- a/runtime/loader/pom.xml +++ b/runtime/loader/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v1/impl/pom.xml b/runtime/v1/impl/pom.xml index 44c10d36df..dc3bc6d18e 100644 --- a/runtime/v1/impl/pom.xml +++ b/runtime/v1/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/runtime/v1/pom.xml b/runtime/v1/pom.xml index 0ce2438249..60740b1b56 100644 --- a/runtime/v1/pom.xml +++ b/runtime/v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v1/project-model/pom.xml b/runtime/v1/project-model/pom.xml index e7f745c39d..c63a845278 100644 --- a/runtime/v1/project-model/pom.xml +++ b/runtime/v1/project-model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/model/pom.xml b/runtime/v2/model/pom.xml index a6c5cc390e..98a8d516d6 100644 --- a/runtime/v2/model/pom.xml +++ b/runtime/v2/model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/pom.xml b/runtime/v2/pom.xml index 251b14d3f4..988d5300f7 100644 --- a/runtime/v2/pom.xml +++ b/runtime/v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v2/runner/pom.xml b/runtime/v2/runner/pom.xml index a0cb4f95d0..41448a4cc7 100644 --- a/runtime/v2/runner/pom.xml +++ b/runtime/v2/runner/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/sdk/pom.xml b/runtime/v2/sdk/pom.xml index 18b9689591..4110c05c5c 100644 --- a/runtime/v2/sdk/pom.xml +++ b/runtime/v2/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/vm/pom.xml b/runtime/v2/vm/pom.xml index 63fbe678a3..d85f3c8d14 100644 --- a/runtime/v2/vm/pom.xml +++ b/runtime/v2/vm/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 36c6f6330b..8efaf9833f 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/db/pom.xml b/server/db/pom.xml index 29add6d0e5..5f899afe9e 100644 --- a/server/db/pom.xml +++ b/server/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/dist/pom.xml b/server/dist/pom.xml index fda06f68a4..a3c75e1181 100644 --- a/server/dist/pom.xml +++ b/server/dist/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/impl/pom.xml b/server/impl/pom.xml index cbf5260f12..f66a407782 100644 --- a/server/impl/pom.xml +++ b/server/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/liquibase-ext/pom.xml b/server/liquibase-ext/pom.xml index eefb36390f..590686f04b 100644 --- a/server/liquibase-ext/pom.xml +++ b/server/liquibase-ext/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/client/pom.xml b/server/plugins/ansible/client/pom.xml index 0c0aa0db2e..3db9499823 100644 --- a/server/plugins/ansible/client/pom.xml +++ b/server/plugins/ansible/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/client2/pom.xml b/server/plugins/ansible/client2/pom.xml index 57fb1146e3..e5e3dd7e1b 100644 --- a/server/plugins/ansible/client2/pom.xml +++ b/server/plugins/ansible/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/db/pom.xml b/server/plugins/ansible/db/pom.xml index ee729a30ed..4eec5465ef 100644 --- a/server/plugins/ansible/db/pom.xml +++ b/server/plugins/ansible/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/impl/pom.xml b/server/plugins/ansible/impl/pom.xml index ce97be270e..5a55e3994a 100644 --- a/server/plugins/ansible/impl/pom.xml +++ b/server/plugins/ansible/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/pom.xml b/server/plugins/ansible/pom.xml index 3dd6a7c1bd..146efd80dd 100644 --- a/server/plugins/ansible/pom.xml +++ b/server/plugins/ansible/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/kafka-event-sink/pom.xml b/server/plugins/kafka-event-sink/pom.xml index 3850269559..e12f30557e 100644 --- a/server/plugins/kafka-event-sink/pom.xml +++ b/server/plugins/kafka-event-sink/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/client/pom.xml b/server/plugins/noderoster/client/pom.xml index 7f13159669..6d8c8c490b 100644 --- a/server/plugins/noderoster/client/pom.xml +++ b/server/plugins/noderoster/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/client2/pom.xml b/server/plugins/noderoster/client2/pom.xml index 51b2876188..36a6d88ca3 100644 --- a/server/plugins/noderoster/client2/pom.xml +++ b/server/plugins/noderoster/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/db/pom.xml b/server/plugins/noderoster/db/pom.xml index 45781e7403..4ff04f6478 100644 --- a/server/plugins/noderoster/db/pom.xml +++ b/server/plugins/noderoster/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/impl/pom.xml b/server/plugins/noderoster/impl/pom.xml index 7e2261c9b8..280cca36f5 100644 --- a/server/plugins/noderoster/impl/pom.xml +++ b/server/plugins/noderoster/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/pom.xml b/server/plugins/noderoster/pom.xml index aac150a3be..2b6fc6b131 100644 --- a/server/plugins/noderoster/pom.xml +++ b/server/plugins/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/oidc/pom.xml b/server/plugins/oidc/pom.xml index 0f2ad1666e..fa5582e438 100644 --- a/server/plugins/oidc/pom.xml +++ b/server/plugins/oidc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/oneops/pom.xml b/server/plugins/oneops/pom.xml index 4e63d410b9..6fe0b8ed0d 100644 --- a/server/plugins/oneops/pom.xml +++ b/server/plugins/oneops/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/pfed-sso/pom.xml b/server/plugins/pfed-sso/pom.xml index e6257bb7cc..d0c777c0fd 100644 --- a/server/plugins/pfed-sso/pom.xml +++ b/server/plugins/pfed-sso/pom.xml @@ -3,7 +3,7 @@ parent com.walmartlabs.concord.server.plugins - 2.3.0 + 2.3.1-SNAPSHOT 4.0.0 diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml index 8b35940c09..b6107ce593 100644 --- a/server/plugins/pom.xml +++ b/server/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/pom.xml b/server/pom.xml index 8ac83228c2..41d0352baf 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/queue-client/pom.xml b/server/queue-client/pom.xml index bb9f50e80e..14b2dad2e4 100644 --- a/server/queue-client/pom.xml +++ b/server/queue-client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/server/sdk/pom.xml b/server/sdk/pom.xml index 276a44da83..24637110d9 100644 --- a/server/sdk/pom.xml +++ b/server/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.0 + 2.3.1-SNAPSHOT ../pom.xml diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index 190f8a2008..5b4dd3c4f0 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord concord-targetplatform - 2.3.0 + 2.3.1-SNAPSHOT pom @@ -1298,7 +1298,7 @@ ${scm.connection} ${scm.connection} - 2.3.0 + HEAD From 893b1838f9d5416de2b7c6e8fc76d19cee45bb5f Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 21 Nov 2023 22:25:45 -0500 Subject: [PATCH 33/52] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1a631f474..d9ea06950a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change log -## [2.3.0] - Unreleased +## [2.3.0] - 2023-11-21 ### Added From f85f2090c6e0ee98e504c01fcd248d122621c600 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Wed, 22 Nov 2023 14:16:23 -0500 Subject: [PATCH 34/52] concord-common: shared ObjectMapperProvider --- agent/pom.xml | 16 +++---- .../concord/agent/AgentModule.java | 1 + common/pom.xml | 30 ++++++++++--- .../concord/common}/ObjectMapperProvider.java | 4 +- .../concord/server/ApiServerModule.java | 1 + .../concord/server/ObjectMapperProvider.java | 43 ------------------- 6 files changed, 37 insertions(+), 58 deletions(-) rename {agent/src/main/java/com/walmartlabs/concord/agent => common/src/main/java/com/walmartlabs/concord/common}/ObjectMapperProvider.java (97%) delete mode 100644 server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperProvider.java diff --git a/agent/pom.xml b/agent/pom.xml index 26c76fd933..c7bf976db6 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -81,6 +81,14 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + com.fasterxml.jackson.core jackson-annotations @@ -125,14 +133,6 @@ com.fasterxml.jackson.datatype jackson-datatype-guava - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - com.google.code.findbugs jsr305 diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/AgentModule.java b/agent/src/main/java/com/walmartlabs/concord/agent/AgentModule.java index 376083f01f..8d33c466c1 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/AgentModule.java +++ b/agent/src/main/java/com/walmartlabs/concord/agent/AgentModule.java @@ -29,6 +29,7 @@ import com.walmartlabs.concord.agent.executors.runner.ProcessPool; import com.walmartlabs.concord.agent.remote.ApiClientFactory; import com.walmartlabs.concord.agent.remote.QueueClientProvider; +import com.walmartlabs.concord.common.ObjectMapperProvider; import com.walmartlabs.concord.server.queueclient.QueueClient; import com.walmartlabs.ollie.config.ConfigurationProcessor; import com.walmartlabs.ollie.config.Environment; diff --git a/common/pom.xml b/common/pom.xml index 1dd57ab397..e1918ff769 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -47,6 +47,31 @@ commons-validator provided + + com.fasterxml.jackson.core + jackson-databind + provided + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + provided + + + javax.inject + javax.inject + provided + + + com.fasterxml.jackson.datatype + jackson-datatype-guava + provided + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + provided + @@ -75,11 +100,6 @@ junit-jupiter-engine test - - com.fasterxml.jackson.core - jackson-databind - test - diff --git a/agent/src/main/java/com/walmartlabs/concord/agent/ObjectMapperProvider.java b/common/src/main/java/com/walmartlabs/concord/common/ObjectMapperProvider.java similarity index 97% rename from agent/src/main/java/com/walmartlabs/concord/agent/ObjectMapperProvider.java rename to common/src/main/java/com/walmartlabs/concord/common/ObjectMapperProvider.java index e54760d6c1..ed35eb0f68 100644 --- a/agent/src/main/java/com/walmartlabs/concord/agent/ObjectMapperProvider.java +++ b/common/src/main/java/com/walmartlabs/concord/common/ObjectMapperProvider.java @@ -1,4 +1,4 @@ -package com.walmartlabs.concord.agent; +package com.walmartlabs.concord.common; /*- * ***** @@ -9,7 +9,7 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/ApiServerModule.java b/server/impl/src/main/java/com/walmartlabs/concord/server/ApiServerModule.java index fb07707b21..27566614eb 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/ApiServerModule.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/ApiServerModule.java @@ -24,6 +24,7 @@ import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.name.Names; +import com.walmartlabs.concord.common.ObjectMapperProvider; import com.walmartlabs.concord.server.boot.*; import com.walmartlabs.concord.server.boot.filters.*; import com.walmartlabs.concord.server.boot.servlets.FormServletHolder; diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperProvider.java b/server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperProvider.java deleted file mode 100644 index eaa5068ac2..0000000000 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperProvider.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.walmartlabs.concord.server; - -/*- - * ***** - * Concord - * ----- - * Copyright (C) 2017 - 2023 Walmart Inc. - * ----- - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ===== - */ - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.guava.GuavaModule; -import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; - -import javax.inject.Provider; - -public class ObjectMapperProvider implements Provider { - - @Override - public ObjectMapper get() { - return new ObjectMapper() - .registerModule(new GuavaModule()) - .registerModule(new Jdk8Module()) - .registerModule(new JavaTimeModule()) - .setSerializationInclusion(JsonInclude.Include.NON_NULL) - .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); - } -} From c0297f47685d30df6db1f1f72c91d063d8737151 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Fri, 24 Nov 2023 16:08:33 -0500 Subject: [PATCH 35/52] project: skip docker tests on GHA --- .github/workflows/build.yml | 2 + .../concord/common/ObjectMapperProvider.java | 6 +++ .../concord/it/server/DockerAnsibleIT.java | 4 +- .../concord/it/server/DockerIT.java | 3 +- .../server/ObjectMapperInitializer.java | 46 +++++++++++++++++++ 5 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperInitializer.java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ba849b4647..a0ad5cc592 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,6 +41,8 @@ jobs: uses: actions/checkout@v3 - name: Build and test with Maven + env: + SKIP_DOCKER_TESTS: "true" run: ./mvnw -s .github/settings.xml -B clean install -Pgha -Pdocker -Pit -Pjdk${{ matrix.jdk_version }} - name: Build with debian docker images diff --git a/common/src/main/java/com/walmartlabs/concord/common/ObjectMapperProvider.java b/common/src/main/java/com/walmartlabs/concord/common/ObjectMapperProvider.java index ed35eb0f68..7be85aca83 100644 --- a/common/src/main/java/com/walmartlabs/concord/common/ObjectMapperProvider.java +++ b/common/src/main/java/com/walmartlabs/concord/common/ObjectMapperProvider.java @@ -27,13 +27,19 @@ import com.fasterxml.jackson.datatype.guava.GuavaModule; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.inject.Provider; public class ObjectMapperProvider implements Provider { + private static final Logger log = LoggerFactory.getLogger(ObjectMapperProvider.class); + @Override public ObjectMapper get() { + log.info("Using concord-common's ObjectMapper..."); + ObjectMapper mapper = new ObjectMapper() .registerModule(new Jdk8Module()) .registerModule(new GuavaModule()) diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerAnsibleIT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerAnsibleIT.java index a448bcab6a..5bf1535aa1 100644 --- a/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerAnsibleIT.java +++ b/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerAnsibleIT.java @@ -24,7 +24,7 @@ import com.walmartlabs.concord.client.ProcessEntry; import com.walmartlabs.concord.client.StartProcessResponse; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIf; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import java.io.File; import java.util.HashMap; @@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@DisabledIf(value = "shouldSkipDockerTests", disabledReason = "Requires dockerd listening on a tcp socket. Not available in a typical CI environment") +@DisabledIfEnvironmentVariable(named = "SKIP_DOCKER_TESTS", matches = "true", disabledReason = "Requires dockerd listening on a tcp socket. Not available in a typical CI environment") public class DockerAnsibleIT extends AbstractServerIT { @Test diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerIT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerIT.java index ccaec122c2..89647ab99c 100644 --- a/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerIT.java +++ b/it/server/src/test/java/com/walmartlabs/concord/it/server/DockerIT.java @@ -25,6 +25,7 @@ import com.walmartlabs.concord.client.StartProcessResponse; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIf; +import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import java.util.HashMap; import java.util.Map; @@ -33,7 +34,7 @@ import static com.walmartlabs.concord.it.common.ServerClient.*; import static org.junit.jupiter.api.Assertions.assertNotNull; -@DisabledIf(value = "shouldSkipDockerTests", disabledReason = "Requires dockerd listening on a tcp socket. Not available in a typical CI environment") +@DisabledIfEnvironmentVariable(named = "SKIP_DOCKER_TESTS", matches = "true", disabledReason = "Requires dockerd listening on a tcp socket. Not available in a typical CI environment") public class DockerIT extends AbstractServerIT { @Test diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperInitializer.java b/server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperInitializer.java new file mode 100644 index 0000000000..f10ae1341f --- /dev/null +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/ObjectMapperInitializer.java @@ -0,0 +1,46 @@ +package com.walmartlabs.concord.server; + +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2018 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.guava.GuavaModule; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.eclipse.sisu.EagerSingleton; + +import javax.inject.Inject; +import javax.inject.Named; + +/** + * Until Siesta is removed, we need to make sure its ObjectMapper is configured correctly. + */ +@Named +@EagerSingleton +public class ObjectMapperInitializer { + + @Inject + public ObjectMapperInitializer(@Named("siesta") javax.inject.Provider mapperProvider) { + ObjectMapper om = mapperProvider.get(); + om.registerModule(new GuavaModule()); + om.registerModule(new Jdk8Module()); + om.registerModule(new JavaTimeModule()); + } +} From 0457518784a7faf1b0f78b53b31f5ee41c60fe1f Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Sat, 25 Nov 2023 20:15:13 -0500 Subject: [PATCH 36/52] concord-agent-operator: use JDK 17 base image --- k8s/agent-operator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/agent-operator/Dockerfile b/k8s/agent-operator/Dockerfile index 74095896ea..9eb567520b 100644 --- a/k8s/agent-operator/Dockerfile +++ b/k8s/agent-operator/Dockerfile @@ -1,4 +1,4 @@ -ARG from_image=gcr.io/distroless/java:8 +ARG from_image=gcr.io/distroless/java17 FROM $from_image COPY target/operator.jar /operator.jar From c563f434284eb1dfcfc961ce11827b9277c4d2bc Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Sat, 25 Nov 2023 21:25:00 -0500 Subject: [PATCH 37/52] concord-server: add EXTRA_CLASSPATH to start script --- server/dist/src/assembly/start.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/dist/src/assembly/start.sh b/server/dist/src/assembly/start.sh index 46ce235dcd..f62e44951d 100755 --- a/server/dist/src/assembly/start.sh +++ b/server/dist/src/assembly/start.sh @@ -40,6 +40,12 @@ if (( $JAVA_VERSION > 8 )); then JDK_SPECIFIC_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED" fi +if [[ -z "${EXTRA_CLASSPATH}" ]]; then + EXTRA_CLASSPATH="" +fi + +echo "EXTRA_CLASSPATH: ${EXTRA_CLASSPATH}" + exec java \ ${CONCORD_JAVA_OPTS} \ ${JDK_SPECIFIC_OPTS} \ @@ -47,5 +53,5 @@ ${JDK_SPECIFIC_OPTS} \ -Djava.net.preferIPv4Stack=true \ -Djava.security.egd=file:/dev/./urandom \ -Dollie.conf=${CONCORD_CFG_FILE} \ --cp "${BASE_DIR}/lib/*:${BASE_DIR}/ext/*:${BASE_DIR}/classes" \ +-cp "${BASE_DIR}/lib/*:${BASE_DIR}/ext/*:${BASE_DIR}/classes:${EXTRA_CLASSPATH}" \ "${MAIN_CLASS}" From 527ddbd422c5c5b67dd04ceac6a9f16ac82fe56f Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Sun, 26 Nov 2023 14:13:24 -0500 Subject: [PATCH 38/52] Changelog 2.4.0 (#837) --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9ea06950a..314b58a200 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Change log +## [2.4.0] - Unreleased + +### Added + +- concord-server: add `EXTRA_CLASSPATH` to start script +([#836](https://github.com/walmartlabs/concord/pull/836)); + +### Changed + +- concord-agent-operator: use JDK 17 base image +([#836](https://github.com/walmartlabs/concord/pull/836)); +- concord-common: shared ObjectMapperProvider +([#836](https://github.com/walmartlabs/concord/pull/836)). + + + ## [2.3.0] - 2023-11-21 ### Added From ef25ca226a75008fa7d556a395d374544feb37d0 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Sun, 26 Nov 2023 14:18:47 -0500 Subject: [PATCH 39/52] [maven-release-plugin] prepare release 2.4.0 --- agent/pom.xml | 2 +- cli/pom.xml | 2 +- client/pom.xml | 2 +- client2/pom.xml | 2 +- common/pom.xml | 2 +- console2/pom.xml | 2 +- dependency-manager/pom.xml | 2 +- docker-images/agent/pom.xml | 2 +- docker-images/ansible/pom.xml | 2 +- docker-images/base/pom.xml | 2 +- docker-images/pom.xml | 2 +- docker-images/server/pom.xml | 2 +- forms/pom.xml | 2 +- imports/pom.xml | 2 +- it/common/pom.xml | 2 +- it/compat/pom.xml | 2 +- it/console/pom.xml | 2 +- it/pom.xml | 2 +- it/runtime-v1/pom.xml | 2 +- it/runtime-v2/pom.xml | 2 +- it/server/pom.xml | 2 +- it/tasks/broken-deps/pom.xml | 2 +- it/tasks/client1-test/pom.xml | 2 +- it/tasks/dependency-manager-test/pom.xml | 2 +- it/tasks/serialization-test/pom.xml | 2 +- it/tasks/suspend-test/pom.xml | 2 +- it/testing-server/pom.xml | 2 +- k8s/agent-operator/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/tasks/ansible/pom.xml | 2 +- plugins/tasks/concord/pom.xml | 2 +- plugins/tasks/crypto/pom.xml | 2 +- plugins/tasks/docker/pom.xml | 2 +- plugins/tasks/dynamic-tasks/pom.xml | 2 +- plugins/tasks/example/pom.xml | 2 +- plugins/tasks/files/pom.xml | 2 +- plugins/tasks/http/pom.xml | 2 +- plugins/tasks/kv/pom.xml | 2 +- plugins/tasks/locale/pom.xml | 2 +- plugins/tasks/lock/pom.xml | 2 +- plugins/tasks/log/pom.xml | 2 +- plugins/tasks/misc/pom.xml | 2 +- plugins/tasks/noderoster/pom.xml | 2 +- plugins/tasks/resource/pom.xml | 2 +- plugins/tasks/slack/pom.xml | 2 +- plugins/tasks/sleep/pom.xml | 2 +- plugins/tasks/smtp/pom.xml | 2 +- plugins/tasks/throw/pom.xml | 2 +- plugins/tasks/variables/pom.xml | 2 +- plugins/templates/ansible/pom.xml | 2 +- policy-engine/pom.xml | 2 +- pom.xml | 4 ++-- repository/pom.xml | 2 +- runtime/common/pom.xml | 2 +- runtime/loader/pom.xml | 2 +- runtime/v1/impl/pom.xml | 2 +- runtime/v1/pom.xml | 2 +- runtime/v1/project-model/pom.xml | 2 +- runtime/v2/model/pom.xml | 2 +- runtime/v2/pom.xml | 2 +- runtime/v2/runner/pom.xml | 2 +- runtime/v2/sdk/pom.xml | 2 +- runtime/v2/vm/pom.xml | 2 +- sdk/pom.xml | 2 +- server/db/pom.xml | 2 +- server/dist/pom.xml | 2 +- server/impl/pom.xml | 2 +- server/liquibase-ext/pom.xml | 2 +- server/plugins/ansible/client/pom.xml | 2 +- server/plugins/ansible/client2/pom.xml | 2 +- server/plugins/ansible/db/pom.xml | 2 +- server/plugins/ansible/impl/pom.xml | 2 +- server/plugins/ansible/pom.xml | 2 +- server/plugins/kafka-event-sink/pom.xml | 2 +- server/plugins/noderoster/client/pom.xml | 2 +- server/plugins/noderoster/client2/pom.xml | 2 +- server/plugins/noderoster/db/pom.xml | 2 +- server/plugins/noderoster/impl/pom.xml | 2 +- server/plugins/noderoster/pom.xml | 2 +- server/plugins/oidc/pom.xml | 2 +- server/plugins/oneops/pom.xml | 2 +- server/plugins/pfed-sso/pom.xml | 2 +- server/plugins/pom.xml | 2 +- server/pom.xml | 2 +- server/queue-client/pom.xml | 2 +- server/sdk/pom.xml | 2 +- targetplatform/pom.xml | 4 ++-- 87 files changed, 89 insertions(+), 89 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index c7bf976db6..390e18572e 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/cli/pom.xml b/cli/pom.xml index 8823efb0ea..8e7040fcf7 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index 374f927e8c..4e31c772f9 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/client2/pom.xml b/client2/pom.xml index 31478f2224..5a0645c8a9 100644 --- a/client2/pom.xml +++ b/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/common/pom.xml b/common/pom.xml index e1918ff769..25f4b3c2eb 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/console2/pom.xml b/console2/pom.xml index 31389eb14e..186bf2300a 100644 --- a/console2/pom.xml +++ b/console2/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/dependency-manager/pom.xml b/dependency-manager/pom.xml index e9413eb1ec..15faeac9a7 100644 --- a/dependency-manager/pom.xml +++ b/dependency-manager/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/docker-images/agent/pom.xml b/docker-images/agent/pom.xml index 9dfee21231..1887b1c111 100644 --- a/docker-images/agent/pom.xml +++ b/docker-images/agent/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/docker-images/ansible/pom.xml b/docker-images/ansible/pom.xml index 003677e460..734d62d8e4 100644 --- a/docker-images/ansible/pom.xml +++ b/docker-images/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/docker-images/base/pom.xml b/docker-images/base/pom.xml index ed268a0ea5..c9ef0c7757 100644 --- a/docker-images/base/pom.xml +++ b/docker-images/base/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.docker parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/docker-images/pom.xml b/docker-images/pom.xml index e0b2cbfa29..99dfa9518f 100644 --- a/docker-images/pom.xml +++ b/docker-images/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/docker-images/server/pom.xml b/docker-images/server/pom.xml index df441b6b4a..024ef1c749 100644 --- a/docker-images/server/pom.xml +++ b/docker-images/server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/forms/pom.xml b/forms/pom.xml index 3d2ad295c7..9c8912e91a 100644 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/imports/pom.xml b/imports/pom.xml index 271c3e4ab8..0e4b993320 100644 --- a/imports/pom.xml +++ b/imports/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/it/common/pom.xml b/it/common/pom.xml index 8adb37094b..517b85797b 100644 --- a/it/common/pom.xml +++ b/it/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/it/compat/pom.xml b/it/compat/pom.xml index 46185fbf2c..3356959a8d 100644 --- a/it/compat/pom.xml +++ b/it/compat/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/it/console/pom.xml b/it/console/pom.xml index 17475e477b..e44e9d3809 100644 --- a/it/console/pom.xml +++ b/it/console/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/it/pom.xml b/it/pom.xml index e4bbea4d5f..902bbd8375 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/it/runtime-v1/pom.xml b/it/runtime-v1/pom.xml index 886ab151f9..34416ef40c 100644 --- a/it/runtime-v1/pom.xml +++ b/it/runtime-v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/it/runtime-v2/pom.xml b/it/runtime-v2/pom.xml index 08fb2aef92..8dc518ea21 100644 --- a/it/runtime-v2/pom.xml +++ b/it/runtime-v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/it/server/pom.xml b/it/server/pom.xml index fccb687736..488f039e1c 100644 --- a/it/server/pom.xml +++ b/it/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/it/tasks/broken-deps/pom.xml b/it/tasks/broken-deps/pom.xml index d0a131e0ec..51ed2eb7ad 100644 --- a/it/tasks/broken-deps/pom.xml +++ b/it/tasks/broken-deps/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/it/tasks/client1-test/pom.xml b/it/tasks/client1-test/pom.xml index def1f891e0..55d42d7683 100644 --- a/it/tasks/client1-test/pom.xml +++ b/it/tasks/client1-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/it/tasks/dependency-manager-test/pom.xml b/it/tasks/dependency-manager-test/pom.xml index f5a645f2b6..dd881293c1 100644 --- a/it/tasks/dependency-manager-test/pom.xml +++ b/it/tasks/dependency-manager-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/it/tasks/serialization-test/pom.xml b/it/tasks/serialization-test/pom.xml index 5fde37831f..53e6019de2 100644 --- a/it/tasks/serialization-test/pom.xml +++ b/it/tasks/serialization-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/it/tasks/suspend-test/pom.xml b/it/tasks/suspend-test/pom.xml index 86604bdff8..2aa9b752ac 100644 --- a/it/tasks/suspend-test/pom.xml +++ b/it/tasks/suspend-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/it/testing-server/pom.xml b/it/testing-server/pom.xml index 0622dec8ad..104fa2c357 100644 --- a/it/testing-server/pom.xml +++ b/it/testing-server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/k8s/agent-operator/pom.xml b/k8s/agent-operator/pom.xml index 872b7e7613..2b9844b4d1 100644 --- a/k8s/agent-operator/pom.xml +++ b/k8s/agent-operator/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 96840c1186..586d1f20d9 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/plugins/tasks/ansible/pom.xml b/plugins/tasks/ansible/pom.xml index b04b41bc25..00d31bff3e 100644 --- a/plugins/tasks/ansible/pom.xml +++ b/plugins/tasks/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/concord/pom.xml b/plugins/tasks/concord/pom.xml index b2cacb09f5..8a8a1cffb4 100644 --- a/plugins/tasks/concord/pom.xml +++ b/plugins/tasks/concord/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/crypto/pom.xml b/plugins/tasks/crypto/pom.xml index 1ba526adf4..bb59aa1893 100644 --- a/plugins/tasks/crypto/pom.xml +++ b/plugins/tasks/crypto/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/docker/pom.xml b/plugins/tasks/docker/pom.xml index 7339e2e6cc..506f55b85a 100644 --- a/plugins/tasks/docker/pom.xml +++ b/plugins/tasks/docker/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/dynamic-tasks/pom.xml b/plugins/tasks/dynamic-tasks/pom.xml index 8e6cdbf183..3298281168 100644 --- a/plugins/tasks/dynamic-tasks/pom.xml +++ b/plugins/tasks/dynamic-tasks/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/example/pom.xml b/plugins/tasks/example/pom.xml index 87ab3e5198..ed828fa1a9 100644 --- a/plugins/tasks/example/pom.xml +++ b/plugins/tasks/example/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/files/pom.xml b/plugins/tasks/files/pom.xml index 3ccecf85e7..31515ef4e7 100644 --- a/plugins/tasks/files/pom.xml +++ b/plugins/tasks/files/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/http/pom.xml b/plugins/tasks/http/pom.xml index a3dca758b6..7a4c7dfed7 100644 --- a/plugins/tasks/http/pom.xml +++ b/plugins/tasks/http/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/kv/pom.xml b/plugins/tasks/kv/pom.xml index 5fc8d7e0d1..dc3812b3e7 100644 --- a/plugins/tasks/kv/pom.xml +++ b/plugins/tasks/kv/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/locale/pom.xml b/plugins/tasks/locale/pom.xml index 967c52ef01..089e863b1e 100644 --- a/plugins/tasks/locale/pom.xml +++ b/plugins/tasks/locale/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/lock/pom.xml b/plugins/tasks/lock/pom.xml index 638cd97f9c..725c35e959 100644 --- a/plugins/tasks/lock/pom.xml +++ b/plugins/tasks/lock/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/log/pom.xml b/plugins/tasks/log/pom.xml index 7b3c87da3f..f129e15479 100644 --- a/plugins/tasks/log/pom.xml +++ b/plugins/tasks/log/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/misc/pom.xml b/plugins/tasks/misc/pom.xml index caad0a1c46..f4225a25a0 100644 --- a/plugins/tasks/misc/pom.xml +++ b/plugins/tasks/misc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/noderoster/pom.xml b/plugins/tasks/noderoster/pom.xml index a03793d8c9..f5ae42c216 100644 --- a/plugins/tasks/noderoster/pom.xml +++ b/plugins/tasks/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/resource/pom.xml b/plugins/tasks/resource/pom.xml index 010aa96ffb..070686220c 100644 --- a/plugins/tasks/resource/pom.xml +++ b/plugins/tasks/resource/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/slack/pom.xml b/plugins/tasks/slack/pom.xml index a52c1e911a..eb5b673609 100644 --- a/plugins/tasks/slack/pom.xml +++ b/plugins/tasks/slack/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/sleep/pom.xml b/plugins/tasks/sleep/pom.xml index 2e06e28b68..44fe3cecc0 100644 --- a/plugins/tasks/sleep/pom.xml +++ b/plugins/tasks/sleep/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/smtp/pom.xml b/plugins/tasks/smtp/pom.xml index 223f5621da..f08e52bcb5 100644 --- a/plugins/tasks/smtp/pom.xml +++ b/plugins/tasks/smtp/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/throw/pom.xml b/plugins/tasks/throw/pom.xml index 83ba89ee2c..84b7848c31 100644 --- a/plugins/tasks/throw/pom.xml +++ b/plugins/tasks/throw/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/tasks/variables/pom.xml b/plugins/tasks/variables/pom.xml index 26a0249d2d..85dcb8c2c6 100644 --- a/plugins/tasks/variables/pom.xml +++ b/plugins/tasks/variables/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/plugins/templates/ansible/pom.xml b/plugins/templates/ansible/pom.xml index 967420d678..a30f6a25a3 100644 --- a/plugins/templates/ansible/pom.xml +++ b/plugins/templates/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/policy-engine/pom.xml b/policy-engine/pom.xml index 846a57ae76..fff59d6d31 100644 --- a/policy-engine/pom.xml +++ b/policy-engine/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 13095d7e6a..21ff92addb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 pom ${project.groupId}:${project.artifactId} @@ -426,7 +426,7 @@ ${scm.connection} ${scm.connection} - HEAD + 2.4.0 diff --git a/repository/pom.xml b/repository/pom.xml index 184260846d..e686a56454 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/runtime/common/pom.xml b/runtime/common/pom.xml index f8d675106a..146db0a7bf 100644 --- a/runtime/common/pom.xml +++ b/runtime/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/runtime/loader/pom.xml b/runtime/loader/pom.xml index 4270b9fe60..9a69777735 100644 --- a/runtime/loader/pom.xml +++ b/runtime/loader/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/runtime/v1/impl/pom.xml b/runtime/v1/impl/pom.xml index dc3bc6d18e..88023b1761 100644 --- a/runtime/v1/impl/pom.xml +++ b/runtime/v1/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/runtime/v1/pom.xml b/runtime/v1/pom.xml index 60740b1b56..3178fe4051 100644 --- a/runtime/v1/pom.xml +++ b/runtime/v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/runtime/v1/project-model/pom.xml b/runtime/v1/project-model/pom.xml index c63a845278..4449bb52cf 100644 --- a/runtime/v1/project-model/pom.xml +++ b/runtime/v1/project-model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/runtime/v2/model/pom.xml b/runtime/v2/model/pom.xml index 98a8d516d6..1dd2cb8863 100644 --- a/runtime/v2/model/pom.xml +++ b/runtime/v2/model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/runtime/v2/pom.xml b/runtime/v2/pom.xml index 988d5300f7..2574eae2a1 100644 --- a/runtime/v2/pom.xml +++ b/runtime/v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../../pom.xml diff --git a/runtime/v2/runner/pom.xml b/runtime/v2/runner/pom.xml index 41448a4cc7..fb362fdc17 100644 --- a/runtime/v2/runner/pom.xml +++ b/runtime/v2/runner/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/runtime/v2/sdk/pom.xml b/runtime/v2/sdk/pom.xml index 4110c05c5c..35454db3d9 100644 --- a/runtime/v2/sdk/pom.xml +++ b/runtime/v2/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/runtime/v2/vm/pom.xml b/runtime/v2/vm/pom.xml index d85f3c8d14..88f61ce64a 100644 --- a/runtime/v2/vm/pom.xml +++ b/runtime/v2/vm/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 8efaf9833f..84f0f76a72 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/db/pom.xml b/server/db/pom.xml index 5f899afe9e..5b4400ca75 100644 --- a/server/db/pom.xml +++ b/server/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/dist/pom.xml b/server/dist/pom.xml index a3c75e1181..541879c68a 100644 --- a/server/dist/pom.xml +++ b/server/dist/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/impl/pom.xml b/server/impl/pom.xml index f66a407782..38c56beb99 100644 --- a/server/impl/pom.xml +++ b/server/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/liquibase-ext/pom.xml b/server/liquibase-ext/pom.xml index 590686f04b..e64c7e99cf 100644 --- a/server/liquibase-ext/pom.xml +++ b/server/liquibase-ext/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/ansible/client/pom.xml b/server/plugins/ansible/client/pom.xml index 3db9499823..d116aa1f70 100644 --- a/server/plugins/ansible/client/pom.xml +++ b/server/plugins/ansible/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/ansible/client2/pom.xml b/server/plugins/ansible/client2/pom.xml index e5e3dd7e1b..e31a9c07fa 100644 --- a/server/plugins/ansible/client2/pom.xml +++ b/server/plugins/ansible/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/ansible/db/pom.xml b/server/plugins/ansible/db/pom.xml index 4eec5465ef..ccf2584728 100644 --- a/server/plugins/ansible/db/pom.xml +++ b/server/plugins/ansible/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/ansible/impl/pom.xml b/server/plugins/ansible/impl/pom.xml index 5a55e3994a..1ffc32f7e7 100644 --- a/server/plugins/ansible/impl/pom.xml +++ b/server/plugins/ansible/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/ansible/pom.xml b/server/plugins/ansible/pom.xml index 146efd80dd..97622bd63d 100644 --- a/server/plugins/ansible/pom.xml +++ b/server/plugins/ansible/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/kafka-event-sink/pom.xml b/server/plugins/kafka-event-sink/pom.xml index e12f30557e..dfb4985564 100644 --- a/server/plugins/kafka-event-sink/pom.xml +++ b/server/plugins/kafka-event-sink/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/noderoster/client/pom.xml b/server/plugins/noderoster/client/pom.xml index 6d8c8c490b..cf37b3948c 100644 --- a/server/plugins/noderoster/client/pom.xml +++ b/server/plugins/noderoster/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/noderoster/client2/pom.xml b/server/plugins/noderoster/client2/pom.xml index 36a6d88ca3..db645975eb 100644 --- a/server/plugins/noderoster/client2/pom.xml +++ b/server/plugins/noderoster/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/noderoster/db/pom.xml b/server/plugins/noderoster/db/pom.xml index 4ff04f6478..e2ac9b3055 100644 --- a/server/plugins/noderoster/db/pom.xml +++ b/server/plugins/noderoster/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/noderoster/impl/pom.xml b/server/plugins/noderoster/impl/pom.xml index 280cca36f5..48c356ab44 100644 --- a/server/plugins/noderoster/impl/pom.xml +++ b/server/plugins/noderoster/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/noderoster/pom.xml b/server/plugins/noderoster/pom.xml index 2b6fc6b131..6a51b3880c 100644 --- a/server/plugins/noderoster/pom.xml +++ b/server/plugins/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/oidc/pom.xml b/server/plugins/oidc/pom.xml index fa5582e438..4ac688cd0a 100644 --- a/server/plugins/oidc/pom.xml +++ b/server/plugins/oidc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/oneops/pom.xml b/server/plugins/oneops/pom.xml index 6fe0b8ed0d..b0f20aa461 100644 --- a/server/plugins/oneops/pom.xml +++ b/server/plugins/oneops/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/plugins/pfed-sso/pom.xml b/server/plugins/pfed-sso/pom.xml index d0c777c0fd..b4705ae44d 100644 --- a/server/plugins/pfed-sso/pom.xml +++ b/server/plugins/pfed-sso/pom.xml @@ -3,7 +3,7 @@ parent com.walmartlabs.concord.server.plugins - 2.3.1-SNAPSHOT + 2.4.0 4.0.0 diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml index b6107ce593..672f3744fc 100644 --- a/server/plugins/pom.xml +++ b/server/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/pom.xml b/server/pom.xml index 41d0352baf..9b738fc14f 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/queue-client/pom.xml b/server/queue-client/pom.xml index 14b2dad2e4..8ab0d30777 100644 --- a/server/queue-client/pom.xml +++ b/server/queue-client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/server/sdk/pom.xml b/server/sdk/pom.xml index 24637110d9..e17a8a2da0 100644 --- a/server/sdk/pom.xml +++ b/server/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.3.1-SNAPSHOT + 2.4.0 ../pom.xml diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index 5b4dd3c4f0..a1b1380be3 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord concord-targetplatform - 2.3.1-SNAPSHOT + 2.4.0 pom @@ -1298,7 +1298,7 @@ ${scm.connection} ${scm.connection} - HEAD + 2.4.0 From 4d57313f0e7f9601cd4264d6d973a0f17111683a Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Sun, 26 Nov 2023 14:18:47 -0500 Subject: [PATCH 40/52] [maven-release-plugin] prepare for next development iteration --- agent/pom.xml | 2 +- cli/pom.xml | 2 +- client/pom.xml | 2 +- client2/pom.xml | 2 +- common/pom.xml | 2 +- console2/pom.xml | 2 +- dependency-manager/pom.xml | 2 +- docker-images/agent/pom.xml | 2 +- docker-images/ansible/pom.xml | 2 +- docker-images/base/pom.xml | 2 +- docker-images/pom.xml | 2 +- docker-images/server/pom.xml | 2 +- forms/pom.xml | 2 +- imports/pom.xml | 2 +- it/common/pom.xml | 2 +- it/compat/pom.xml | 2 +- it/console/pom.xml | 2 +- it/pom.xml | 2 +- it/runtime-v1/pom.xml | 2 +- it/runtime-v2/pom.xml | 2 +- it/server/pom.xml | 2 +- it/tasks/broken-deps/pom.xml | 2 +- it/tasks/client1-test/pom.xml | 2 +- it/tasks/dependency-manager-test/pom.xml | 2 +- it/tasks/serialization-test/pom.xml | 2 +- it/tasks/suspend-test/pom.xml | 2 +- it/testing-server/pom.xml | 2 +- k8s/agent-operator/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/tasks/ansible/pom.xml | 2 +- plugins/tasks/concord/pom.xml | 2 +- plugins/tasks/crypto/pom.xml | 2 +- plugins/tasks/docker/pom.xml | 2 +- plugins/tasks/dynamic-tasks/pom.xml | 2 +- plugins/tasks/example/pom.xml | 2 +- plugins/tasks/files/pom.xml | 2 +- plugins/tasks/http/pom.xml | 2 +- plugins/tasks/kv/pom.xml | 2 +- plugins/tasks/locale/pom.xml | 2 +- plugins/tasks/lock/pom.xml | 2 +- plugins/tasks/log/pom.xml | 2 +- plugins/tasks/misc/pom.xml | 2 +- plugins/tasks/noderoster/pom.xml | 2 +- plugins/tasks/resource/pom.xml | 2 +- plugins/tasks/slack/pom.xml | 2 +- plugins/tasks/sleep/pom.xml | 2 +- plugins/tasks/smtp/pom.xml | 2 +- plugins/tasks/throw/pom.xml | 2 +- plugins/tasks/variables/pom.xml | 2 +- plugins/templates/ansible/pom.xml | 2 +- policy-engine/pom.xml | 2 +- pom.xml | 4 ++-- repository/pom.xml | 2 +- runtime/common/pom.xml | 2 +- runtime/loader/pom.xml | 2 +- runtime/v1/impl/pom.xml | 2 +- runtime/v1/pom.xml | 2 +- runtime/v1/project-model/pom.xml | 2 +- runtime/v2/model/pom.xml | 2 +- runtime/v2/pom.xml | 2 +- runtime/v2/runner/pom.xml | 2 +- runtime/v2/sdk/pom.xml | 2 +- runtime/v2/vm/pom.xml | 2 +- sdk/pom.xml | 2 +- server/db/pom.xml | 2 +- server/dist/pom.xml | 2 +- server/impl/pom.xml | 2 +- server/liquibase-ext/pom.xml | 2 +- server/plugins/ansible/client/pom.xml | 2 +- server/plugins/ansible/client2/pom.xml | 2 +- server/plugins/ansible/db/pom.xml | 2 +- server/plugins/ansible/impl/pom.xml | 2 +- server/plugins/ansible/pom.xml | 2 +- server/plugins/kafka-event-sink/pom.xml | 2 +- server/plugins/noderoster/client/pom.xml | 2 +- server/plugins/noderoster/client2/pom.xml | 2 +- server/plugins/noderoster/db/pom.xml | 2 +- server/plugins/noderoster/impl/pom.xml | 2 +- server/plugins/noderoster/pom.xml | 2 +- server/plugins/oidc/pom.xml | 2 +- server/plugins/oneops/pom.xml | 2 +- server/plugins/pfed-sso/pom.xml | 2 +- server/plugins/pom.xml | 2 +- server/pom.xml | 2 +- server/queue-client/pom.xml | 2 +- server/sdk/pom.xml | 2 +- targetplatform/pom.xml | 4 ++-- 87 files changed, 89 insertions(+), 89 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index 390e18572e..627eeef6e4 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/cli/pom.xml b/cli/pom.xml index 8e7040fcf7..003ca37bbb 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index 4e31c772f9..a731c5a46e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/client2/pom.xml b/client2/pom.xml index 5a0645c8a9..8c519e45c0 100644 --- a/client2/pom.xml +++ b/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/common/pom.xml b/common/pom.xml index 25f4b3c2eb..7c588cd452 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/console2/pom.xml b/console2/pom.xml index 186bf2300a..768f97d7f4 100644 --- a/console2/pom.xml +++ b/console2/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/dependency-manager/pom.xml b/dependency-manager/pom.xml index 15faeac9a7..b086e50dd1 100644 --- a/dependency-manager/pom.xml +++ b/dependency-manager/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/docker-images/agent/pom.xml b/docker-images/agent/pom.xml index 1887b1c111..64efc79a68 100644 --- a/docker-images/agent/pom.xml +++ b/docker-images/agent/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/docker-images/ansible/pom.xml b/docker-images/ansible/pom.xml index 734d62d8e4..8ed003d9e2 100644 --- a/docker-images/ansible/pom.xml +++ b/docker-images/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/docker-images/base/pom.xml b/docker-images/base/pom.xml index c9ef0c7757..0f3793090d 100644 --- a/docker-images/base/pom.xml +++ b/docker-images/base/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.docker parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/docker-images/pom.xml b/docker-images/pom.xml index 99dfa9518f..bb0e6b8a29 100644 --- a/docker-images/pom.xml +++ b/docker-images/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/docker-images/server/pom.xml b/docker-images/server/pom.xml index 024ef1c749..86a9a46808 100644 --- a/docker-images/server/pom.xml +++ b/docker-images/server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/forms/pom.xml b/forms/pom.xml index 9c8912e91a..96490597b3 100644 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/imports/pom.xml b/imports/pom.xml index 0e4b993320..c84b81778b 100644 --- a/imports/pom.xml +++ b/imports/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/it/common/pom.xml b/it/common/pom.xml index 517b85797b..1a0b8014bc 100644 --- a/it/common/pom.xml +++ b/it/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/it/compat/pom.xml b/it/compat/pom.xml index 3356959a8d..9695c211a6 100644 --- a/it/compat/pom.xml +++ b/it/compat/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/it/console/pom.xml b/it/console/pom.xml index e44e9d3809..8e04dc73c9 100644 --- a/it/console/pom.xml +++ b/it/console/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/it/pom.xml b/it/pom.xml index 902bbd8375..c48533e608 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/it/runtime-v1/pom.xml b/it/runtime-v1/pom.xml index 34416ef40c..cfdfe04841 100644 --- a/it/runtime-v1/pom.xml +++ b/it/runtime-v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/it/runtime-v2/pom.xml b/it/runtime-v2/pom.xml index 8dc518ea21..ee332a5cf1 100644 --- a/it/runtime-v2/pom.xml +++ b/it/runtime-v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/it/server/pom.xml b/it/server/pom.xml index 488f039e1c..dd1b245b56 100644 --- a/it/server/pom.xml +++ b/it/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/it/tasks/broken-deps/pom.xml b/it/tasks/broken-deps/pom.xml index 51ed2eb7ad..70d44f7188 100644 --- a/it/tasks/broken-deps/pom.xml +++ b/it/tasks/broken-deps/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/client1-test/pom.xml b/it/tasks/client1-test/pom.xml index 55d42d7683..4e650614a5 100644 --- a/it/tasks/client1-test/pom.xml +++ b/it/tasks/client1-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/dependency-manager-test/pom.xml b/it/tasks/dependency-manager-test/pom.xml index dd881293c1..bc80e6ca69 100644 --- a/it/tasks/dependency-manager-test/pom.xml +++ b/it/tasks/dependency-manager-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/serialization-test/pom.xml b/it/tasks/serialization-test/pom.xml index 53e6019de2..c0c5d843a5 100644 --- a/it/tasks/serialization-test/pom.xml +++ b/it/tasks/serialization-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/suspend-test/pom.xml b/it/tasks/suspend-test/pom.xml index 2aa9b752ac..dc919fc0f1 100644 --- a/it/tasks/suspend-test/pom.xml +++ b/it/tasks/suspend-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/it/testing-server/pom.xml b/it/testing-server/pom.xml index 104fa2c357..e5ec93ebc7 100644 --- a/it/testing-server/pom.xml +++ b/it/testing-server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/k8s/agent-operator/pom.xml b/k8s/agent-operator/pom.xml index 2b9844b4d1..3c2de3b6e3 100644 --- a/k8s/agent-operator/pom.xml +++ b/k8s/agent-operator/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 586d1f20d9..1130f9d1c7 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/plugins/tasks/ansible/pom.xml b/plugins/tasks/ansible/pom.xml index 00d31bff3e..e10efeed57 100644 --- a/plugins/tasks/ansible/pom.xml +++ b/plugins/tasks/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/concord/pom.xml b/plugins/tasks/concord/pom.xml index 8a8a1cffb4..506862077e 100644 --- a/plugins/tasks/concord/pom.xml +++ b/plugins/tasks/concord/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/crypto/pom.xml b/plugins/tasks/crypto/pom.xml index bb59aa1893..80d9df9093 100644 --- a/plugins/tasks/crypto/pom.xml +++ b/plugins/tasks/crypto/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/docker/pom.xml b/plugins/tasks/docker/pom.xml index 506f55b85a..8c1eccb211 100644 --- a/plugins/tasks/docker/pom.xml +++ b/plugins/tasks/docker/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/dynamic-tasks/pom.xml b/plugins/tasks/dynamic-tasks/pom.xml index 3298281168..89e9af84f3 100644 --- a/plugins/tasks/dynamic-tasks/pom.xml +++ b/plugins/tasks/dynamic-tasks/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/example/pom.xml b/plugins/tasks/example/pom.xml index ed828fa1a9..0f17f45122 100644 --- a/plugins/tasks/example/pom.xml +++ b/plugins/tasks/example/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/files/pom.xml b/plugins/tasks/files/pom.xml index 31515ef4e7..a8be11f89f 100644 --- a/plugins/tasks/files/pom.xml +++ b/plugins/tasks/files/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/http/pom.xml b/plugins/tasks/http/pom.xml index 7a4c7dfed7..a627cb6943 100644 --- a/plugins/tasks/http/pom.xml +++ b/plugins/tasks/http/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/kv/pom.xml b/plugins/tasks/kv/pom.xml index dc3812b3e7..8275dd88f7 100644 --- a/plugins/tasks/kv/pom.xml +++ b/plugins/tasks/kv/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/locale/pom.xml b/plugins/tasks/locale/pom.xml index 089e863b1e..cccc526bbc 100644 --- a/plugins/tasks/locale/pom.xml +++ b/plugins/tasks/locale/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/lock/pom.xml b/plugins/tasks/lock/pom.xml index 725c35e959..57db6ebf5d 100644 --- a/plugins/tasks/lock/pom.xml +++ b/plugins/tasks/lock/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/log/pom.xml b/plugins/tasks/log/pom.xml index f129e15479..f14e035f68 100644 --- a/plugins/tasks/log/pom.xml +++ b/plugins/tasks/log/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/misc/pom.xml b/plugins/tasks/misc/pom.xml index f4225a25a0..9d7da01861 100644 --- a/plugins/tasks/misc/pom.xml +++ b/plugins/tasks/misc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/noderoster/pom.xml b/plugins/tasks/noderoster/pom.xml index f5ae42c216..9790e91c47 100644 --- a/plugins/tasks/noderoster/pom.xml +++ b/plugins/tasks/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/resource/pom.xml b/plugins/tasks/resource/pom.xml index 070686220c..a7a4f867cc 100644 --- a/plugins/tasks/resource/pom.xml +++ b/plugins/tasks/resource/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/slack/pom.xml b/plugins/tasks/slack/pom.xml index eb5b673609..3aff85f6d4 100644 --- a/plugins/tasks/slack/pom.xml +++ b/plugins/tasks/slack/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/sleep/pom.xml b/plugins/tasks/sleep/pom.xml index 44fe3cecc0..3f35bb1134 100644 --- a/plugins/tasks/sleep/pom.xml +++ b/plugins/tasks/sleep/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/smtp/pom.xml b/plugins/tasks/smtp/pom.xml index f08e52bcb5..dfdde77b46 100644 --- a/plugins/tasks/smtp/pom.xml +++ b/plugins/tasks/smtp/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/throw/pom.xml b/plugins/tasks/throw/pom.xml index 84b7848c31..1574b820ee 100644 --- a/plugins/tasks/throw/pom.xml +++ b/plugins/tasks/throw/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/variables/pom.xml b/plugins/tasks/variables/pom.xml index 85dcb8c2c6..f61d5ec7a5 100644 --- a/plugins/tasks/variables/pom.xml +++ b/plugins/tasks/variables/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/plugins/templates/ansible/pom.xml b/plugins/templates/ansible/pom.xml index a30f6a25a3..ad2665bad0 100644 --- a/plugins/templates/ansible/pom.xml +++ b/plugins/templates/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/policy-engine/pom.xml b/policy-engine/pom.xml index fff59d6d31..6f023fc954 100644 --- a/policy-engine/pom.xml +++ b/policy-engine/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 21ff92addb..2e9993f940 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} @@ -426,7 +426,7 @@ ${scm.connection} ${scm.connection} - 2.4.0 + HEAD diff --git a/repository/pom.xml b/repository/pom.xml index e686a56454..61bfc90a06 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/runtime/common/pom.xml b/runtime/common/pom.xml index 146db0a7bf..ce3334a390 100644 --- a/runtime/common/pom.xml +++ b/runtime/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/runtime/loader/pom.xml b/runtime/loader/pom.xml index 9a69777735..cd517c9a2c 100644 --- a/runtime/loader/pom.xml +++ b/runtime/loader/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v1/impl/pom.xml b/runtime/v1/impl/pom.xml index 88023b1761..60e2b1b18f 100644 --- a/runtime/v1/impl/pom.xml +++ b/runtime/v1/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/runtime/v1/pom.xml b/runtime/v1/pom.xml index 3178fe4051..8f5080fe44 100644 --- a/runtime/v1/pom.xml +++ b/runtime/v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v1/project-model/pom.xml b/runtime/v1/project-model/pom.xml index 4449bb52cf..f041383acf 100644 --- a/runtime/v1/project-model/pom.xml +++ b/runtime/v1/project-model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/model/pom.xml b/runtime/v2/model/pom.xml index 1dd2cb8863..19588d51b9 100644 --- a/runtime/v2/model/pom.xml +++ b/runtime/v2/model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/pom.xml b/runtime/v2/pom.xml index 2574eae2a1..c8b8628236 100644 --- a/runtime/v2/pom.xml +++ b/runtime/v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v2/runner/pom.xml b/runtime/v2/runner/pom.xml index fb362fdc17..6e03b1464f 100644 --- a/runtime/v2/runner/pom.xml +++ b/runtime/v2/runner/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/sdk/pom.xml b/runtime/v2/sdk/pom.xml index 35454db3d9..3a580c51d1 100644 --- a/runtime/v2/sdk/pom.xml +++ b/runtime/v2/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/vm/pom.xml b/runtime/v2/vm/pom.xml index 88f61ce64a..87b66188fa 100644 --- a/runtime/v2/vm/pom.xml +++ b/runtime/v2/vm/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 84f0f76a72..dbf8a4bdf6 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/db/pom.xml b/server/db/pom.xml index 5b4400ca75..f48279ff7e 100644 --- a/server/db/pom.xml +++ b/server/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/dist/pom.xml b/server/dist/pom.xml index 541879c68a..fbb9587987 100644 --- a/server/dist/pom.xml +++ b/server/dist/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/impl/pom.xml b/server/impl/pom.xml index 38c56beb99..bf49cd7817 100644 --- a/server/impl/pom.xml +++ b/server/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/liquibase-ext/pom.xml b/server/liquibase-ext/pom.xml index e64c7e99cf..24ba82f209 100644 --- a/server/liquibase-ext/pom.xml +++ b/server/liquibase-ext/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/client/pom.xml b/server/plugins/ansible/client/pom.xml index d116aa1f70..f02cf62e08 100644 --- a/server/plugins/ansible/client/pom.xml +++ b/server/plugins/ansible/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/client2/pom.xml b/server/plugins/ansible/client2/pom.xml index e31a9c07fa..04a2973905 100644 --- a/server/plugins/ansible/client2/pom.xml +++ b/server/plugins/ansible/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/db/pom.xml b/server/plugins/ansible/db/pom.xml index ccf2584728..675939a470 100644 --- a/server/plugins/ansible/db/pom.xml +++ b/server/plugins/ansible/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/impl/pom.xml b/server/plugins/ansible/impl/pom.xml index 1ffc32f7e7..d5941110e9 100644 --- a/server/plugins/ansible/impl/pom.xml +++ b/server/plugins/ansible/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/pom.xml b/server/plugins/ansible/pom.xml index 97622bd63d..980a759d60 100644 --- a/server/plugins/ansible/pom.xml +++ b/server/plugins/ansible/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/kafka-event-sink/pom.xml b/server/plugins/kafka-event-sink/pom.xml index dfb4985564..113508c1b7 100644 --- a/server/plugins/kafka-event-sink/pom.xml +++ b/server/plugins/kafka-event-sink/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/client/pom.xml b/server/plugins/noderoster/client/pom.xml index cf37b3948c..270e733e49 100644 --- a/server/plugins/noderoster/client/pom.xml +++ b/server/plugins/noderoster/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/client2/pom.xml b/server/plugins/noderoster/client2/pom.xml index db645975eb..258d253c3d 100644 --- a/server/plugins/noderoster/client2/pom.xml +++ b/server/plugins/noderoster/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/db/pom.xml b/server/plugins/noderoster/db/pom.xml index e2ac9b3055..9c7edf0250 100644 --- a/server/plugins/noderoster/db/pom.xml +++ b/server/plugins/noderoster/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/impl/pom.xml b/server/plugins/noderoster/impl/pom.xml index 48c356ab44..f00f926ce7 100644 --- a/server/plugins/noderoster/impl/pom.xml +++ b/server/plugins/noderoster/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/pom.xml b/server/plugins/noderoster/pom.xml index 6a51b3880c..c54253a974 100644 --- a/server/plugins/noderoster/pom.xml +++ b/server/plugins/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/oidc/pom.xml b/server/plugins/oidc/pom.xml index 4ac688cd0a..e11542286e 100644 --- a/server/plugins/oidc/pom.xml +++ b/server/plugins/oidc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/oneops/pom.xml b/server/plugins/oneops/pom.xml index b0f20aa461..4a823f9c13 100644 --- a/server/plugins/oneops/pom.xml +++ b/server/plugins/oneops/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/pfed-sso/pom.xml b/server/plugins/pfed-sso/pom.xml index b4705ae44d..4dc62c4612 100644 --- a/server/plugins/pfed-sso/pom.xml +++ b/server/plugins/pfed-sso/pom.xml @@ -3,7 +3,7 @@ parent com.walmartlabs.concord.server.plugins - 2.4.0 + 2.4.1-SNAPSHOT 4.0.0 diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml index 672f3744fc..a7f5a9252e 100644 --- a/server/plugins/pom.xml +++ b/server/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/pom.xml b/server/pom.xml index 9b738fc14f..8a0890f026 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/queue-client/pom.xml b/server/queue-client/pom.xml index 8ab0d30777..de607402a9 100644 --- a/server/queue-client/pom.xml +++ b/server/queue-client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/server/sdk/pom.xml b/server/sdk/pom.xml index e17a8a2da0..38fae343d4 100644 --- a/server/sdk/pom.xml +++ b/server/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.0 + 2.4.1-SNAPSHOT ../pom.xml diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index a1b1380be3..9c71e2ff05 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord concord-targetplatform - 2.4.0 + 2.4.1-SNAPSHOT pom @@ -1298,7 +1298,7 @@ ${scm.connection} ${scm.connection} - 2.4.0 + HEAD From 21dc130bcbb998c36fb1d8467252e1344bda607f Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Thu, 30 Nov 2023 08:50:44 -0500 Subject: [PATCH 41/52] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 314b58a200..813ce7852c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change log -## [2.4.0] - Unreleased +## [2.4.0] - 2023-11-26 ### Added From 7f8ae351c5433808e73d98c40dc58a1dde940f75 Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Fri, 1 Dec 2023 19:59:03 +0100 Subject: [PATCH 42/52] server: resume event assert (#838) --- .../server/process/ProcessManager.java | 42 +++++++++++++++++-- .../server/process/ProcessResource.java | 4 +- .../pipelines/processors/FailProcessor.java | 5 ++- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessManager.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessManager.java index 5eb7b3ba26..84ca473ece 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessManager.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessManager.java @@ -53,10 +53,8 @@ import javax.inject.Inject; import javax.inject.Named; -import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import java.io.IOException; -import java.io.Serializable; +import java.io.*; import java.util.*; import java.util.stream.Collectors; @@ -312,6 +310,22 @@ public ProcessEntry assertProcess(UUID instanceId) { return p; } + public void assertResumeEvents(ProcessKey processKey, Set events) { + if (events.isEmpty()) { + throw new ConcordApplicationException("Empty resume events", Status.BAD_REQUEST); + } + + Set expectedEvents = getResumeEvents(processKey); + + Set unexpectedEvents = new HashSet<>(events); + unexpectedEvents.removeAll(expectedEvents); + + if (!unexpectedEvents.isEmpty()) { + logManager.warn(processKey, "Unexpected 'resume' events: {}, expected: {}", unexpectedEvents, expectedEvents); + throw new ConcordApplicationException("Unexpected 'resume' events: " + unexpectedEvents, Status.BAD_REQUEST); + } + } + public void updateExclusive(DSLContext tx, ProcessKey processKey, ExclusiveMode exclusive) { queueDao.updateExclusive(tx, processKey, exclusive); } @@ -419,6 +433,28 @@ public void auditLogOnCancelled(ProcessEntry p) { .log(); } + private Set getResumeEvents(ProcessKey processKey) { + String path = ProcessStateManager.path(Constants.Files.JOB_ATTACHMENTS_DIR_NAME, + Constants.Files.JOB_STATE_DIR_NAME, + Constants.Files.SUSPEND_MARKER_FILE_NAME); + + return stateManager.get(processKey, path, ProcessManager::deserialize) + .orElse(Set.of()); + } + + private static Optional> deserialize(InputStream in) { + Set result = new HashSet<>(); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) { + String line; + while ((line = reader.readLine()) != null) { + result.add(line); + } + return Optional.of(result); + } catch (IOException e) { + throw new RuntimeException("Error while deserializing a resume events: " + e.getMessage(), e); + } + } + private static List filterProcesses(List l, List expected) { return l.stream() .filter(r -> expected.contains(r.status())) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java index 7f12cfabc6..25da421db2 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessResource.java @@ -393,7 +393,9 @@ public ResumeProcessResponse resume(@PathParam("id") UUID instanceId, @QueryParam("saveAs") String saveAs, Map req) { - PartialProcessKey processKey = PartialProcessKey.from(instanceId); + ProcessKey processKey = assertProcessKey(instanceId); + + processManager.assertResumeEvents(processKey, Set.of(eventName)); if (saveAs != null && !saveAs.isEmpty() && req != null) { req = ConfigurationUtils.toNested(saveAs, req); diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/FailProcessor.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/FailProcessor.java index 5fb414265e..f97e7676d2 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/FailProcessor.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/process/pipelines/processors/FailProcessor.java @@ -54,10 +54,11 @@ public void process(Payload payload, Exception e) { return; } - logManager.error(processKey, "Process failed: {}", e.getMessage()); - if (!(e instanceof InvalidProcessStateException)) { + logManager.error(processKey, "Process failed: {}", e.getMessage()); queueManager.updateStatus(processKey, ProcessStatus.FAILED); + } else { + logManager.warn(processKey, "Invalid process state: {}", e.getMessage()); } } } From d710ef6980ed96091fb627e7db9b3580ceb2eae0 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Tue, 5 Dec 2023 20:27:50 -0500 Subject: [PATCH 43/52] concord-server: support priority annotation when binding jetty components (#841) --- .../concord/server/boot/HttpServer.java | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/boot/HttpServer.java b/server/impl/src/main/java/com/walmartlabs/concord/server/boot/HttpServer.java index 7d024bada5..e958ba99a6 100644 --- a/server/impl/src/main/java/com/walmartlabs/concord/server/boot/HttpServer.java +++ b/server/impl/src/main/java/com/walmartlabs/concord/server/boot/HttpServer.java @@ -32,6 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Priority; import javax.inject.Inject; import javax.servlet.*; import javax.servlet.annotation.WebFilter; @@ -39,6 +40,7 @@ import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import java.lang.management.ManagementFactory; +import java.util.Comparator; import java.util.EnumSet; import java.util.Set; @@ -101,21 +103,21 @@ public HttpServer(ServerConfiguration cfg, } // init all @WebListeners - for (ServletContextListener listener : contextListeners) { + contextListeners.stream().sorted(byPriority()).forEachOrdered(listener -> { WebListener annotation = listener.getClass().getAnnotation(WebListener.class); if (annotation == null) { - continue; + return; } log.info("Event listener -> {}", listener.getClass()); contextHandler.addEventListener(listener); - } + }); // init all @WebServlets - for (HttpServlet servlet : servlets) { + servlets.stream().sorted(byPriority()).forEachOrdered(servlet -> { WebServlet annotation = servlet.getClass().getAnnotation(WebServlet.class); if (annotation == null) { - continue; + return; } ServletHolder holder = new ServletHolder(servlet); @@ -123,54 +125,54 @@ public HttpServer(ServerConfiguration cfg, log.info("Servlet -> {} @ {}", servlet.getClass(), pathSpec); contextHandler.addServlet(holder, pathSpec); } - } + }); - for (ServletHolder holder : servletHolders) { + servletHolders.stream().sorted(byPriority()).forEachOrdered(holder -> { WebServlet annotation = holder.getClass().getAnnotation(WebServlet.class); if (annotation == null) { - continue; + return; } for (String pathSpec : annotation.value()) { log.info("Servlet -> {} @ {}", holder.getClass(), pathSpec); contextHandler.addServlet(holder, pathSpec); } - } + }); // init all @WebFilters - for (Filter filter : filters) { + filters.stream().sorted(byPriority()).forEachOrdered(filter -> { WebFilter annotation = filter.getClass().getAnnotation(WebFilter.class); if (annotation == null) { - continue; + return; } FilterHolder holder = new FilterHolder(filter); for (String pathSpec : annotation.value()) { - log.info("Servlet -> {} @ {}", filter.getClass(), pathSpec); + log.info("Filter -> {} @ {}", filter.getClass(), pathSpec); contextHandler.addFilter(holder, pathSpec, EnumSet.allOf(DispatcherType.class)); } - } + }); - for (FilterHolder holder : filterHolders) { + filterHolders.stream().sorted(byPriority()).forEachOrdered(holder -> { WebFilter annotation = holder.getClass().getAnnotation(WebFilter.class); if (annotation == null) { - continue; + return; } for (String pathSpec : annotation.value()) { log.info("Filter -> {} @ {}", holder.getClass(), pathSpec); - contextHandler.addFilter(holder, pathSpec, EnumSet.of(DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.INCLUDE, DispatcherType.ERROR)); + contextHandler.addFilter(holder, pathSpec, EnumSet.allOf(DispatcherType.class)); } - } + }); ContextHandlerCollection contextHandlerCollection = new ContextHandlerCollection(); contextHandlerCollection.addHandler(contextHandler); // additional handlers - for (ContextHandlerConfigurator configurator : contextHandlerConfigurators) { + contextHandlerConfigurators.stream().sorted(byPriority()).forEachOrdered(configurator -> { log.info("Configuring additional context handlers {}...", configurator.getClass()); configurator.configure(contextHandlerCollection); - } + }); StatisticsHandler statisticsHandler = new StatisticsHandler(); statisticsHandler.setHandler(contextHandlerCollection); @@ -202,4 +204,11 @@ private static RequestLog createRequestLog(ServerConfiguration cfg) { return new CustomRequestLog(writer, ServerConfiguration.ACCESS_LOG_FORMAT); } + + private static Comparator byPriority() { + return Comparator.comparingInt(o -> { + var a = o.getClass().getAnnotation(Priority.class); + return a != null ? a.value() : 0; + }); + } } From 733d88e372fbd5529c96d9b1900eb38878989d6a Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Thu, 7 Dec 2023 22:51:58 +0100 Subject: [PATCH 44/52] ansible-plugin: callback compatibility for Ansible 2.14 (#842) --- .../concord/it/server/AnsibleIT.java | 4 ++- .../it/server/ansibleVault/get_password.py | 2 +- .../get_all_password.py | 2 +- .../get_local_password.py | 2 +- .../ansible/callback/concord_protectdata.py | 28 ++++++++++++------- .../plugins/ansible/lib/task_policy.py | 8 +++++- 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/it/server/src/test/java/com/walmartlabs/concord/it/server/AnsibleIT.java b/it/server/src/test/java/com/walmartlabs/concord/it/server/AnsibleIT.java index fccd8dc785..b87cd4a44b 100644 --- a/it/server/src/test/java/com/walmartlabs/concord/it/server/AnsibleIT.java +++ b/it/server/src/test/java/com/walmartlabs/concord/it/server/AnsibleIT.java @@ -98,7 +98,9 @@ public void testVault() throws Exception { // --- ProcessEntry pir = waitForCompletion(processApi, spr.getInstanceId()); - assertEquals(ProcessEntry.StatusEnum.FINISHED, pir.getStatus()); + + assertEquals(ProcessEntry.StatusEnum.FINISHED, pir.getStatus(), + new String(getLog(pir.getLogFileName()))); // --- diff --git a/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVault/get_password.py b/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVault/get_password.py index 24f2a7760d..7064cc3efb 100755 --- a/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVault/get_password.py +++ b/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVault/get_password.py @@ -1,2 +1,2 @@ -#!/usr/bin/python +#!/usr/bin/python3 print("q1") diff --git a/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVaultMultiplePasswordFiles/get_all_password.py b/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVaultMultiplePasswordFiles/get_all_password.py index c1ce83c804..d3bb3236ad 100755 --- a/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVaultMultiplePasswordFiles/get_all_password.py +++ b/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVaultMultiplePasswordFiles/get_all_password.py @@ -1,2 +1,2 @@ -#!/usr/bin/python +#!/usr/bin/python3 print("q2") diff --git a/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVaultMultiplePasswordFiles/get_local_password.py b/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVaultMultiplePasswordFiles/get_local_password.py index 24f2a7760d..7064cc3efb 100755 --- a/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVaultMultiplePasswordFiles/get_local_password.py +++ b/it/server/src/test/resources/com/walmartlabs/concord/it/server/ansibleVaultMultiplePasswordFiles/get_local_password.py @@ -1,2 +1,2 @@ -#!/usr/bin/python +#!/usr/bin/python3 print("q1") diff --git a/plugins/tasks/ansible/src/main/resources/com/walmartlabs/concord/plugins/ansible/callback/concord_protectdata.py b/plugins/tasks/ansible/src/main/resources/com/walmartlabs/concord/plugins/ansible/callback/concord_protectdata.py index f68131acf9..1cf3787c60 100644 --- a/plugins/tasks/ansible/src/main/resources/com/walmartlabs/concord/plugins/ansible/callback/concord_protectdata.py +++ b/plugins/tasks/ansible/src/main/resources/com/walmartlabs/concord/plugins/ansible/callback/concord_protectdata.py @@ -2,7 +2,7 @@ __metaclass__ = type from ansible.plugins.callback.default import CallbackModule as CallbackModule_default -import collections +from collections.abc import Mapping def enc(s): # we shouldn't use `str` as the input string can contain non-ascii characters @@ -23,27 +23,35 @@ class CallbackModule(CallbackModule_default): def __init__(self): super(CallbackModule, self).__init__() + self.secret_list = ['password', 'credentials', 'secret', 'ansible_password', 'vaultpassword'] print("Log filter is enabled...") - + + def set_options(self, task_keys=None, var_options=None, direct=None): + super(CallbackModule, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct) + + self.set_option('display_ok_hosts', True) + self.set_option('show_per_host_start', False) + def hide_password(self, result): ret = {} for key, value in result.items(): - if isinstance(value, collections.Mapping): + if isinstance(value, Mapping): ret[key] = self.hide_password(value) elif any (x in enc(value).lower() for x in self.secret_list) or any (y in enc(key).lower() for y in self.secret_list): ret[key] = "******" - else: + else: ret[key] = value return ret def v2_playbook_on_task_start(self, task, is_conditional): print("TASK", "[",task.get_name(),"]" , "*************************************************************************") - task_args = task._attributes.get('args') - for k, v in task_args.items(): - if any(s in enc(v).lower() for s in self.secret_list): - print("*********** THIS TASK CONTAINS SENSITIVE INFORMATION. ENABLING NO_LOG ******************") - task.no_log = True - + if hasattr(task, 'args'): + task_args = getattr(task, 'args', None) + for k, v in task_args.items(): + if any(s in enc(v).lower() for s in self.secret_list): + print("*********** THIS TASK CONTAINS SENSITIVE INFORMATION. ENABLING NO_LOG ******************") + task.no_log = True + def _dump_results(self, result, indent=None, sort_keys=True, keep_invocation=False): return super(CallbackModule, self)._dump_results(self.hide_password(result), indent, sort_keys, keep_invocation) diff --git a/plugins/tasks/ansible/src/main/resources/com/walmartlabs/concord/plugins/ansible/lib/task_policy.py b/plugins/tasks/ansible/src/main/resources/com/walmartlabs/concord/plugins/ansible/lib/task_policy.py index 863ae7f254..3bd957898e 100644 --- a/plugins/tasks/ansible/src/main/resources/com/walmartlabs/concord/plugins/ansible/lib/task_policy.py +++ b/plugins/tasks/ansible/src/main/resources/com/walmartlabs/concord/plugins/ansible/lib/task_policy.py @@ -36,7 +36,13 @@ def is_deny(self, task): ansible_rules = self.policy_rules['ansible'] action = task.action - args = self._enrich_args(action, task._attributes.get('args')) + + if not hasattr(task, 'args'): + return False + + task_args = getattr(task, 'args', None) + + args = self._enrich_args(action, task_args) if 'allow' in ansible_rules: for r in ansible_rules['allow']: From 033b096bc5c802f152b30b10bbeaef0c61449b65 Mon Sep 17 00:00:00 2001 From: Ben Broadaway <4554569+benbroadaway@users.noreply.github.com> Date: Fri, 8 Dec 2023 11:05:54 -0600 Subject: [PATCH 45/52] docker-images: Upgrade default Ansible installation to 2.14 (#843) --- .github/workflows/build.yml | 3 -- README.md | 5 +- docker-images/agent/oss/centos/Dockerfile | 20 -------- docker-images/agent/pom.xml | 10 +--- docker-images/ansible/galaxy_requirements.yml | 28 +++++++++++ docker-images/ansible/oss/centos/Dockerfile | 45 ----------------- docker-images/ansible/oss/debian/Dockerfile | 40 +++++++++------- docker-images/ansible/pom.xml | 11 +---- docker-images/base/oss/centos/Dockerfile | 48 ------------------- docker-images/base/oss/debian/Dockerfile | 5 +- docker-images/base/pom.xml | 11 +---- 11 files changed, 59 insertions(+), 167 deletions(-) delete mode 100644 docker-images/agent/oss/centos/Dockerfile create mode 100644 docker-images/ansible/galaxy_requirements.yml delete mode 100644 docker-images/ansible/oss/centos/Dockerfile delete mode 100644 docker-images/base/oss/centos/Dockerfile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0ad5cc592..857ead849e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,6 +44,3 @@ jobs: env: SKIP_DOCKER_TESTS: "true" run: ./mvnw -s .github/settings.xml -B clean install -Pgha -Pdocker -Pit -Pjdk${{ matrix.jdk_version }} - - - name: Build with debian docker images - run: ./mvnw -s .github/settings.xml -C -B -f docker-images install -DskipTests -Pgha -Pdocker -Pdebian -Pjdk${{ matrix.jdk_version }} diff --git a/README.md b/README.md index 5aac69899c..0b77a4afad 100644 --- a/README.md +++ b/README.md @@ -39,14 +39,13 @@ cd concord Available Maven profiles: - `docker` - build Docker images; -- `debian` - build Debian-based Docker images instead of the default CentOS base; - `it` - run integration tests; -- ``jdk17-aarch64` - use a different JDK version for building artifacts and Docker images. +- `jdk17-aarch64` - use a different JDK version for building artifacts and Docker images. Profiles can be combined, e.g. ``` -./mvnw clean install -Pdocker -Pdebian -Pit -Pjdk17-aarch64 +./mvnw clean install -Pdocker -Pit -Pjdk17-aarch64 ``` ## Console diff --git a/docker-images/agent/oss/centos/Dockerfile b/docker-images/agent/oss/centos/Dockerfile deleted file mode 100644 index 43974cf7c7..0000000000 --- a/docker-images/agent/oss/centos/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -ARG docker_namespace=walmartlabs -ARG concord_version=latest - -FROM $docker_namespace/concord-ansible:$concord_version -LABEL maintainer="ibodrov@gmail.com" - -ENV DOCKER_HOST tcp://dind:2375 -ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt - -USER root - -RUN dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \ - dnf -y install docker-ce-cli uuid && \ - dnf clean all - -COPY --chown=concord:concord target/deps/ /home/concord/.m2/repository -ADD --chown=concord:concord target/dist/agent.tar.gz /opt/concord/agent/ - -USER concord -CMD ["bash", "/opt/concord/agent/start.sh"] diff --git a/docker-images/agent/pom.xml b/docker-images/agent/pom.xml index 64efc79a68..7b571fb941 100644 --- a/docker-images/agent/pom.xml +++ b/docker-images/agent/pom.xml @@ -15,7 +15,7 @@ ${docker.namespace}/concord-agent ${agent.image} - oss/centos/Dockerfile + oss/debian/Dockerfile false @@ -117,12 +117,4 @@ - - - debian - - oss/debian/Dockerfile - - - diff --git a/docker-images/ansible/galaxy_requirements.yml b/docker-images/ansible/galaxy_requirements.yml new file mode 100644 index 0000000000..eef53e024e --- /dev/null +++ b/docker-images/ansible/galaxy_requirements.yml @@ -0,0 +1,28 @@ +--- +collections: + - name: community.general + version: "7.0.1" + - name: ansible.windows + version: "1.14.0" + - name: ansible.posix + version: "1.5.4" + - name: community.windows + version: "1.13.0" + - name: kubernetes.core + version: "2.4.0" + - name: community.crypto + version: "2.13.1" + - name: community.mysql + version: "3.7.1" + - name: openstack.cloud + version: "2.1.0" + - name: community.postgresql + version: "2.4.1" + - name: community.docker + version: "3.4.6" + - name: "ansible.netcommon" + version: "5.1.1" + - name: "google.cloud" + version: "1.1.3" + - name: "chocolatey.chocolatey" + version: "1.4.0" diff --git a/docker-images/ansible/oss/centos/Dockerfile b/docker-images/ansible/oss/centos/Dockerfile deleted file mode 100644 index a2b4248696..0000000000 --- a/docker-images/ansible/oss/centos/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -ARG docker_namespace=walmartlabs -ARG concord_version=latest - -FROM $docker_namespace/concord-base:$concord_version -LABEL maintainer="ybrigadirenko@walmartlabs.com" - -RUN mkdir -p /workspace -WORKDIR /workspace - -RUN dnf -y install \ - gcc \ - gcc-c++ \ - krb5-devel \ - krb5-libs \ - krb5-workstation \ - libffi-devel \ - openssh-clients \ - openssl-devel \ - rsync \ - util-linux && \ - dnf clean all - - -ENV PATH=/usr/local/bin/concord_venv/bin:${PATH} -ENV VIRTUAL_ENV=/usr/local/bin/concord_venv - -RUN umask 0022 && \ - pip3 install --no-cache-dir --upgrade --ignore-installed \ - "cryptography<=3.3.1" \ - "ansible>=2.8.0,<2.9.0" \ - "Appium-Python-Client<1.0" \ - boto3 \ - botocore \ - bzt \ - docker \ - kerberos \ - openshift \ - pbr \ - pyvmomi \ - pywinrm>=0.4.1 \ - requests_kerberos \ - urllib3 \ - ujson - -USER concord diff --git a/docker-images/ansible/oss/debian/Dockerfile b/docker-images/ansible/oss/debian/Dockerfile index 4cd4d93bba..94131696f6 100644 --- a/docker-images/ansible/oss/debian/Dockerfile +++ b/docker-images/ansible/oss/debian/Dockerfile @@ -10,6 +10,8 @@ ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt RUN mkdir -p /workspace WORKDIR /workspace +COPY galaxy_requirements.yml galaxy_requirements.yml + RUN DEBIAN_FRONTEND=${DEBIAN_FRONTEND} apt-get -y install \ gcc \ g++ \ @@ -29,21 +31,27 @@ ENV VIRTUAL_ENV=/usr/local/bin/concord_venv RUN umask 0022 && \ pip3 install --no-cache-dir --upgrade --break-system-packages --ignore-installed \ - "cryptography<=3.3.1" \ - "ansible>=2.8.0,<2.9.0" \ - "Appium-Python-Client<1.0" \ - "openshift<=0.11.2" \ - "jinja2<=3.0.3" \ - boto3 \ - botocore \ - bzt \ - docker \ - kerberos \ - pbr \ - pyvmomi \ - "pywinrm>=0.4.1" \ - requests_kerberos \ - urllib3 \ - ujson + "cryptography<=3.4.8" \ + "ansible-core>=2.14,<2.15" \ + "Appium-Python-Client<1.0" \ + "openshift==0.13.2" \ + "jinja2<=3.1.0" \ + boto3 \ + botocore \ + bzt \ + docker \ + kerberos \ + kubernetes \ + pyyaml \ + pbr \ + pyvmomi \ + "pywinrm>=0.4.3" \ + requests_kerberos \ + urllib3 \ + ujson \ + virtualenv + +RUN umask 0022 && \ + ansible-galaxy collection install -p /usr/share/ansible/collections -r galaxy_requirements.yml USER concord diff --git a/docker-images/ansible/pom.xml b/docker-images/ansible/pom.xml index 8ed003d9e2..89dac162a9 100644 --- a/docker-images/ansible/pom.xml +++ b/docker-images/ansible/pom.xml @@ -15,7 +15,7 @@ ${docker.namespace}/concord-ansible ${ansible.image} - oss/centos/Dockerfile + oss/debian/Dockerfile false @@ -42,13 +42,4 @@ - - - - debian - - oss/debian/Dockerfile - - - diff --git a/docker-images/base/oss/centos/Dockerfile b/docker-images/base/oss/centos/Dockerfile deleted file mode 100644 index cfcae8d472..0000000000 --- a/docker-images/base/oss/centos/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -FROM library/centos:8 -LABEL maintainer="mtkunke@walmartlabs.com" - -ENTRYPOINT ["/usr/local/bin/concord_venv/bin/dumb-init", "--"] - -RUN echo 'fastestmirror=true' >> /etc/dnf/dnf.conf && \ - echo 'max_parallel_downloads=10' >> /etc/dnf/dnf.conf - -# update mirrors to point to vault.centos.org(older versions) -RUN cd /etc/yum.repos.d/ && \ - sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \ - sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* - -# requires Git >= 2.3 -RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial && \ - dnf -y upgrade && \ - dnf -y install \ - dnf-plugins-core \ - which \ - libtool-ltdl \ - strace \ - python3 \ - python3-virtualenv \ - git \ - coreutils-single \ - glibc-all-langpacks && \ - dnf clean all && \ - alternatives --set python /usr/bin/python3 && \ - alternatives --install /usr/bin/pip pip /usr/bin/pip2 0 - -ADD --chmod=755 ./get_jdk_url.sh /tmp/ -ARG jdk_version -ENV JDK_VERSION=${jdk_version} -ENV TARGETARCH=${TARGETARCH:-"amd64"} -RUN curl --location --output /tmp/jdk.tar.gz $(/tmp/get_jdk_url.sh) && \ - mkdir /opt/jdk && \ - tar xpf /tmp/jdk.tar.gz --strip 1 -C /opt/jdk && \ - rm /tmp/jdk.tar.gz - -ENV JAVA_HOME /opt/jdk -ENV PATH="${JAVA_HOME}/bin:${PATH}" -ENV LC_CTYPE en_US.UTF-8 -ENV LANG en_US.UTF-8 - -RUN virtualenv /usr/local/bin/concord_venv && \ - /usr/local/bin/concord_venv/bin/pip3 --no-cache-dir install dumb-init - -RUN groupadd -g 456 concord && useradd --no-log-init -u 456 -g concord -m -s /sbin/nologin concord diff --git a/docker-images/base/oss/debian/Dockerfile b/docker-images/base/oss/debian/Dockerfile index d21bfaec86..5374975127 100644 --- a/docker-images/base/oss/debian/Dockerfile +++ b/docker-images/base/oss/debian/Dockerfile @@ -7,10 +7,9 @@ ENTRYPOINT ["/usr/local/bin/concord_venv/bin/dumb-init", "--"] RUN apt-get update && \ apt-get -y upgrade && \ - apt-get -y install openssh-client libltdl-dev wget unzip diffutils strace git gdebi-core && \ - apt-get -y install python3 python3-pip coreutils locales locales-all curl && \ + apt-get -y install openssh-client libltdl-dev wget unzip diffutils strace git gdebi-core \ + python3 python3-pip python-is-python3 coreutils locales locales-all curl && \ apt-get clean && \ - ln -f -s /usr/bin/python3 /usr/bin/python && \ pip3 install --no-cache-dir --break-system-packages dumb-init virtualenv diff --git a/docker-images/base/pom.xml b/docker-images/base/pom.xml index 0f3793090d..2938f62b70 100644 --- a/docker-images/base/pom.xml +++ b/docker-images/base/pom.xml @@ -16,7 +16,7 @@ ${docker.namespace}/concord-base ${base.image} - oss/centos/Dockerfile + oss/debian/Dockerfile false @@ -34,13 +34,4 @@ - - - - debian - - oss/debian/Dockerfile - - - From 85730f100fc5bf7d68ba4cded8d561e3cee2a231 Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Sun, 10 Dec 2023 16:50:14 +0100 Subject: [PATCH 46/52] runtime-v2: allow "true|false" string in if expression (#844) --- .../runtime/v2/runner/vm/IfCommand.java | 22 +++++++++++++++++-- .../concord/runtime/v2/runner/MainTest.java | 12 ++++++++++ .../runner/ifExpressionAsString/concord.yml | 7 ++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/ifExpressionAsString/concord.yml diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/IfCommand.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/IfCommand.java index f1bf016034..ab24f826bc 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/IfCommand.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/IfCommand.java @@ -54,11 +54,29 @@ protected void execute(Runtime runtime, State state, ThreadId threadId) { EvalContext evalContext = ecf.global(ctx); ExpressionEvaluator ee = runtime.getService(ExpressionEvaluator.class); - Boolean ifResult = ee.eval(evalContext, expr, Boolean.class); - if (ifResult != null && ifResult) { + Object ifResult = ee.eval(evalContext, expr, Object.class); + if (isTrue(ifResult)) { frame.push(thenCommand); } else if (elseCommand != null) { frame.push(elseCommand); } } + + private static boolean isTrue(Object value) { + if (value == null) { + return false; + } + + if (value instanceof Boolean b) { + return b; + } else if (value instanceof String s) { + if ("true".equalsIgnoreCase(s)) { + return true; + } else if ("false".equalsIgnoreCase(s)) { + return false; + } + } + + throw new RuntimeException(String.format("Expected boolean value or string 'true'/'false', got: '%s', type: %s", value, value.getClass())); + } } diff --git a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java index 86ea2ac895..40d758066c 100644 --- a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java +++ b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java @@ -1609,6 +1609,18 @@ public void testExitFromSerialLoop() throws Exception { assertNoLog(log, ".*inner start: four.*"); } + @Test + public void testStringIfExpression() throws Exception { + deploy("ifExpressionAsString"); + + save(ProcessConfiguration.builder() + .putArguments("myVar", Collections.singletonMap("str", "true")) + .build()); + + byte[] log = run(); + assertLog(log, ".*it's true.*"); + } + private void deploy(String resource) throws URISyntaxException, IOException { Path src = Paths.get(MainTest.class.getResource(resource).toURI()); IOUtils.copy(src, workDir); diff --git a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/ifExpressionAsString/concord.yml b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/ifExpressionAsString/concord.yml new file mode 100644 index 0000000000..d238803d9c --- /dev/null +++ b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/ifExpressionAsString/concord.yml @@ -0,0 +1,7 @@ +flows: + default: + - if: "${myVar.str}" + then: + - log: "it's true" + else: + - log: "it's not true" From 74b78d90b79afdd7cfbf5ea5608f0f7254bc8934 Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Mon, 11 Dec 2023 00:47:31 +0100 Subject: [PATCH 47/52] Changelog 2.5.0 (#840) --- CHANGELOG.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 813ce7852c..cafc1bdbaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Change log +## [2.5.0] - Unreleased + +### Added + +- concord-server: support @Priority annotation when binding +Jetty components +([#841](https://github.com/walmartlabs/concord/pull/841)); + +### Changed + +- runtime-v2: allow "true|false" string in if expression +([#844](https://github.com/walmartlabs/concord/pull/844)); +- docker-images: Upgrade default Ansible installation to 2.14 +([#843](https://github.com/walmartlabs/concord/pull/843)); +- ansible-plugin: callback compatibility for Ansible 2.14 +([#842](https://github.com/walmartlabs/concord/pull/842)); +- concord-server: resume process now returns BAD_REQUEST +if no event found +([#838](https://github.com/walmartlabs/concord/pull/838)). + + + ## [2.4.0] - 2023-11-26 ### Added From ba87a8626b40c2c8041d6d0dfac7c46796fc5cb6 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Sun, 10 Dec 2023 19:16:11 -0500 Subject: [PATCH 48/52] [maven-release-plugin] prepare release 2.5.0 --- agent/pom.xml | 2 +- cli/pom.xml | 2 +- client/pom.xml | 2 +- client2/pom.xml | 2 +- common/pom.xml | 2 +- console2/pom.xml | 2 +- dependency-manager/pom.xml | 2 +- docker-images/agent/pom.xml | 2 +- docker-images/ansible/pom.xml | 2 +- docker-images/base/pom.xml | 2 +- docker-images/pom.xml | 2 +- docker-images/server/pom.xml | 2 +- forms/pom.xml | 2 +- imports/pom.xml | 2 +- it/common/pom.xml | 2 +- it/compat/pom.xml | 2 +- it/console/pom.xml | 2 +- it/pom.xml | 2 +- it/runtime-v1/pom.xml | 2 +- it/runtime-v2/pom.xml | 2 +- it/server/pom.xml | 2 +- it/tasks/broken-deps/pom.xml | 2 +- it/tasks/client1-test/pom.xml | 2 +- it/tasks/dependency-manager-test/pom.xml | 2 +- it/tasks/serialization-test/pom.xml | 2 +- it/tasks/suspend-test/pom.xml | 2 +- it/testing-server/pom.xml | 2 +- k8s/agent-operator/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/tasks/ansible/pom.xml | 2 +- plugins/tasks/concord/pom.xml | 2 +- plugins/tasks/crypto/pom.xml | 2 +- plugins/tasks/docker/pom.xml | 2 +- plugins/tasks/dynamic-tasks/pom.xml | 2 +- plugins/tasks/example/pom.xml | 2 +- plugins/tasks/files/pom.xml | 2 +- plugins/tasks/http/pom.xml | 2 +- plugins/tasks/kv/pom.xml | 2 +- plugins/tasks/locale/pom.xml | 2 +- plugins/tasks/lock/pom.xml | 2 +- plugins/tasks/log/pom.xml | 2 +- plugins/tasks/misc/pom.xml | 2 +- plugins/tasks/noderoster/pom.xml | 2 +- plugins/tasks/resource/pom.xml | 2 +- plugins/tasks/slack/pom.xml | 2 +- plugins/tasks/sleep/pom.xml | 2 +- plugins/tasks/smtp/pom.xml | 2 +- plugins/tasks/throw/pom.xml | 2 +- plugins/tasks/variables/pom.xml | 2 +- plugins/templates/ansible/pom.xml | 2 +- policy-engine/pom.xml | 2 +- pom.xml | 4 ++-- repository/pom.xml | 2 +- runtime/common/pom.xml | 2 +- runtime/loader/pom.xml | 2 +- runtime/v1/impl/pom.xml | 2 +- runtime/v1/pom.xml | 2 +- runtime/v1/project-model/pom.xml | 2 +- runtime/v2/model/pom.xml | 2 +- runtime/v2/pom.xml | 2 +- runtime/v2/runner/pom.xml | 2 +- runtime/v2/sdk/pom.xml | 2 +- runtime/v2/vm/pom.xml | 2 +- sdk/pom.xml | 2 +- server/db/pom.xml | 2 +- server/dist/pom.xml | 2 +- server/impl/pom.xml | 2 +- server/liquibase-ext/pom.xml | 2 +- server/plugins/ansible/client/pom.xml | 2 +- server/plugins/ansible/client2/pom.xml | 2 +- server/plugins/ansible/db/pom.xml | 2 +- server/plugins/ansible/impl/pom.xml | 2 +- server/plugins/ansible/pom.xml | 2 +- server/plugins/kafka-event-sink/pom.xml | 2 +- server/plugins/noderoster/client/pom.xml | 2 +- server/plugins/noderoster/client2/pom.xml | 2 +- server/plugins/noderoster/db/pom.xml | 2 +- server/plugins/noderoster/impl/pom.xml | 2 +- server/plugins/noderoster/pom.xml | 2 +- server/plugins/oidc/pom.xml | 2 +- server/plugins/oneops/pom.xml | 2 +- server/plugins/pfed-sso/pom.xml | 2 +- server/plugins/pom.xml | 2 +- server/pom.xml | 2 +- server/queue-client/pom.xml | 2 +- server/sdk/pom.xml | 2 +- targetplatform/pom.xml | 4 ++-- 87 files changed, 89 insertions(+), 89 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index 627eeef6e4..28a76cad63 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/cli/pom.xml b/cli/pom.xml index 003ca37bbb..f0d049c303 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index a731c5a46e..0260803b74 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/client2/pom.xml b/client2/pom.xml index 8c519e45c0..d3d9543508 100644 --- a/client2/pom.xml +++ b/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/common/pom.xml b/common/pom.xml index 7c588cd452..7bc6f8626c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/console2/pom.xml b/console2/pom.xml index 768f97d7f4..c3ffaa9787 100644 --- a/console2/pom.xml +++ b/console2/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/dependency-manager/pom.xml b/dependency-manager/pom.xml index b086e50dd1..9c3ee5db0e 100644 --- a/dependency-manager/pom.xml +++ b/dependency-manager/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/docker-images/agent/pom.xml b/docker-images/agent/pom.xml index 7b571fb941..de2fe07d00 100644 --- a/docker-images/agent/pom.xml +++ b/docker-images/agent/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/docker-images/ansible/pom.xml b/docker-images/ansible/pom.xml index 89dac162a9..a1c279354a 100644 --- a/docker-images/ansible/pom.xml +++ b/docker-images/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/docker-images/base/pom.xml b/docker-images/base/pom.xml index 2938f62b70..25df6286bc 100644 --- a/docker-images/base/pom.xml +++ b/docker-images/base/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.docker parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/docker-images/pom.xml b/docker-images/pom.xml index bb0e6b8a29..d9476ca344 100644 --- a/docker-images/pom.xml +++ b/docker-images/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/docker-images/server/pom.xml b/docker-images/server/pom.xml index 86a9a46808..46ac814055 100644 --- a/docker-images/server/pom.xml +++ b/docker-images/server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/forms/pom.xml b/forms/pom.xml index 96490597b3..bbfd500d93 100644 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/imports/pom.xml b/imports/pom.xml index c84b81778b..7223195e17 100644 --- a/imports/pom.xml +++ b/imports/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/it/common/pom.xml b/it/common/pom.xml index 1a0b8014bc..e0784218a7 100644 --- a/it/common/pom.xml +++ b/it/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/it/compat/pom.xml b/it/compat/pom.xml index 9695c211a6..ca9eb7a416 100644 --- a/it/compat/pom.xml +++ b/it/compat/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/it/console/pom.xml b/it/console/pom.xml index 8e04dc73c9..1eab6bcb41 100644 --- a/it/console/pom.xml +++ b/it/console/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/it/pom.xml b/it/pom.xml index c48533e608..5e99d88397 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/it/runtime-v1/pom.xml b/it/runtime-v1/pom.xml index cfdfe04841..32b8ec371b 100644 --- a/it/runtime-v1/pom.xml +++ b/it/runtime-v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/it/runtime-v2/pom.xml b/it/runtime-v2/pom.xml index ee332a5cf1..ef5b3f14a3 100644 --- a/it/runtime-v2/pom.xml +++ b/it/runtime-v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/it/server/pom.xml b/it/server/pom.xml index dd1b245b56..f1a540764a 100644 --- a/it/server/pom.xml +++ b/it/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/it/tasks/broken-deps/pom.xml b/it/tasks/broken-deps/pom.xml index 70d44f7188..0ead253755 100644 --- a/it/tasks/broken-deps/pom.xml +++ b/it/tasks/broken-deps/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/it/tasks/client1-test/pom.xml b/it/tasks/client1-test/pom.xml index 4e650614a5..54f54a99cb 100644 --- a/it/tasks/client1-test/pom.xml +++ b/it/tasks/client1-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/it/tasks/dependency-manager-test/pom.xml b/it/tasks/dependency-manager-test/pom.xml index bc80e6ca69..118afe5911 100644 --- a/it/tasks/dependency-manager-test/pom.xml +++ b/it/tasks/dependency-manager-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/it/tasks/serialization-test/pom.xml b/it/tasks/serialization-test/pom.xml index c0c5d843a5..d31ab96675 100644 --- a/it/tasks/serialization-test/pom.xml +++ b/it/tasks/serialization-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/it/tasks/suspend-test/pom.xml b/it/tasks/suspend-test/pom.xml index dc919fc0f1..7aea61eb7c 100644 --- a/it/tasks/suspend-test/pom.xml +++ b/it/tasks/suspend-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/it/testing-server/pom.xml b/it/testing-server/pom.xml index e5ec93ebc7..3d77f0940e 100644 --- a/it/testing-server/pom.xml +++ b/it/testing-server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/k8s/agent-operator/pom.xml b/k8s/agent-operator/pom.xml index 3c2de3b6e3..816418169f 100644 --- a/k8s/agent-operator/pom.xml +++ b/k8s/agent-operator/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 1130f9d1c7..4bd25ee453 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/plugins/tasks/ansible/pom.xml b/plugins/tasks/ansible/pom.xml index e10efeed57..5618eebb7d 100644 --- a/plugins/tasks/ansible/pom.xml +++ b/plugins/tasks/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/concord/pom.xml b/plugins/tasks/concord/pom.xml index 506862077e..afc606940e 100644 --- a/plugins/tasks/concord/pom.xml +++ b/plugins/tasks/concord/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/crypto/pom.xml b/plugins/tasks/crypto/pom.xml index 80d9df9093..ce96927905 100644 --- a/plugins/tasks/crypto/pom.xml +++ b/plugins/tasks/crypto/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/docker/pom.xml b/plugins/tasks/docker/pom.xml index 8c1eccb211..b036914321 100644 --- a/plugins/tasks/docker/pom.xml +++ b/plugins/tasks/docker/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/dynamic-tasks/pom.xml b/plugins/tasks/dynamic-tasks/pom.xml index 89e9af84f3..10ebe4128f 100644 --- a/plugins/tasks/dynamic-tasks/pom.xml +++ b/plugins/tasks/dynamic-tasks/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/example/pom.xml b/plugins/tasks/example/pom.xml index 0f17f45122..3acd29a51a 100644 --- a/plugins/tasks/example/pom.xml +++ b/plugins/tasks/example/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/files/pom.xml b/plugins/tasks/files/pom.xml index a8be11f89f..28f6049db9 100644 --- a/plugins/tasks/files/pom.xml +++ b/plugins/tasks/files/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/http/pom.xml b/plugins/tasks/http/pom.xml index a627cb6943..3f95323252 100644 --- a/plugins/tasks/http/pom.xml +++ b/plugins/tasks/http/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/kv/pom.xml b/plugins/tasks/kv/pom.xml index 8275dd88f7..b378972647 100644 --- a/plugins/tasks/kv/pom.xml +++ b/plugins/tasks/kv/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/locale/pom.xml b/plugins/tasks/locale/pom.xml index cccc526bbc..816f4a1efa 100644 --- a/plugins/tasks/locale/pom.xml +++ b/plugins/tasks/locale/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/lock/pom.xml b/plugins/tasks/lock/pom.xml index 57db6ebf5d..fe930764fd 100644 --- a/plugins/tasks/lock/pom.xml +++ b/plugins/tasks/lock/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/log/pom.xml b/plugins/tasks/log/pom.xml index f14e035f68..2f4c2b2f1d 100644 --- a/plugins/tasks/log/pom.xml +++ b/plugins/tasks/log/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/misc/pom.xml b/plugins/tasks/misc/pom.xml index 9d7da01861..e8d6bf8ad7 100644 --- a/plugins/tasks/misc/pom.xml +++ b/plugins/tasks/misc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/noderoster/pom.xml b/plugins/tasks/noderoster/pom.xml index 9790e91c47..3d4f61127a 100644 --- a/plugins/tasks/noderoster/pom.xml +++ b/plugins/tasks/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/resource/pom.xml b/plugins/tasks/resource/pom.xml index a7a4f867cc..00ec6a646a 100644 --- a/plugins/tasks/resource/pom.xml +++ b/plugins/tasks/resource/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/slack/pom.xml b/plugins/tasks/slack/pom.xml index 3aff85f6d4..62a1ca5856 100644 --- a/plugins/tasks/slack/pom.xml +++ b/plugins/tasks/slack/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/sleep/pom.xml b/plugins/tasks/sleep/pom.xml index 3f35bb1134..7aca9dbaf7 100644 --- a/plugins/tasks/sleep/pom.xml +++ b/plugins/tasks/sleep/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/smtp/pom.xml b/plugins/tasks/smtp/pom.xml index dfdde77b46..acea5266e4 100644 --- a/plugins/tasks/smtp/pom.xml +++ b/plugins/tasks/smtp/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/throw/pom.xml b/plugins/tasks/throw/pom.xml index 1574b820ee..3f15bb034e 100644 --- a/plugins/tasks/throw/pom.xml +++ b/plugins/tasks/throw/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/tasks/variables/pom.xml b/plugins/tasks/variables/pom.xml index f61d5ec7a5..760ced5ec4 100644 --- a/plugins/tasks/variables/pom.xml +++ b/plugins/tasks/variables/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/plugins/templates/ansible/pom.xml b/plugins/templates/ansible/pom.xml index ad2665bad0..de539b554d 100644 --- a/plugins/templates/ansible/pom.xml +++ b/plugins/templates/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/policy-engine/pom.xml b/policy-engine/pom.xml index 6f023fc954..cf29371272 100644 --- a/policy-engine/pom.xml +++ b/policy-engine/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 2e9993f940..5a07e77975 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 pom ${project.groupId}:${project.artifactId} @@ -426,7 +426,7 @@ ${scm.connection} ${scm.connection} - HEAD + 2.5.0 diff --git a/repository/pom.xml b/repository/pom.xml index 61bfc90a06..de51bfbcec 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/runtime/common/pom.xml b/runtime/common/pom.xml index ce3334a390..9532de6ad5 100644 --- a/runtime/common/pom.xml +++ b/runtime/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/runtime/loader/pom.xml b/runtime/loader/pom.xml index cd517c9a2c..f0b255c4fd 100644 --- a/runtime/loader/pom.xml +++ b/runtime/loader/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/runtime/v1/impl/pom.xml b/runtime/v1/impl/pom.xml index 60e2b1b18f..bca55ef2f2 100644 --- a/runtime/v1/impl/pom.xml +++ b/runtime/v1/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/runtime/v1/pom.xml b/runtime/v1/pom.xml index 8f5080fe44..e504f43062 100644 --- a/runtime/v1/pom.xml +++ b/runtime/v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/runtime/v1/project-model/pom.xml b/runtime/v1/project-model/pom.xml index f041383acf..b0a8621bd4 100644 --- a/runtime/v1/project-model/pom.xml +++ b/runtime/v1/project-model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/runtime/v2/model/pom.xml b/runtime/v2/model/pom.xml index 19588d51b9..42309f74d8 100644 --- a/runtime/v2/model/pom.xml +++ b/runtime/v2/model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/runtime/v2/pom.xml b/runtime/v2/pom.xml index c8b8628236..691e2107ea 100644 --- a/runtime/v2/pom.xml +++ b/runtime/v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../../pom.xml diff --git a/runtime/v2/runner/pom.xml b/runtime/v2/runner/pom.xml index 6e03b1464f..ab4a66542f 100644 --- a/runtime/v2/runner/pom.xml +++ b/runtime/v2/runner/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/runtime/v2/sdk/pom.xml b/runtime/v2/sdk/pom.xml index 3a580c51d1..3c19310119 100644 --- a/runtime/v2/sdk/pom.xml +++ b/runtime/v2/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/runtime/v2/vm/pom.xml b/runtime/v2/vm/pom.xml index 87b66188fa..675fdb503c 100644 --- a/runtime/v2/vm/pom.xml +++ b/runtime/v2/vm/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index dbf8a4bdf6..81b7a91721 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/db/pom.xml b/server/db/pom.xml index f48279ff7e..ba4a9c12a3 100644 --- a/server/db/pom.xml +++ b/server/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/dist/pom.xml b/server/dist/pom.xml index fbb9587987..8bde1b42a1 100644 --- a/server/dist/pom.xml +++ b/server/dist/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/impl/pom.xml b/server/impl/pom.xml index bf49cd7817..1e69ca0d2a 100644 --- a/server/impl/pom.xml +++ b/server/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/liquibase-ext/pom.xml b/server/liquibase-ext/pom.xml index 24ba82f209..1ea1ef7baf 100644 --- a/server/liquibase-ext/pom.xml +++ b/server/liquibase-ext/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/ansible/client/pom.xml b/server/plugins/ansible/client/pom.xml index f02cf62e08..4a7076169e 100644 --- a/server/plugins/ansible/client/pom.xml +++ b/server/plugins/ansible/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/ansible/client2/pom.xml b/server/plugins/ansible/client2/pom.xml index 04a2973905..7862124686 100644 --- a/server/plugins/ansible/client2/pom.xml +++ b/server/plugins/ansible/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/ansible/db/pom.xml b/server/plugins/ansible/db/pom.xml index 675939a470..3603828b76 100644 --- a/server/plugins/ansible/db/pom.xml +++ b/server/plugins/ansible/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/ansible/impl/pom.xml b/server/plugins/ansible/impl/pom.xml index d5941110e9..1684d02fe2 100644 --- a/server/plugins/ansible/impl/pom.xml +++ b/server/plugins/ansible/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/ansible/pom.xml b/server/plugins/ansible/pom.xml index 980a759d60..e1e3e3a2ff 100644 --- a/server/plugins/ansible/pom.xml +++ b/server/plugins/ansible/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/kafka-event-sink/pom.xml b/server/plugins/kafka-event-sink/pom.xml index 113508c1b7..b29adac8f4 100644 --- a/server/plugins/kafka-event-sink/pom.xml +++ b/server/plugins/kafka-event-sink/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/noderoster/client/pom.xml b/server/plugins/noderoster/client/pom.xml index 270e733e49..02df61dad8 100644 --- a/server/plugins/noderoster/client/pom.xml +++ b/server/plugins/noderoster/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/noderoster/client2/pom.xml b/server/plugins/noderoster/client2/pom.xml index 258d253c3d..dcfef6fc28 100644 --- a/server/plugins/noderoster/client2/pom.xml +++ b/server/plugins/noderoster/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/noderoster/db/pom.xml b/server/plugins/noderoster/db/pom.xml index 9c7edf0250..44e225e5e7 100644 --- a/server/plugins/noderoster/db/pom.xml +++ b/server/plugins/noderoster/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/noderoster/impl/pom.xml b/server/plugins/noderoster/impl/pom.xml index f00f926ce7..8e9eb69760 100644 --- a/server/plugins/noderoster/impl/pom.xml +++ b/server/plugins/noderoster/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/noderoster/pom.xml b/server/plugins/noderoster/pom.xml index c54253a974..d87d6de824 100644 --- a/server/plugins/noderoster/pom.xml +++ b/server/plugins/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/oidc/pom.xml b/server/plugins/oidc/pom.xml index e11542286e..7008a83889 100644 --- a/server/plugins/oidc/pom.xml +++ b/server/plugins/oidc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/oneops/pom.xml b/server/plugins/oneops/pom.xml index 4a823f9c13..b2f9cdd9c8 100644 --- a/server/plugins/oneops/pom.xml +++ b/server/plugins/oneops/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/plugins/pfed-sso/pom.xml b/server/plugins/pfed-sso/pom.xml index 4dc62c4612..7e7a7250b9 100644 --- a/server/plugins/pfed-sso/pom.xml +++ b/server/plugins/pfed-sso/pom.xml @@ -3,7 +3,7 @@ parent com.walmartlabs.concord.server.plugins - 2.4.1-SNAPSHOT + 2.5.0 4.0.0 diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml index a7f5a9252e..fd8e3ea3ca 100644 --- a/server/plugins/pom.xml +++ b/server/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/pom.xml b/server/pom.xml index 8a0890f026..7bae3f83ac 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/queue-client/pom.xml b/server/queue-client/pom.xml index de607402a9..ac05a448d4 100644 --- a/server/queue-client/pom.xml +++ b/server/queue-client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/server/sdk/pom.xml b/server/sdk/pom.xml index 38fae343d4..6701afc028 100644 --- a/server/sdk/pom.xml +++ b/server/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.4.1-SNAPSHOT + 2.5.0 ../pom.xml diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index 9c71e2ff05..be4dfb045b 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord concord-targetplatform - 2.4.1-SNAPSHOT + 2.5.0 pom @@ -1298,7 +1298,7 @@ ${scm.connection} ${scm.connection} - HEAD + 2.5.0 From 73d4725dec96d0b1879edcd5f00953ecb00640e6 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Sun, 10 Dec 2023 19:16:11 -0500 Subject: [PATCH 49/52] [maven-release-plugin] prepare for next development iteration --- agent/pom.xml | 2 +- cli/pom.xml | 2 +- client/pom.xml | 2 +- client2/pom.xml | 2 +- common/pom.xml | 2 +- console2/pom.xml | 2 +- dependency-manager/pom.xml | 2 +- docker-images/agent/pom.xml | 2 +- docker-images/ansible/pom.xml | 2 +- docker-images/base/pom.xml | 2 +- docker-images/pom.xml | 2 +- docker-images/server/pom.xml | 2 +- forms/pom.xml | 2 +- imports/pom.xml | 2 +- it/common/pom.xml | 2 +- it/compat/pom.xml | 2 +- it/console/pom.xml | 2 +- it/pom.xml | 2 +- it/runtime-v1/pom.xml | 2 +- it/runtime-v2/pom.xml | 2 +- it/server/pom.xml | 2 +- it/tasks/broken-deps/pom.xml | 2 +- it/tasks/client1-test/pom.xml | 2 +- it/tasks/dependency-manager-test/pom.xml | 2 +- it/tasks/serialization-test/pom.xml | 2 +- it/tasks/suspend-test/pom.xml | 2 +- it/testing-server/pom.xml | 2 +- k8s/agent-operator/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/tasks/ansible/pom.xml | 2 +- plugins/tasks/concord/pom.xml | 2 +- plugins/tasks/crypto/pom.xml | 2 +- plugins/tasks/docker/pom.xml | 2 +- plugins/tasks/dynamic-tasks/pom.xml | 2 +- plugins/tasks/example/pom.xml | 2 +- plugins/tasks/files/pom.xml | 2 +- plugins/tasks/http/pom.xml | 2 +- plugins/tasks/kv/pom.xml | 2 +- plugins/tasks/locale/pom.xml | 2 +- plugins/tasks/lock/pom.xml | 2 +- plugins/tasks/log/pom.xml | 2 +- plugins/tasks/misc/pom.xml | 2 +- plugins/tasks/noderoster/pom.xml | 2 +- plugins/tasks/resource/pom.xml | 2 +- plugins/tasks/slack/pom.xml | 2 +- plugins/tasks/sleep/pom.xml | 2 +- plugins/tasks/smtp/pom.xml | 2 +- plugins/tasks/throw/pom.xml | 2 +- plugins/tasks/variables/pom.xml | 2 +- plugins/templates/ansible/pom.xml | 2 +- policy-engine/pom.xml | 2 +- pom.xml | 4 ++-- repository/pom.xml | 2 +- runtime/common/pom.xml | 2 +- runtime/loader/pom.xml | 2 +- runtime/v1/impl/pom.xml | 2 +- runtime/v1/pom.xml | 2 +- runtime/v1/project-model/pom.xml | 2 +- runtime/v2/model/pom.xml | 2 +- runtime/v2/pom.xml | 2 +- runtime/v2/runner/pom.xml | 2 +- runtime/v2/sdk/pom.xml | 2 +- runtime/v2/vm/pom.xml | 2 +- sdk/pom.xml | 2 +- server/db/pom.xml | 2 +- server/dist/pom.xml | 2 +- server/impl/pom.xml | 2 +- server/liquibase-ext/pom.xml | 2 +- server/plugins/ansible/client/pom.xml | 2 +- server/plugins/ansible/client2/pom.xml | 2 +- server/plugins/ansible/db/pom.xml | 2 +- server/plugins/ansible/impl/pom.xml | 2 +- server/plugins/ansible/pom.xml | 2 +- server/plugins/kafka-event-sink/pom.xml | 2 +- server/plugins/noderoster/client/pom.xml | 2 +- server/plugins/noderoster/client2/pom.xml | 2 +- server/plugins/noderoster/db/pom.xml | 2 +- server/plugins/noderoster/impl/pom.xml | 2 +- server/plugins/noderoster/pom.xml | 2 +- server/plugins/oidc/pom.xml | 2 +- server/plugins/oneops/pom.xml | 2 +- server/plugins/pfed-sso/pom.xml | 2 +- server/plugins/pom.xml | 2 +- server/pom.xml | 2 +- server/queue-client/pom.xml | 2 +- server/sdk/pom.xml | 2 +- targetplatform/pom.xml | 4 ++-- 87 files changed, 89 insertions(+), 89 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index 28a76cad63..2b28147746 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/cli/pom.xml b/cli/pom.xml index f0d049c303..244c7e320b 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/client/pom.xml b/client/pom.xml index 0260803b74..a3c12448e2 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/client2/pom.xml b/client2/pom.xml index d3d9543508..983b440c44 100644 --- a/client2/pom.xml +++ b/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/common/pom.xml b/common/pom.xml index 7bc6f8626c..fa388b17ee 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/console2/pom.xml b/console2/pom.xml index c3ffaa9787..e6463b44de 100644 --- a/console2/pom.xml +++ b/console2/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/dependency-manager/pom.xml b/dependency-manager/pom.xml index 9c3ee5db0e..32e3a3e83b 100644 --- a/dependency-manager/pom.xml +++ b/dependency-manager/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/docker-images/agent/pom.xml b/docker-images/agent/pom.xml index de2fe07d00..b1e5a3521c 100644 --- a/docker-images/agent/pom.xml +++ b/docker-images/agent/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/docker-images/ansible/pom.xml b/docker-images/ansible/pom.xml index a1c279354a..5e24a89d7d 100644 --- a/docker-images/ansible/pom.xml +++ b/docker-images/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/docker-images/base/pom.xml b/docker-images/base/pom.xml index 25df6286bc..279070ea99 100644 --- a/docker-images/base/pom.xml +++ b/docker-images/base/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.docker parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/docker-images/pom.xml b/docker-images/pom.xml index d9476ca344..98ec2fe95a 100644 --- a/docker-images/pom.xml +++ b/docker-images/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/docker-images/server/pom.xml b/docker-images/server/pom.xml index 46ac814055..7e02c7f4b1 100644 --- a/docker-images/server/pom.xml +++ b/docker-images/server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.docker parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/forms/pom.xml b/forms/pom.xml index bbfd500d93..4fd029283b 100644 --- a/forms/pom.xml +++ b/forms/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/imports/pom.xml b/imports/pom.xml index 7223195e17..1c9941bab0 100644 --- a/imports/pom.xml +++ b/imports/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/it/common/pom.xml b/it/common/pom.xml index e0784218a7..b0f140cf92 100644 --- a/it/common/pom.xml +++ b/it/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/it/compat/pom.xml b/it/compat/pom.xml index ca9eb7a416..ff9240fca5 100644 --- a/it/compat/pom.xml +++ b/it/compat/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/it/console/pom.xml b/it/console/pom.xml index 1eab6bcb41..d77bd4e437 100644 --- a/it/console/pom.xml +++ b/it/console/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/it/pom.xml b/it/pom.xml index 5e99d88397..5a28cb8911 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/it/runtime-v1/pom.xml b/it/runtime-v1/pom.xml index 32b8ec371b..82037fc6a3 100644 --- a/it/runtime-v1/pom.xml +++ b/it/runtime-v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/it/runtime-v2/pom.xml b/it/runtime-v2/pom.xml index ef5b3f14a3..00433176a2 100644 --- a/it/runtime-v2/pom.xml +++ b/it/runtime-v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/it/server/pom.xml b/it/server/pom.xml index f1a540764a..74ca5c19e1 100644 --- a/it/server/pom.xml +++ b/it/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/it/tasks/broken-deps/pom.xml b/it/tasks/broken-deps/pom.xml index 0ead253755..f0bffdf254 100644 --- a/it/tasks/broken-deps/pom.xml +++ b/it/tasks/broken-deps/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/client1-test/pom.xml b/it/tasks/client1-test/pom.xml index 54f54a99cb..361290c5c2 100644 --- a/it/tasks/client1-test/pom.xml +++ b/it/tasks/client1-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/dependency-manager-test/pom.xml b/it/tasks/dependency-manager-test/pom.xml index 118afe5911..f276db38fb 100644 --- a/it/tasks/dependency-manager-test/pom.xml +++ b/it/tasks/dependency-manager-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/serialization-test/pom.xml b/it/tasks/serialization-test/pom.xml index d31ab96675..f111fb57d2 100644 --- a/it/tasks/serialization-test/pom.xml +++ b/it/tasks/serialization-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/it/tasks/suspend-test/pom.xml b/it/tasks/suspend-test/pom.xml index 7aea61eb7c..2987b916a8 100644 --- a/it/tasks/suspend-test/pom.xml +++ b/it/tasks/suspend-test/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/it/testing-server/pom.xml b/it/testing-server/pom.xml index 3d77f0940e..a5b6909cb6 100644 --- a/it/testing-server/pom.xml +++ b/it/testing-server/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.it parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/k8s/agent-operator/pom.xml b/k8s/agent-operator/pom.xml index 816418169f..a6a02dff01 100644 --- a/k8s/agent-operator/pom.xml +++ b/k8s/agent-operator/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 4bd25ee453..470e3f87e1 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/plugins/tasks/ansible/pom.xml b/plugins/tasks/ansible/pom.xml index 5618eebb7d..f44699cdf4 100644 --- a/plugins/tasks/ansible/pom.xml +++ b/plugins/tasks/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/concord/pom.xml b/plugins/tasks/concord/pom.xml index afc606940e..550db22cbf 100644 --- a/plugins/tasks/concord/pom.xml +++ b/plugins/tasks/concord/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/crypto/pom.xml b/plugins/tasks/crypto/pom.xml index ce96927905..b044413f22 100644 --- a/plugins/tasks/crypto/pom.xml +++ b/plugins/tasks/crypto/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/docker/pom.xml b/plugins/tasks/docker/pom.xml index b036914321..7435f2d02e 100644 --- a/plugins/tasks/docker/pom.xml +++ b/plugins/tasks/docker/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/dynamic-tasks/pom.xml b/plugins/tasks/dynamic-tasks/pom.xml index 10ebe4128f..994d456989 100644 --- a/plugins/tasks/dynamic-tasks/pom.xml +++ b/plugins/tasks/dynamic-tasks/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/example/pom.xml b/plugins/tasks/example/pom.xml index 3acd29a51a..7bcd2b5a8c 100644 --- a/plugins/tasks/example/pom.xml +++ b/plugins/tasks/example/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/files/pom.xml b/plugins/tasks/files/pom.xml index 28f6049db9..3c67d094d3 100644 --- a/plugins/tasks/files/pom.xml +++ b/plugins/tasks/files/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/http/pom.xml b/plugins/tasks/http/pom.xml index 3f95323252..e7bbd95a5f 100644 --- a/plugins/tasks/http/pom.xml +++ b/plugins/tasks/http/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/kv/pom.xml b/plugins/tasks/kv/pom.xml index b378972647..1d42d040c9 100644 --- a/plugins/tasks/kv/pom.xml +++ b/plugins/tasks/kv/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/locale/pom.xml b/plugins/tasks/locale/pom.xml index 816f4a1efa..1300860e10 100644 --- a/plugins/tasks/locale/pom.xml +++ b/plugins/tasks/locale/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/lock/pom.xml b/plugins/tasks/lock/pom.xml index fe930764fd..3384ab3850 100644 --- a/plugins/tasks/lock/pom.xml +++ b/plugins/tasks/lock/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/log/pom.xml b/plugins/tasks/log/pom.xml index 2f4c2b2f1d..38f87bce0d 100644 --- a/plugins/tasks/log/pom.xml +++ b/plugins/tasks/log/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/misc/pom.xml b/plugins/tasks/misc/pom.xml index e8d6bf8ad7..94d102f021 100644 --- a/plugins/tasks/misc/pom.xml +++ b/plugins/tasks/misc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/noderoster/pom.xml b/plugins/tasks/noderoster/pom.xml index 3d4f61127a..d2d04cdc31 100644 --- a/plugins/tasks/noderoster/pom.xml +++ b/plugins/tasks/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/resource/pom.xml b/plugins/tasks/resource/pom.xml index 00ec6a646a..935389b2ba 100644 --- a/plugins/tasks/resource/pom.xml +++ b/plugins/tasks/resource/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/slack/pom.xml b/plugins/tasks/slack/pom.xml index 62a1ca5856..aa7abc7a80 100644 --- a/plugins/tasks/slack/pom.xml +++ b/plugins/tasks/slack/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/sleep/pom.xml b/plugins/tasks/sleep/pom.xml index 7aca9dbaf7..0cfa9b7652 100644 --- a/plugins/tasks/sleep/pom.xml +++ b/plugins/tasks/sleep/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/smtp/pom.xml b/plugins/tasks/smtp/pom.xml index acea5266e4..827e74e4fb 100644 --- a/plugins/tasks/smtp/pom.xml +++ b/plugins/tasks/smtp/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/throw/pom.xml b/plugins/tasks/throw/pom.xml index 3f15bb034e..bcca2f35ec 100644 --- a/plugins/tasks/throw/pom.xml +++ b/plugins/tasks/throw/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/tasks/variables/pom.xml b/plugins/tasks/variables/pom.xml index 760ced5ec4..9e0495d862 100644 --- a/plugins/tasks/variables/pom.xml +++ b/plugins/tasks/variables/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/plugins/templates/ansible/pom.xml b/plugins/templates/ansible/pom.xml index de539b554d..84c9257285 100644 --- a/plugins/templates/ansible/pom.xml +++ b/plugins/templates/ansible/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.plugins.basic parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/policy-engine/pom.xml b/policy-engine/pom.xml index cf29371272..c03b3eec84 100644 --- a/policy-engine/pom.xml +++ b/policy-engine/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 5a07e77975..f4e0b21669 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} @@ -426,7 +426,7 @@ ${scm.connection} ${scm.connection} - 2.5.0 + HEAD diff --git a/repository/pom.xml b/repository/pom.xml index de51bfbcec..e4d0b7c4de 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/runtime/common/pom.xml b/runtime/common/pom.xml index 9532de6ad5..1b17daceb2 100644 --- a/runtime/common/pom.xml +++ b/runtime/common/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/runtime/loader/pom.xml b/runtime/loader/pom.xml index f0b255c4fd..724c7a5b02 100644 --- a/runtime/loader/pom.xml +++ b/runtime/loader/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v1/impl/pom.xml b/runtime/v1/impl/pom.xml index bca55ef2f2..8e2fb71505 100644 --- a/runtime/v1/impl/pom.xml +++ b/runtime/v1/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/runtime/v1/pom.xml b/runtime/v1/pom.xml index e504f43062..f232638480 100644 --- a/runtime/v1/pom.xml +++ b/runtime/v1/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v1/project-model/pom.xml b/runtime/v1/project-model/pom.xml index b0a8621bd4..bc6cd147e4 100644 --- a/runtime/v1/project-model/pom.xml +++ b/runtime/v1/project-model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v1 parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/model/pom.xml b/runtime/v2/model/pom.xml index 42309f74d8..0363203796 100644 --- a/runtime/v2/model/pom.xml +++ b/runtime/v2/model/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/pom.xml b/runtime/v2/pom.xml index 691e2107ea..1f6a5816c9 100644 --- a/runtime/v2/pom.xml +++ b/runtime/v2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../../pom.xml diff --git a/runtime/v2/runner/pom.xml b/runtime/v2/runner/pom.xml index ab4a66542f..ede9d4b001 100644 --- a/runtime/v2/runner/pom.xml +++ b/runtime/v2/runner/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/sdk/pom.xml b/runtime/v2/sdk/pom.xml index 3c19310119..a8b91480c9 100644 --- a/runtime/v2/sdk/pom.xml +++ b/runtime/v2/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/runtime/v2/vm/pom.xml b/runtime/v2/vm/pom.xml index 675fdb503c..01267249db 100644 --- a/runtime/v2/vm/pom.xml +++ b/runtime/v2/vm/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.runtime.v2 parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/sdk/pom.xml b/sdk/pom.xml index 81b7a91721..1c7b348845 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/db/pom.xml b/server/db/pom.xml index ba4a9c12a3..225c83c579 100644 --- a/server/db/pom.xml +++ b/server/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/dist/pom.xml b/server/dist/pom.xml index 8bde1b42a1..7fa30974ff 100644 --- a/server/dist/pom.xml +++ b/server/dist/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/impl/pom.xml b/server/impl/pom.xml index 1e69ca0d2a..71ee58d537 100644 --- a/server/impl/pom.xml +++ b/server/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/liquibase-ext/pom.xml b/server/liquibase-ext/pom.xml index 1ea1ef7baf..3e6f3a6f37 100644 --- a/server/liquibase-ext/pom.xml +++ b/server/liquibase-ext/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/client/pom.xml b/server/plugins/ansible/client/pom.xml index 4a7076169e..24dbd9fc1c 100644 --- a/server/plugins/ansible/client/pom.xml +++ b/server/plugins/ansible/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/client2/pom.xml b/server/plugins/ansible/client2/pom.xml index 7862124686..71cd55809a 100644 --- a/server/plugins/ansible/client2/pom.xml +++ b/server/plugins/ansible/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/db/pom.xml b/server/plugins/ansible/db/pom.xml index 3603828b76..2844fa4a7e 100644 --- a/server/plugins/ansible/db/pom.xml +++ b/server/plugins/ansible/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/impl/pom.xml b/server/plugins/ansible/impl/pom.xml index 1684d02fe2..72a3c07b24 100644 --- a/server/plugins/ansible/impl/pom.xml +++ b/server/plugins/ansible/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.ansible parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/ansible/pom.xml b/server/plugins/ansible/pom.xml index e1e3e3a2ff..93cf4b4b72 100644 --- a/server/plugins/ansible/pom.xml +++ b/server/plugins/ansible/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/kafka-event-sink/pom.xml b/server/plugins/kafka-event-sink/pom.xml index b29adac8f4..c1cfa3d9d8 100644 --- a/server/plugins/kafka-event-sink/pom.xml +++ b/server/plugins/kafka-event-sink/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/client/pom.xml b/server/plugins/noderoster/client/pom.xml index 02df61dad8..5279f58bb2 100644 --- a/server/plugins/noderoster/client/pom.xml +++ b/server/plugins/noderoster/client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/client2/pom.xml b/server/plugins/noderoster/client2/pom.xml index dcfef6fc28..0553c1222b 100644 --- a/server/plugins/noderoster/client2/pom.xml +++ b/server/plugins/noderoster/client2/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/db/pom.xml b/server/plugins/noderoster/db/pom.xml index 44e225e5e7..7a29e597da 100644 --- a/server/plugins/noderoster/db/pom.xml +++ b/server/plugins/noderoster/db/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/impl/pom.xml b/server/plugins/noderoster/impl/pom.xml index 8e9eb69760..31bb244596 100644 --- a/server/plugins/noderoster/impl/pom.xml +++ b/server/plugins/noderoster/impl/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins.noderoster parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/noderoster/pom.xml b/server/plugins/noderoster/pom.xml index d87d6de824..bc53d6cca7 100644 --- a/server/plugins/noderoster/pom.xml +++ b/server/plugins/noderoster/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server.plugins parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/oidc/pom.xml b/server/plugins/oidc/pom.xml index 7008a83889..e831a7e74f 100644 --- a/server/plugins/oidc/pom.xml +++ b/server/plugins/oidc/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/oneops/pom.xml b/server/plugins/oneops/pom.xml index b2f9cdd9c8..7b0c1118a7 100644 --- a/server/plugins/oneops/pom.xml +++ b/server/plugins/oneops/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server.plugins parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/plugins/pfed-sso/pom.xml b/server/plugins/pfed-sso/pom.xml index 7e7a7250b9..ba42ce55d3 100644 --- a/server/plugins/pfed-sso/pom.xml +++ b/server/plugins/pfed-sso/pom.xml @@ -3,7 +3,7 @@ parent com.walmartlabs.concord.server.plugins - 2.5.0 + 2.5.1-SNAPSHOT 4.0.0 diff --git a/server/plugins/pom.xml b/server/plugins/pom.xml index fd8e3ea3ca..7d09afe32d 100644 --- a/server/plugins/pom.xml +++ b/server/plugins/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord.server parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/pom.xml b/server/pom.xml index 7bae3f83ac..570f6722db 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/queue-client/pom.xml b/server/queue-client/pom.xml index ac05a448d4..8f3989ec4f 100644 --- a/server/queue-client/pom.xml +++ b/server/queue-client/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/server/sdk/pom.xml b/server/sdk/pom.xml index 6701afc028..f6ab8f8dc7 100644 --- a/server/sdk/pom.xml +++ b/server/sdk/pom.xml @@ -6,7 +6,7 @@ com.walmartlabs.concord.server parent - 2.5.0 + 2.5.1-SNAPSHOT ../pom.xml diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index be4dfb045b..f3906c542c 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -5,7 +5,7 @@ com.walmartlabs.concord concord-targetplatform - 2.5.0 + 2.5.1-SNAPSHOT pom @@ -1298,7 +1298,7 @@ ${scm.connection} ${scm.connection} - 2.5.0 + HEAD From 9eaa792e4dff0baeada0ca6d50414a1fad41205b Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Sun, 10 Dec 2023 20:10:08 -0500 Subject: [PATCH 50/52] update changelog --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cafc1bdbaa..8eb04f8723 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change log -## [2.5.0] - Unreleased +## [2.5.0] - 2023-12-10 ### Added @@ -19,7 +19,12 @@ Jetty components - concord-server: resume process now returns BAD_REQUEST if no event found ([#838](https://github.com/walmartlabs/concord/pull/838)). - + +### Breaking + +- docker-images: drop CentOS-based images, use Debian by default +([#843](https://github.com/walmartlabs/concord/pull/843). + ## [2.4.0] - 2023-11-26 From a5bda99f0aa5eeeac7bc1a20c19803184ca18ba5 Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Tue, 12 Dec 2023 17:46:28 +0100 Subject: [PATCH 51/52] runtime-v2: skip annotations for varargs (#845) --- .../v2/runner/tasks/TaskCallInterceptor.java | 2 +- .../runner/tasks/TaskCallInterceptorTest.java | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptorTest.java diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptor.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptor.java index 774dc4948a..1bedb43928 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptor.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptor.java @@ -124,7 +124,7 @@ default List> annotations() { static Method of(Object base, String methodName, List params) { List> annotations = Collections.emptyList(); java.lang.reflect.Method m = ReflectionUtil.findMethod(base.getClass(), methodName, null, params.toArray()); - if (m != null) { + if (m != null && !m.isVarArgs()) { annotations = Arrays.stream(m.getParameterAnnotations()) .map(Arrays::asList) .collect(Collectors.toList()); diff --git a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptorTest.java b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptorTest.java new file mode 100644 index 0000000000..4772fac1b5 --- /dev/null +++ b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/tasks/TaskCallInterceptorTest.java @@ -0,0 +1,29 @@ +package com.walmartlabs.concord.runtime.v2.runner.tasks; + +import org.junit.Test; + +import java.util.Arrays; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class TaskCallInterceptorTest { + + @Test + public void methodAnnotationsTest() { + Base base = new Base(); + String method = "varargs"; + List params = Arrays.asList("one", "two"); + + TaskCallInterceptor.Method m = TaskCallInterceptor.Method.of(base, method, params); + + assertEquals(0, m.annotations().size()); + } + + public static class Base { + + public void varargs(Object ... args) { + + } + } +} From d07ffc9f9c85b5d4abb55b35d66dda7915522f15 Mon Sep 17 00:00:00 2001 From: Yury Brigadirenko Date: Tue, 12 Dec 2023 23:29:13 +0100 Subject: [PATCH 52/52] client2: allow serialize collections (#846) --- .../concord/client2/impl/MultipartRequestBodyHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client2/src/main/java/com/walmartlabs/concord/client2/impl/MultipartRequestBodyHandler.java b/client2/src/main/java/com/walmartlabs/concord/client2/impl/MultipartRequestBodyHandler.java index a6c705d22e..4575c072a8 100644 --- a/client2/src/main/java/com/walmartlabs/concord/client2/impl/MultipartRequestBodyHandler.java +++ b/client2/src/main/java/com/walmartlabs/concord/client2/impl/MultipartRequestBodyHandler.java @@ -27,6 +27,7 @@ import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; +import java.util.Collection; import java.util.Map; import java.util.UUID; @@ -36,6 +37,7 @@ public static HttpEntity handle(ObjectMapper objectMapper, Map d return handle(new MultipartBuilder(), objectMapper, data); } + @SuppressWarnings("unchecked") public static HttpEntity handle(MultipartBuilder b, ObjectMapper objectMapper, Map data) { for (Map.Entry e : data.entrySet()) { String k = e.getKey(); @@ -60,6 +62,8 @@ public static HttpEntity handle(MultipartBuilder b, ObjectMapper objectMapper, M b.addFormDataPart(k, null, RequestBody.create(ContentType.TEXT_PLAIN, v.toString())); } else if (v instanceof String[]) { b.addFormDataPart(k, null, RequestBody.create(ContentType.TEXT_PLAIN, String.join(",", (String[]) v))); + } else if (v instanceof Collection) { + b.addFormDataPart(k, null, RequestBody.create(ContentType.TEXT_PLAIN, String.join(",", (Collection) v))); } else if (v instanceof UUID) { b.addFormDataPart(k, v.toString()); } else if (v instanceof Enum) {