Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Update Core to 3.13.3 and update ES7 changes #174

Merged
merged 2 commits into from
Jan 31, 2023
Merged

Update Core to 3.13.3 and update ES7 changes #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7341839
Update Community to 3.13.3 and update ES7 changes
james-deee Jan 30, 2023
b928cba
Spotless
james-deee Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 71 additions & 71 deletions community-server/dependencies.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Common place to define all the version dependencies
*/
ext {
revConductor = '3.13.2'
revConductor = '3.13.3'
revActivation = '2.0.0'
revAmqpClient = '5.13.0'
revAwaitility = '3.1.6'
Expand Down
16 changes: 8 additions & 8 deletions event-queue/amqp/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.rabbitmq:amqp-client": {
"locked": "5.13.0"
Expand Down Expand Up @@ -50,10 +50,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.rabbitmq:amqp-client": {
"locked": "5.13.0"
Expand Down Expand Up @@ -85,10 +85,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.rabbitmq:amqp-client": {
"locked": "5.13.0"
Expand Down Expand Up @@ -129,10 +129,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.rabbitmq:amqp-client": {
"locked": "5.13.0"
Expand Down
16 changes: 8 additions & 8 deletions event-queue/nats-streaming/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"io.nats:java-nats-streaming": {
"locked": "2.2.3"
Expand Down Expand Up @@ -53,10 +53,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"io.nats:java-nats-streaming": {
"locked": "2.2.3"
Expand Down Expand Up @@ -91,10 +91,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"io.nats:java-nats-streaming": {
"locked": "2.2.3"
Expand Down Expand Up @@ -138,10 +138,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"io.nats:java-nats-streaming": {
"locked": "2.2.3"
Expand Down
3 changes: 2 additions & 1 deletion ...c/main/java/com/netflix/conductor/contribs/queue/stan/config/NATSStreamConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ public Map<TaskModel.Status, ObservableQueue> getQueues(
}

private String getQueueGroup(final NATSStreamProperties properties) {
if (properties.getDefaultQueueGroup() == null || properties.getDefaultQueueGroup().isBlank()) {
if (properties.getDefaultQueueGroup() == null
|| properties.getDefaultQueueGroup().isBlank()) {
return "";
}
return ":" + properties.getDefaultQueueGroup();
Expand Down
16 changes: 8 additions & 8 deletions event-queue/nats/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"io.nats:jnats": {
"locked": "2.15.6"
Expand Down Expand Up @@ -50,10 +50,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"io.nats:jnats": {
"locked": "2.15.6"
Expand Down Expand Up @@ -85,10 +85,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"io.nats:jnats": {
"locked": "2.15.6"
Expand Down Expand Up @@ -129,10 +129,10 @@
"locked": "30.0-jre"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"io.nats:jnats": {
"locked": "2.15.6"
Expand Down
5 changes: 4 additions & 1 deletion ...ats/src/main/java/com/netflix/conductor/contribs/queue/nats/JetStreamObservableQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ public class JetStreamObservableQueue implements ObservableQueue {
private final String queueGroup;

public JetStreamObservableQueue(
JetStreamProperties properties, String queueType, String queueUri, Scheduler scheduler) {
JetStreamProperties properties,
String queueType,
String queueUri,
Scheduler scheduler) {
LOG.debug("JSM obs queue create, qtype={}, quri={}", queueType, queueUri);

this.queueUri = queueUri;
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/com/netflix/conductor/contribs/queue/nats/config/JetStreamConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ public Map<TaskModel.Status, ObservableQueue> getQueues(
}

private String getQueueGroup(final JetStreamProperties properties) {
if (properties.getDefaultQueueGroup() == null || properties.getDefaultQueueGroup().isBlank()) {
if (properties.getDefaultQueueGroup() == null
|| properties.getDefaultQueueGroup().isBlank()) {
return "";
}
return ":" + properties.getDefaultQueueGroup();
Expand Down
16 changes: 8 additions & 8 deletions external-payload-storage/azureblob-storage/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"locked": "12.7.0"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"org.apache.commons:commons-lang3": {
"locked": "3.12.0"
Expand Down Expand Up @@ -41,10 +41,10 @@
"locked": "12.7.0"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"org.apache.commons:commons-lang3": {
"locked": "3.12.0"
Expand All @@ -70,10 +70,10 @@
"locked": "12.7.0"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"org.apache.commons:commons-lang3": {
"locked": "3.12.0"
Expand Down Expand Up @@ -108,10 +108,10 @@
"locked": "12.7.0"
},
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"org.apache.commons:commons-lang3": {
"locked": "3.12.0"
Expand Down
24 changes: 12 additions & 12 deletions external-payload-storage/postgres-external-storage/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
},
"compileClasspath": {
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.17.1"
Expand All @@ -33,7 +33,7 @@
"locked": "42.3.4"
},
"org.springdoc:springdoc-openapi-ui": {
"locked": "1.6.12"
"locked": "1.6.14"
},
"org.springframework.boot:spring-boot-starter": {
"locked": "2.6.7"
Expand All @@ -47,10 +47,10 @@
},
"runtimeClasspath": {
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.17.1"
Expand All @@ -74,18 +74,18 @@
"locked": "42.3.4"
},
"org.springdoc:springdoc-openapi-ui": {
"locked": "1.6.12"
"locked": "1.6.14"
},
"org.springframework.boot:spring-boot-starter-jdbc": {
"locked": "2.6.7"
}
},
"testCompileClasspath": {
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.17.1"
Expand All @@ -112,7 +112,7 @@
"locked": "42.3.4"
},
"org.springdoc:springdoc-openapi-ui": {
"locked": "1.6.12"
"locked": "1.6.14"
},
"org.springframework.boot:spring-boot-starter-jdbc": {
"locked": "2.6.7"
Expand All @@ -132,10 +132,10 @@
},
"testRuntimeClasspath": {
"com.netflix.conductor:conductor-common": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.13.2"
"locked": "3.13.3"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.17.1"
Expand All @@ -162,7 +162,7 @@
"locked": "42.3.4"
},
"org.springdoc:springdoc-openapi-ui": {
"locked": "1.6.12"
"locked": "1.6.14"
},
"org.springframework.boot:spring-boot-starter-jdbc": {
"locked": "2.6.7"
Expand Down
Loading