From 8767f828a8f7accd927b1280882cc3da8ae94069 Mon Sep 17 00:00:00 2001 From: Alex May Date: Mon, 3 Jul 2023 11:04:20 -0600 Subject: [PATCH 1/3] Add new workflow metadata endpoint --- .gitignore | 3 + community-server/dependencies.lock | 118 +++++++++--------- dependencies.gradle | 2 +- event-queue/amqp/dependencies.lock | 16 +-- .../queue/amqp/util/AMQPConstants.java | 4 + .../queue/amqp/util/AMQPSettings.java | 1 - .../queue/amqp/AMQPObservableQueueTest.java | 6 +- event-queue/nats-streaming/dependencies.lock | 16 +-- event-queue/nats/dependencies.lock | 16 +-- .../nats/config/JetStreamProperties.java | 2 + .../azureblob-storage/dependencies.lock | 16 +-- .../dependencies.lock | 16 +-- .../config/PostgresPayloadConfiguration.java | 5 +- .../storage/PostgresPayloadStorage.java | 3 +- .../storage/PostgresPayloadStorageTest.java | 24 ++-- index/es7-persistence/dependencies.lock | 16 +-- .../config/ElasticSearchV7Configuration.java | 3 +- .../es7/dao/index/ElasticSearchRestDAOV7.java | 1 + .../dao/query/parser/internal/ConstValue.java | 1 + lock/zookeeper-lock/dependencies.lock | 8 +- metrics/dependencies.lock | 16 +-- .../common-persistence/dependencies.lock | 16 +-- .../mysql-persistence/dependencies.lock | 32 ++--- .../conductor/mysql/dao/MySQLMetadataDAO.java | 9 ++ .../mysql/dao/MySQLMetadataDAOTest.java | 41 ++++++ .../postgres-persistence/dependencies.lock | 32 ++--- .../postgres/dao/PostgresMetadataDAO.java | 9 ++ .../postgres/dao/PostgresMetadataDAOTest.java | 41 ++++++ task/kafka/dependencies.lock | 28 ++--- test-util/dependencies.lock | 64 +++++----- workflow-event-listener/dependencies.lock | 20 +-- 31 files changed, 348 insertions(+), 237 deletions(-) diff --git a/.gitignore b/.gitignore index f79fb99da..8cb9c6380 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,6 @@ lib/ build/ */build/ +# asdf tool versions +.tool-versions + diff --git a/community-server/dependencies.lock b/community-server/dependencies.lock index bcba10e4c..6f5327d89 100644 --- a/community-server/dependencies.lock +++ b/community-server/dependencies.lock @@ -9,34 +9,34 @@ "project": true }, "com.netflix.conductor:conductor-awss3-storage": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-awssqs-event-queue": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-azureblob-storage": { "project": true }, "com.netflix.conductor:conductor-cassandra-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-es7-persistence": { "project": true }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-http-task": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-json-jq-task": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-kafka": { "project": true @@ -57,16 +57,16 @@ "project": true }, "com.netflix.conductor:conductor-redis-concurrency-limit": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-lock": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-workflow-event-listener": { "project": true @@ -152,16 +152,16 @@ "project": true }, "com.netflix.conductor:conductor-awss3-storage": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-awssqs-event-queue": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-azureblob-storage": { "project": true }, "com.netflix.conductor:conductor-cassandra-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ @@ -177,7 +177,7 @@ "com.netflix.conductor:conductor-postgres-persistence", "com.netflix.conductor:conductor-workflow-event-listener" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "firstLevelTransitive": [ @@ -202,19 +202,19 @@ "com.netflix.conductor:conductor-workflow-event-listener", "com.netflix.conductor:conductor-zookeeper-lock" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-es7-persistence": { "project": true }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-http-task": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-json-jq-task": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-kafka": { "project": true @@ -235,16 +235,16 @@ "project": true }, "com.netflix.conductor:conductor-redis-concurrency-limit": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-lock": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-workflow-event-listener": { "project": true @@ -544,16 +544,16 @@ "project": true }, "com.netflix.conductor:conductor-awss3-storage": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-awssqs-event-queue": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-azureblob-storage": { "project": true }, "com.netflix.conductor:conductor-cassandra-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ @@ -569,7 +569,7 @@ "com.netflix.conductor:conductor-postgres-persistence", "com.netflix.conductor:conductor-workflow-event-listener" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "firstLevelTransitive": [ @@ -594,19 +594,19 @@ "com.netflix.conductor:conductor-workflow-event-listener", "com.netflix.conductor:conductor-zookeeper-lock" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-es7-persistence": { "project": true }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-http-task": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-json-jq-task": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-kafka": { "project": true @@ -627,16 +627,16 @@ "project": true }, "com.netflix.conductor:conductor-redis-concurrency-limit": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-lock": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-workflow-event-listener": { "project": true @@ -903,37 +903,37 @@ "project": true }, "com.netflix.conductor:conductor-awss3-storage": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-awssqs-event-queue": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-azureblob-storage": { "project": true }, "com.netflix.conductor:conductor-cassandra-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-es7-persistence": { "project": true }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-http-task": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-json-jq-task": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-kafka": { "project": true @@ -954,16 +954,16 @@ "project": true }, "com.netflix.conductor:conductor-redis-concurrency-limit": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-lock": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-workflow-event-listener": { "project": true @@ -1067,16 +1067,16 @@ "project": true }, "com.netflix.conductor:conductor-awss3-storage": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-awssqs-event-queue": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-azureblob-storage": { "project": true }, "com.netflix.conductor:conductor-cassandra-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ @@ -1092,7 +1092,7 @@ "com.netflix.conductor:conductor-postgres-persistence", "com.netflix.conductor:conductor-workflow-event-listener" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "firstLevelTransitive": [ @@ -1117,19 +1117,19 @@ "com.netflix.conductor:conductor-workflow-event-listener", "com.netflix.conductor:conductor-zookeeper-lock" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-es7-persistence": { "project": true }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-http-task": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-json-jq-task": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-kafka": { "project": true @@ -1150,16 +1150,16 @@ "project": true }, "com.netflix.conductor:conductor-redis-concurrency-limit": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-lock": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-workflow-event-listener": { "project": true diff --git a/dependencies.gradle b/dependencies.gradle index ce5b9dfb5..2e74b4259 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ * Common place to define all the version dependencies */ ext { - revConductor = '3.13.7' + revConductor = '3.14.0-SNAPSHOT' revActivation = '2.0.0' revAmqpClient = '5.13.0' revAwaitility = '3.1.6' diff --git a/event-queue/amqp/dependencies.lock b/event-queue/amqp/dependencies.lock index 505c70cc3..5caf45159 100644 --- a/event-queue/amqp/dependencies.lock +++ b/event-queue/amqp/dependencies.lock @@ -9,10 +9,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.rabbitmq:amqp-client": { "locked": "5.13.0" @@ -50,10 +50,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.rabbitmq:amqp-client": { "locked": "5.13.0" @@ -85,10 +85,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.rabbitmq:amqp-client": { "locked": "5.13.0" @@ -129,10 +129,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.rabbitmq:amqp-client": { "locked": "5.13.0" diff --git a/event-queue/amqp/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConstants.java b/event-queue/amqp/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConstants.java index 2d9cdaaa4..d87b36956 100644 --- a/event-queue/amqp/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConstants.java +++ b/event-queue/amqp/src/main/java/com/netflix/conductor/contribs/queue/amqp/util/AMQPConstants.java @@ -18,6 +18,7 @@ public class AMQPConstants { /** this when set will create a rabbitmq queue */ public static String AMQP_QUEUE_TYPE = "amqp_queue"; + /** this when set will create a rabbitmq exchange */ public static String AMQP_EXCHANGE_TYPE = "amqp_exchange"; @@ -53,6 +54,7 @@ public class AMQPConstants { *

{@see RabbitMQ}. */ public static boolean DEFAULT_AUTO_DELETE = false; + /** * default rabbitmq delivery mode This is a property of the message When set to 1 the will be * non persistent and 2 will be persistent {@see }. */ public static int DEFAULT_DELIVERY_MODE = 2; + /** * default rabbitmq delivery mode This is a property of the channel limit to get the number of * unacknowledged messages. {@see * 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 @@ -12,7 +11,6 @@ */ package com.netflix.conductor.postgres.storage; -import com.netflix.conductor.core.exception.NonTransientException; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.sql.Connection; @@ -30,6 +28,7 @@ import com.netflix.conductor.common.run.ExternalStorageLocation; import com.netflix.conductor.common.utils.ExternalPayloadStorage; +import com.netflix.conductor.core.exception.NonTransientException; import com.netflix.conductor.core.utils.IDGenerator; import com.netflix.conductor.postgres.config.PostgresPayloadProperties; diff --git a/external-payload-storage/postgres-external-storage/src/test/java/com/netflix/conductor/postgres/storage/PostgresPayloadStorageTest.java b/external-payload-storage/postgres-external-storage/src/test/java/com/netflix/conductor/postgres/storage/PostgresPayloadStorageTest.java index 8b34ff584..976eb5780 100644 --- a/external-payload-storage/postgres-external-storage/src/test/java/com/netflix/conductor/postgres/storage/PostgresPayloadStorageTest.java +++ b/external-payload-storage/postgres-external-storage/src/test/java/com/netflix/conductor/postgres/storage/PostgresPayloadStorageTest.java @@ -1,5 +1,4 @@ /* - * Copyright 2022 Netflix, 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 @@ -12,7 +11,6 @@ */ package com.netflix.conductor.postgres.storage; -import com.netflix.conductor.core.utils.IDGenerator; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -40,6 +38,7 @@ import com.netflix.conductor.common.config.TestObjectMapperConfiguration; import com.netflix.conductor.common.utils.ExternalPayloadStorage; +import com.netflix.conductor.core.utils.IDGenerator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -75,7 +74,8 @@ public void setup() { new PostgresPayloadStorage( testPostgres.getTestProperties(), testPostgres.getDataSource(), - new IDGenerator(), errorMessage); + new IDGenerator(), + errorMessage); } @Test @@ -268,12 +268,12 @@ private String getKey(String input) { private void assertCount(int expected) throws SQLException { try (PreparedStatement stmt = - testPostgres - .getDataSource() - .getConnection() - .prepareStatement( - "SELECT count(id) FROM external.external_payload"); - ResultSet rs = stmt.executeQuery()) { + testPostgres + .getDataSource() + .getConnection() + .prepareStatement( + "SELECT count(id) FROM external.external_payload"); + ResultSet rs = stmt.executeQuery()) { rs.next(); assertEquals(expected, rs.getInt(1)); } @@ -281,9 +281,9 @@ private void assertCount(int expected) throws SQLException { private String getCreatedOn(String key) throws SQLException { try (Connection conn = testPostgres.getDataSource().getConnection(); - PreparedStatement stmt = - conn.prepareStatement( - "SELECT created_on FROM external.external_payload WHERE id = ?")) { + PreparedStatement stmt = + conn.prepareStatement( + "SELECT created_on FROM external.external_payload WHERE id = ?")) { stmt.setString(1, key); try (ResultSet rs = stmt.executeQuery()) { rs.next(); diff --git a/index/es7-persistence/dependencies.lock b/index/es7-persistence/dependencies.lock index ba9b44d2a..a15000a6e 100644 --- a/index/es7-persistence/dependencies.lock +++ b/index/es7-persistence/dependencies.lock @@ -15,13 +15,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "commons-io:commons-io": { "locked": "2.7" @@ -77,7 +77,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true @@ -86,7 +86,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "commons-io:commons-io": { "locked": "2.7" @@ -153,13 +153,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "commons-io:commons-io": { "locked": "2.7" @@ -238,7 +238,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true @@ -247,7 +247,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "commons-io:commons-io": { "locked": "2.7" diff --git a/index/es7-persistence/src/main/java/com/netflix/conductor/es7/config/ElasticSearchV7Configuration.java b/index/es7-persistence/src/main/java/com/netflix/conductor/es7/config/ElasticSearchV7Configuration.java index 41c08acfd..a482cbe51 100644 --- a/index/es7-persistence/src/main/java/com/netflix/conductor/es7/config/ElasticSearchV7Configuration.java +++ b/index/es7-persistence/src/main/java/com/netflix/conductor/es7/config/ElasticSearchV7Configuration.java @@ -79,7 +79,8 @@ public RestClientBuilder restClientBuilder(ElasticSearchProperties properties) { return builder; } - @Primary // If you are including this project, it's assumed you want ES to be your indexing mechanism + @Primary // If you are including this project, it's assumed you want ES to be your indexing + // mechanism @Bean public IndexDAO es7IndexDAO( RestClientBuilder restClientBuilder, diff --git a/index/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/index/ElasticSearchRestDAOV7.java b/index/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/index/ElasticSearchRestDAOV7.java index 74a994bca..5afbf51d4 100644 --- a/index/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/index/ElasticSearchRestDAOV7.java +++ b/index/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/index/ElasticSearchRestDAOV7.java @@ -377,6 +377,7 @@ private void addIndex(String index, final String mappingFilename) throws IOExcep logger.info("Index '{}' already exists", index); } } + /** * Adds an index to elasticsearch if it does not exist. * diff --git a/index/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ConstValue.java b/index/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ConstValue.java index 86096d0db..3062ff82c 100644 --- a/index/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ConstValue.java +++ b/index/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/query/parser/internal/ConstValue.java @@ -83,6 +83,7 @@ private String readNumber(InputStream is) throws Exception { String numValue = sb.toString().trim(); return numValue; } + /** * Reads an escaped string * diff --git a/lock/zookeeper-lock/dependencies.lock b/lock/zookeeper-lock/dependencies.lock index 8f5d67235..343b40d14 100644 --- a/lock/zookeeper-lock/dependencies.lock +++ b/lock/zookeeper-lock/dependencies.lock @@ -6,7 +6,7 @@ }, "compileClasspath": { "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -35,7 +35,7 @@ }, "runtimeClasspath": { "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -61,7 +61,7 @@ }, "testCompileClasspath": { "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -99,7 +99,7 @@ }, "testRuntimeClasspath": { "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" diff --git a/metrics/dependencies.lock b/metrics/dependencies.lock index 6cac2b691..3ed871170 100644 --- a/metrics/dependencies.lock +++ b/metrics/dependencies.lock @@ -9,10 +9,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0" @@ -65,10 +65,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0" @@ -115,10 +115,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0" @@ -183,10 +183,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0" diff --git a/persistence/common-persistence/dependencies.lock b/persistence/common-persistence/dependencies.lock index f5137550f..4ea8895c4 100644 --- a/persistence/common-persistence/dependencies.lock +++ b/persistence/common-persistence/dependencies.lock @@ -12,10 +12,10 @@ "locked": "2.13.2.1" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -44,10 +44,10 @@ "locked": "2.13.2.1" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -76,10 +76,10 @@ "locked": "2.13.2.1" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -117,10 +117,10 @@ "locked": "2.13.2.1" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" diff --git a/persistence/mysql-persistence/dependencies.lock b/persistence/mysql-persistence/dependencies.lock index 8602ac0bb..749cff383 100644 --- a/persistence/mysql-persistence/dependencies.lock +++ b/persistence/mysql-persistence/dependencies.lock @@ -15,13 +15,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "mysql:mysql-connector-java": { "locked": "8.0.28" @@ -77,7 +77,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true @@ -86,7 +86,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "mysql:mysql-connector-java": { "locked": "8.0.28" @@ -145,25 +145,25 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-es6-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "mysql:mysql-connector-java": { "locked": "8.0.28" @@ -240,13 +240,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true @@ -255,16 +255,16 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-es6-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "mysql:mysql-connector-java": { "locked": "8.0.28" diff --git a/persistence/mysql-persistence/src/main/java/com/netflix/conductor/mysql/dao/MySQLMetadataDAO.java b/persistence/mysql-persistence/src/main/java/com/netflix/conductor/mysql/dao/MySQLMetadataDAO.java index f3502e793..d04046db1 100644 --- a/persistence/mysql-persistence/src/main/java/com/netflix/conductor/mysql/dao/MySQLMetadataDAO.java +++ b/persistence/mysql-persistence/src/main/java/com/netflix/conductor/mysql/dao/MySQLMetadataDAO.java @@ -193,6 +193,15 @@ public List getAllWorkflowDefs() { GET_ALL_WORKFLOW_DEF_QUERY, q -> q.executeAndFetch(WorkflowDef.class)); } + @Override + public List getAllWorkflowDefsLatestVersions() { + final String GET_ALL_WORKFLOW_DEF_LATEST_VERSIONS_QUERY = + "SELECT json_data FROM meta_workflow_def wd WHERE wd.version = (SELECT MAX(version) FROM meta_workflow_def wd2 WHERE wd2.name = wd.name)"; + return queryWithTransaction( + GET_ALL_WORKFLOW_DEF_LATEST_VERSIONS_QUERY, + q -> q.executeAndFetch(WorkflowDef.class)); + } + public List getAllLatest() { final String GET_ALL_LATEST_WORKFLOW_DEF_QUERY = "SELECT json_data FROM meta_workflow_def WHERE version = " + "latest_version"; diff --git a/persistence/mysql-persistence/src/test/java/com/netflix/conductor/mysql/dao/MySQLMetadataDAOTest.java b/persistence/mysql-persistence/src/test/java/com/netflix/conductor/mysql/dao/MySQLMetadataDAOTest.java index 773ac44c8..fc7b5cdc0 100644 --- a/persistence/mysql-persistence/src/test/java/com/netflix/conductor/mysql/dao/MySQLMetadataDAOTest.java +++ b/persistence/mysql-persistence/src/test/java/com/netflix/conductor/mysql/dao/MySQLMetadataDAOTest.java @@ -13,9 +13,11 @@ import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.UUID; +import java.util.function.Function; import java.util.stream.Collectors; import org.apache.commons.lang3.builder.EqualsBuilder; @@ -277,4 +279,43 @@ public void testEventHandlers() { assertNotNull(byEvents); assertEquals(1, byEvents.size()); } + + @Test + public void testGetAllWorkflowDefsLatestVersions() { + WorkflowDef def = new WorkflowDef(); + def.setName("test1"); + def.setVersion(1); + def.setDescription("description"); + def.setCreatedBy("unit_test"); + def.setCreateTime(1L); + def.setOwnerApp("ownerApp"); + def.setUpdatedBy("unit_test2"); + def.setUpdateTime(2L); + metadataDAO.createWorkflowDef(def); + + def.setName("test2"); + metadataDAO.createWorkflowDef(def); + def.setVersion(2); + metadataDAO.createWorkflowDef(def); + + def.setName("test3"); + def.setVersion(1); + metadataDAO.createWorkflowDef(def); + def.setVersion(2); + metadataDAO.createWorkflowDef(def); + def.setVersion(3); + metadataDAO.createWorkflowDef(def); + + // Placed the values in a map because they might not be stored in order of defName. + // To test, needed to confirm that the versions are correct for the definitions. + Map allMap = + metadataDAO.getAllWorkflowDefsLatestVersions().stream() + .collect(Collectors.toMap(WorkflowDef::getName, Function.identity())); + + assertNotNull(allMap); + assertEquals(3, allMap.size()); + assertEquals(1, allMap.get("test1").getVersion()); + assertEquals(2, allMap.get("test2").getVersion()); + assertEquals(3, allMap.get("test3").getVersion()); + } } diff --git a/persistence/postgres-persistence/dependencies.lock b/persistence/postgres-persistence/dependencies.lock index bb21a0e3b..cd79165b7 100644 --- a/persistence/postgres-persistence/dependencies.lock +++ b/persistence/postgres-persistence/dependencies.lock @@ -15,13 +15,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -77,7 +77,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true @@ -86,7 +86,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -145,25 +145,25 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-es6-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -240,13 +240,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common-persistence": { "project": true @@ -255,16 +255,16 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-es6-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ diff --git a/persistence/postgres-persistence/src/main/java/com/netflix/conductor/postgres/dao/PostgresMetadataDAO.java b/persistence/postgres-persistence/src/main/java/com/netflix/conductor/postgres/dao/PostgresMetadataDAO.java index 18c4c3be2..abb287d3b 100644 --- a/persistence/postgres-persistence/src/main/java/com/netflix/conductor/postgres/dao/PostgresMetadataDAO.java +++ b/persistence/postgres-persistence/src/main/java/com/netflix/conductor/postgres/dao/PostgresMetadataDAO.java @@ -189,6 +189,15 @@ public List getAllWorkflowDefs() { GET_ALL_WORKFLOW_DEF_QUERY, q -> q.executeAndFetch(WorkflowDef.class)); } + @Override + public List getAllWorkflowDefsLatestVersions() { + final String GET_ALL_WORKFLOW_DEF_LATEST_VERSIONS_QUERY = + "SELECT json_data FROM meta_workflow_def wd WHERE wd.version = (SELECT MAX(version) FROM meta_workflow_def wd2 WHERE wd2.name = wd.name)"; + return queryWithTransaction( + GET_ALL_WORKFLOW_DEF_LATEST_VERSIONS_QUERY, + q -> q.executeAndFetch(WorkflowDef.class)); + } + public List getAllLatest() { final String GET_ALL_LATEST_WORKFLOW_DEF_QUERY = "SELECT json_data FROM meta_workflow_def WHERE version = " + "latest_version"; diff --git a/persistence/postgres-persistence/src/test/java/com/netflix/conductor/postgres/dao/PostgresMetadataDAOTest.java b/persistence/postgres-persistence/src/test/java/com/netflix/conductor/postgres/dao/PostgresMetadataDAOTest.java index ba8e30df1..42b1f1166 100644 --- a/persistence/postgres-persistence/src/test/java/com/netflix/conductor/postgres/dao/PostgresMetadataDAOTest.java +++ b/persistence/postgres-persistence/src/test/java/com/netflix/conductor/postgres/dao/PostgresMetadataDAOTest.java @@ -13,9 +13,11 @@ import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.UUID; +import java.util.function.Function; import java.util.stream.Collectors; import org.apache.commons.lang3.builder.EqualsBuilder; @@ -280,4 +282,43 @@ public void testEventHandlers() { assertNotNull(byEvents); assertEquals(1, byEvents.size()); } + + @Test + public void testGetAllWorkflowDefsLatestVersions() { + WorkflowDef def = new WorkflowDef(); + def.setName("test1"); + def.setVersion(1); + def.setDescription("description"); + def.setCreatedBy("unit_test"); + def.setCreateTime(1L); + def.setOwnerApp("ownerApp"); + def.setUpdatedBy("unit_test2"); + def.setUpdateTime(2L); + metadataDAO.createWorkflowDef(def); + + def.setName("test2"); + metadataDAO.createWorkflowDef(def); + def.setVersion(2); + metadataDAO.createWorkflowDef(def); + + def.setName("test3"); + def.setVersion(1); + metadataDAO.createWorkflowDef(def); + def.setVersion(2); + metadataDAO.createWorkflowDef(def); + def.setVersion(3); + metadataDAO.createWorkflowDef(def); + + // Placed the values in a map because they might not be stored in order of defName. + // To test, needed to confirm that the versions are correct for the definitions. + Map allMap = + metadataDAO.getAllWorkflowDefsLatestVersions().stream() + .collect(Collectors.toMap(WorkflowDef::getName, Function.identity())); + + assertNotNull(allMap); + assertEquals(3, allMap.size()); + assertEquals(1, allMap.get("test1").getVersion()); + assertEquals(2, allMap.get("test2").getVersion()); + assertEquals(3, allMap.get("test3").getVersion()); + } } diff --git a/task/kafka/dependencies.lock b/task/kafka/dependencies.lock index 7e0e5ef30..f4075898e 100644 --- a/task/kafka/dependencies.lock +++ b/task/kafka/dependencies.lock @@ -9,10 +9,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "io.reactivex:rxjava": { "locked": "1.2.2" @@ -59,10 +59,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "io.reactivex:rxjava": { "locked": "1.2.2" @@ -97,10 +97,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-test-util": { "project": true @@ -189,49 +189,49 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-server": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-persistence": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-rest": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-server": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-test-util": { "project": true diff --git a/test-util/dependencies.lock b/test-util/dependencies.lock index b205a1f76..8edbd38e0 100644 --- a/test-util/dependencies.lock +++ b/test-util/dependencies.lock @@ -18,28 +18,28 @@ "locked": "3.13.0" }, "com.netflix.conductor:conductor-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.dyno-queues:dyno-queues-redis": { "locked": "2.0.20" @@ -110,28 +110,28 @@ "locked": "3.13.0" }, "com.netflix.conductor:conductor-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.dyno-queues:dyno-queues-redis": { "locked": "2.0.20" @@ -202,28 +202,28 @@ "locked": "3.13.0" }, "com.netflix.conductor:conductor-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.dyno-queues:dyno-queues-redis": { "locked": "2.0.20" @@ -306,28 +306,28 @@ "locked": "3.13.0" }, "com.netflix.conductor:conductor-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.dyno-queues:dyno-queues-redis": { "locked": "2.0.20" diff --git a/workflow-event-listener/dependencies.lock b/workflow-event-listener/dependencies.lock index 75e2c49c6..4d5f07cf6 100644 --- a/workflow-event-listener/dependencies.lock +++ b/workflow-event-listener/dependencies.lock @@ -6,10 +6,10 @@ }, "compileClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.1" @@ -35,10 +35,10 @@ }, "runtimeClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.1" @@ -58,13 +58,13 @@ }, "testCompileClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.1" @@ -105,13 +105,13 @@ }, "testRuntimeClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-core": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "com.netflix.conductor:conductor-server": { - "locked": "3.13.7" + "locked": "3.14.0-SNAPSHOT" }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.1" From 110e582805c96ee139af817a8a77b72aec05464d Mon Sep 17 00:00:00 2001 From: Alex May Date: Mon, 3 Jul 2023 11:40:32 -0600 Subject: [PATCH 2/3] Redo lock files and spotless --- community-server/dependencies.lock | 16 ++++++------- event-queue/amqp/dependencies.lock | 16 ++++++------- event-queue/nats-streaming/dependencies.lock | 16 ++++++------- event-queue/nats/dependencies.lock | 16 ++++++------- .../azureblob-storage/dependencies.lock | 16 ++++++------- .../dependencies.lock | 16 ++++++------- index/es7-persistence/dependencies.lock | 16 ++++++------- lock/zookeeper-lock/dependencies.lock | 8 +++---- metrics/dependencies.lock | 6 ++--- .../common-persistence/dependencies.lock | 16 ++++++------- .../mysql-persistence/dependencies.lock | 14 +++++------ .../postgres-persistence/dependencies.lock | 24 +++++++++---------- task/kafka/dependencies.lock | 10 ++++---- test-util/dependencies.lock | 6 ++--- workflow-event-listener/dependencies.lock | 20 ++++++++-------- 15 files changed, 108 insertions(+), 108 deletions(-) diff --git a/community-server/dependencies.lock b/community-server/dependencies.lock index 6f5327d89..153eb2107 100644 --- a/community-server/dependencies.lock +++ b/community-server/dependencies.lock @@ -9,34 +9,34 @@ "project": true }, "com.netflix.conductor:conductor-awss3-storage": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-awssqs-event-queue": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-azureblob-storage": { "project": true }, "com.netflix.conductor:conductor-cassandra-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-es7-persistence": { "project": true }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-http-task": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-json-jq-task": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-kafka": { "project": true @@ -57,7 +57,7 @@ "project": true }, "com.netflix.conductor:conductor-redis-concurrency-limit": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-lock": { "locked": "3.14.0-SNAPSHOT" diff --git a/event-queue/amqp/dependencies.lock b/event-queue/amqp/dependencies.lock index 5caf45159..505c70cc3 100644 --- a/event-queue/amqp/dependencies.lock +++ b/event-queue/amqp/dependencies.lock @@ -9,10 +9,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.rabbitmq:amqp-client": { "locked": "5.13.0" @@ -50,10 +50,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.rabbitmq:amqp-client": { "locked": "5.13.0" @@ -85,10 +85,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.rabbitmq:amqp-client": { "locked": "5.13.0" @@ -129,10 +129,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.rabbitmq:amqp-client": { "locked": "5.13.0" diff --git a/event-queue/nats-streaming/dependencies.lock b/event-queue/nats-streaming/dependencies.lock index a916452d9..8066cc680 100644 --- a/event-queue/nats-streaming/dependencies.lock +++ b/event-queue/nats-streaming/dependencies.lock @@ -9,10 +9,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "io.nats:java-nats-streaming": { "locked": "2.2.3" @@ -53,10 +53,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "io.nats:java-nats-streaming": { "locked": "2.2.3" @@ -91,10 +91,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "io.nats:java-nats-streaming": { "locked": "2.2.3" @@ -138,10 +138,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "io.nats:java-nats-streaming": { "locked": "2.2.3" diff --git a/event-queue/nats/dependencies.lock b/event-queue/nats/dependencies.lock index 3cfadf065..cf48339e2 100644 --- a/event-queue/nats/dependencies.lock +++ b/event-queue/nats/dependencies.lock @@ -9,10 +9,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "io.nats:jnats": { "locked": "2.15.6" @@ -50,10 +50,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "io.nats:jnats": { "locked": "2.15.6" @@ -85,10 +85,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "io.nats:jnats": { "locked": "2.15.6" @@ -129,10 +129,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "io.nats:jnats": { "locked": "2.15.6" diff --git a/external-payload-storage/azureblob-storage/dependencies.lock b/external-payload-storage/azureblob-storage/dependencies.lock index 1da56d825..57c268c89 100644 --- a/external-payload-storage/azureblob-storage/dependencies.lock +++ b/external-payload-storage/azureblob-storage/dependencies.lock @@ -9,10 +9,10 @@ "locked": "12.7.0" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -41,10 +41,10 @@ "locked": "12.7.0" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -70,10 +70,10 @@ "locked": "12.7.0" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -108,10 +108,10 @@ "locked": "12.7.0" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" diff --git a/external-payload-storage/postgres-external-storage/dependencies.lock b/external-payload-storage/postgres-external-storage/dependencies.lock index a282afed1..311cf3dc6 100644 --- a/external-payload-storage/postgres-external-storage/dependencies.lock +++ b/external-payload-storage/postgres-external-storage/dependencies.lock @@ -6,10 +6,10 @@ }, "compileClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "commons-codec:commons-codec": { "locked": "1.15" @@ -50,10 +50,10 @@ }, "runtimeClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "commons-codec:commons-codec": { "locked": "1.15" @@ -88,10 +88,10 @@ }, "testCompileClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "commons-codec:commons-codec": { "locked": "1.15" @@ -141,10 +141,10 @@ }, "testRuntimeClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "commons-codec:commons-codec": { "locked": "1.15" diff --git a/index/es7-persistence/dependencies.lock b/index/es7-persistence/dependencies.lock index a15000a6e..ba9b44d2a 100644 --- a/index/es7-persistence/dependencies.lock +++ b/index/es7-persistence/dependencies.lock @@ -15,13 +15,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "commons-io:commons-io": { "locked": "2.7" @@ -77,7 +77,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true @@ -86,7 +86,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "commons-io:commons-io": { "locked": "2.7" @@ -153,13 +153,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "commons-io:commons-io": { "locked": "2.7" @@ -238,7 +238,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true @@ -247,7 +247,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "commons-io:commons-io": { "locked": "2.7" diff --git a/lock/zookeeper-lock/dependencies.lock b/lock/zookeeper-lock/dependencies.lock index 343b40d14..8f5d67235 100644 --- a/lock/zookeeper-lock/dependencies.lock +++ b/lock/zookeeper-lock/dependencies.lock @@ -6,7 +6,7 @@ }, "compileClasspath": { "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -35,7 +35,7 @@ }, "runtimeClasspath": { "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -61,7 +61,7 @@ }, "testCompileClasspath": { "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -99,7 +99,7 @@ }, "testRuntimeClasspath": { "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" diff --git a/metrics/dependencies.lock b/metrics/dependencies.lock index 3ed871170..69efce919 100644 --- a/metrics/dependencies.lock +++ b/metrics/dependencies.lock @@ -9,10 +9,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0" @@ -65,7 +65,7 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { "locked": "3.14.0-SNAPSHOT" diff --git a/persistence/common-persistence/dependencies.lock b/persistence/common-persistence/dependencies.lock index 4ea8895c4..f5137550f 100644 --- a/persistence/common-persistence/dependencies.lock +++ b/persistence/common-persistence/dependencies.lock @@ -12,10 +12,10 @@ "locked": "2.13.2.1" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -44,10 +44,10 @@ "locked": "2.13.2.1" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -76,10 +76,10 @@ "locked": "2.13.2.1" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -117,10 +117,10 @@ "locked": "2.13.2.1" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" diff --git a/persistence/mysql-persistence/dependencies.lock b/persistence/mysql-persistence/dependencies.lock index 749cff383..4b2e7cb1d 100644 --- a/persistence/mysql-persistence/dependencies.lock +++ b/persistence/mysql-persistence/dependencies.lock @@ -15,13 +15,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "mysql:mysql-connector-java": { "locked": "8.0.28" @@ -77,7 +77,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true @@ -86,7 +86,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "mysql:mysql-connector-java": { "locked": "8.0.28" @@ -145,16 +145,16 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-es6-persistence": { "locked": "3.14.0-SNAPSHOT" diff --git a/persistence/postgres-persistence/dependencies.lock b/persistence/postgres-persistence/dependencies.lock index cd79165b7..678f2fcd3 100644 --- a/persistence/postgres-persistence/dependencies.lock +++ b/persistence/postgres-persistence/dependencies.lock @@ -15,13 +15,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -77,7 +77,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true @@ -86,7 +86,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ @@ -145,25 +145,25 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-es6-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -240,13 +240,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true diff --git a/task/kafka/dependencies.lock b/task/kafka/dependencies.lock index f4075898e..2ca938159 100644 --- a/task/kafka/dependencies.lock +++ b/task/kafka/dependencies.lock @@ -9,10 +9,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "io.reactivex:rxjava": { "locked": "1.2.2" @@ -59,10 +59,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "io.reactivex:rxjava": { "locked": "1.2.2" @@ -97,7 +97,7 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { "locked": "3.14.0-SNAPSHOT" diff --git a/test-util/dependencies.lock b/test-util/dependencies.lock index 8edbd38e0..351e7b866 100644 --- a/test-util/dependencies.lock +++ b/test-util/dependencies.lock @@ -18,13 +18,13 @@ "locked": "3.13.0" }, "com.netflix.conductor:conductor-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-client": { "locked": "3.14.0-SNAPSHOT" diff --git a/workflow-event-listener/dependencies.lock b/workflow-event-listener/dependencies.lock index 4d5f07cf6..75e2c49c6 100644 --- a/workflow-event-listener/dependencies.lock +++ b/workflow-event-listener/dependencies.lock @@ -6,10 +6,10 @@ }, "compileClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.1" @@ -35,10 +35,10 @@ }, "runtimeClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.1" @@ -58,13 +58,13 @@ }, "testCompileClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.1" @@ -105,13 +105,13 @@ }, "testRuntimeClasspath": { "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.logging.log4j:log4j-api": { "locked": "2.17.1" From b2984846cd33e12488e0744ef8787e963e8709f2 Mon Sep 17 00:00:00 2001 From: Alex May Date: Mon, 3 Jul 2023 11:53:23 -0600 Subject: [PATCH 3/3] more lock files redo --- community-server/dependencies.lock | 102 +++++++++--------- metrics/dependencies.lock | 10 +- .../mysql-persistence/dependencies.lock | 18 ++-- .../postgres-persistence/dependencies.lock | 8 +- task/kafka/dependencies.lock | 18 ++-- test-util/dependencies.lock | 58 +++++----- 6 files changed, 107 insertions(+), 107 deletions(-) diff --git a/community-server/dependencies.lock b/community-server/dependencies.lock index 153eb2107..bcba10e4c 100644 --- a/community-server/dependencies.lock +++ b/community-server/dependencies.lock @@ -60,13 +60,13 @@ "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-lock": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-workflow-event-listener": { "project": true @@ -152,16 +152,16 @@ "project": true }, "com.netflix.conductor:conductor-awss3-storage": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-awssqs-event-queue": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-azureblob-storage": { "project": true }, "com.netflix.conductor:conductor-cassandra-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ @@ -177,7 +177,7 @@ "com.netflix.conductor:conductor-postgres-persistence", "com.netflix.conductor:conductor-workflow-event-listener" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "firstLevelTransitive": [ @@ -202,19 +202,19 @@ "com.netflix.conductor:conductor-workflow-event-listener", "com.netflix.conductor:conductor-zookeeper-lock" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-es7-persistence": { "project": true }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-http-task": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-json-jq-task": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-kafka": { "project": true @@ -235,16 +235,16 @@ "project": true }, "com.netflix.conductor:conductor-redis-concurrency-limit": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-lock": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-workflow-event-listener": { "project": true @@ -544,16 +544,16 @@ "project": true }, "com.netflix.conductor:conductor-awss3-storage": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-awssqs-event-queue": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-azureblob-storage": { "project": true }, "com.netflix.conductor:conductor-cassandra-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ @@ -569,7 +569,7 @@ "com.netflix.conductor:conductor-postgres-persistence", "com.netflix.conductor:conductor-workflow-event-listener" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "firstLevelTransitive": [ @@ -594,19 +594,19 @@ "com.netflix.conductor:conductor-workflow-event-listener", "com.netflix.conductor:conductor-zookeeper-lock" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-es7-persistence": { "project": true }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-http-task": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-json-jq-task": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-kafka": { "project": true @@ -627,16 +627,16 @@ "project": true }, "com.netflix.conductor:conductor-redis-concurrency-limit": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-lock": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-workflow-event-listener": { "project": true @@ -903,37 +903,37 @@ "project": true }, "com.netflix.conductor:conductor-awss3-storage": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-awssqs-event-queue": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-azureblob-storage": { "project": true }, "com.netflix.conductor:conductor-cassandra-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-es7-persistence": { "project": true }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-http-task": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-json-jq-task": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-kafka": { "project": true @@ -954,16 +954,16 @@ "project": true }, "com.netflix.conductor:conductor-redis-concurrency-limit": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-lock": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-workflow-event-listener": { "project": true @@ -1067,16 +1067,16 @@ "project": true }, "com.netflix.conductor:conductor-awss3-storage": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-awssqs-event-queue": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-azureblob-storage": { "project": true }, "com.netflix.conductor:conductor-cassandra-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ @@ -1092,7 +1092,7 @@ "com.netflix.conductor:conductor-postgres-persistence", "com.netflix.conductor:conductor-workflow-event-listener" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "firstLevelTransitive": [ @@ -1117,19 +1117,19 @@ "com.netflix.conductor:conductor-workflow-event-listener", "com.netflix.conductor:conductor-zookeeper-lock" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-es7-persistence": { "project": true }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-http-task": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-json-jq-task": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-kafka": { "project": true @@ -1150,16 +1150,16 @@ "project": true }, "com.netflix.conductor:conductor-redis-concurrency-limit": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-lock": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-workflow-event-listener": { "project": true diff --git a/metrics/dependencies.lock b/metrics/dependencies.lock index 69efce919..6cac2b691 100644 --- a/metrics/dependencies.lock +++ b/metrics/dependencies.lock @@ -68,7 +68,7 @@ "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0" @@ -115,10 +115,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0" @@ -183,10 +183,10 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.spectator:spectator-reg-metrics3": { "locked": "0.122.0" diff --git a/persistence/mysql-persistence/dependencies.lock b/persistence/mysql-persistence/dependencies.lock index 4b2e7cb1d..8602ac0bb 100644 --- a/persistence/mysql-persistence/dependencies.lock +++ b/persistence/mysql-persistence/dependencies.lock @@ -157,13 +157,13 @@ "locked": "3.13.7" }, "com.netflix.conductor:conductor-es6-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "mysql:mysql-connector-java": { "locked": "8.0.28" @@ -240,13 +240,13 @@ "locked": "30.0-jre" }, "com.netflix.conductor:conductor-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common-persistence": { "project": true @@ -255,16 +255,16 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-es6-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "mysql:mysql-connector-java": { "locked": "8.0.28" diff --git a/persistence/postgres-persistence/dependencies.lock b/persistence/postgres-persistence/dependencies.lock index 678f2fcd3..bb21a0e3b 100644 --- a/persistence/postgres-persistence/dependencies.lock +++ b/persistence/postgres-persistence/dependencies.lock @@ -255,16 +255,16 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-common-persistence" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-es6-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "org.apache.commons:commons-lang3": { "firstLevelTransitive": [ diff --git a/task/kafka/dependencies.lock b/task/kafka/dependencies.lock index 2ca938159..7e0e5ef30 100644 --- a/task/kafka/dependencies.lock +++ b/task/kafka/dependencies.lock @@ -100,7 +100,7 @@ "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-test-util": { "project": true @@ -189,49 +189,49 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-client": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-server": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-persistence": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-rest": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-server": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-test-util" ], - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-test-util": { "project": true diff --git a/test-util/dependencies.lock b/test-util/dependencies.lock index 351e7b866..b205a1f76 100644 --- a/test-util/dependencies.lock +++ b/test-util/dependencies.lock @@ -27,19 +27,19 @@ "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.dyno-queues:dyno-queues-redis": { "locked": "2.0.20" @@ -110,28 +110,28 @@ "locked": "3.13.0" }, "com.netflix.conductor:conductor-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.dyno-queues:dyno-queues-redis": { "locked": "2.0.20" @@ -202,28 +202,28 @@ "locked": "3.13.0" }, "com.netflix.conductor:conductor-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.dyno-queues:dyno-queues-redis": { "locked": "2.0.20" @@ -306,28 +306,28 @@ "locked": "3.13.0" }, "com.netflix.conductor:conductor-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-common": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-core": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-client": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-grpc-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-redis-persistence": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-rest": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.conductor:conductor-server": { - "locked": "3.14.0-SNAPSHOT" + "locked": "3.13.7" }, "com.netflix.dyno-queues:dyno-queues-redis": { "locked": "2.0.20"