From f68e1c5b1b9c02f545c7767496e0416da00e757b Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Sun, 13 Dec 2020 22:08:34 -0800 Subject: [PATCH 01/25] fix: Update Spring Boot version to 2.4.1 --- activiti-cloud-build/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activiti-cloud-build/pom.xml b/activiti-cloud-build/pom.xml index a1effff4a59..9d73c0b55d9 100644 --- a/activiti-cloud-build/pom.xml +++ b/activiti-cloud-build/pom.xml @@ -199,7 +199,7 @@ 3.8.2 3.2.1 2.22.2 - 2.2.8.RELEASE + 2.4.1.RELEASE activiti-cloud-build-dependencies-parent From 3f2319dcb1d5948c0155c023aaabfa800a8f376d Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Sun, 13 Dec 2020 22:09:12 -0800 Subject: [PATCH 02/25] fix: Update Spring Cloud version to 2020.0.0-M6 --- .../activiti-cloud-build-dependencies-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml b/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml index 22fa348546b..6e8af549cdd 100755 --- a/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml +++ b/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml @@ -12,7 +12,7 @@ pom Activiti Cloud :: Dependencies Parent - Hoxton.SR5 + 2020.0.0-M6 1.14.2 From 42105115dbdacd6b704f69444997a7f5376542aa Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Sun, 13 Dec 2020 22:35:24 -0800 Subject: [PATCH 03/25] build: add Spring Milestones repository --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 6b79d41e2be..93ce58cd314 100644 --- a/pom.xml +++ b/pom.xml @@ -191,6 +191,11 @@ 2020 + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + central Central Repository From a72853ac782a51f36bd8b1ae2b520743f9edc837 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Sun, 13 Dec 2020 22:39:03 -0800 Subject: [PATCH 04/25] fix: use Spring Boot version 2.4.1 --- activiti-cloud-build/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activiti-cloud-build/pom.xml b/activiti-cloud-build/pom.xml index 9d73c0b55d9..9d71c252b37 100644 --- a/activiti-cloud-build/pom.xml +++ b/activiti-cloud-build/pom.xml @@ -199,7 +199,7 @@ 3.8.2 3.2.1 2.22.2 - 2.4.1.RELEASE + 2.4.1 activiti-cloud-build-dependencies-parent From be327677ff695a90f4ddae5f9ae8c5e3cbf5c895 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Sun, 13 Dec 2020 22:42:17 -0800 Subject: [PATCH 05/25] build: move Spring Milestones repository to build --- activiti-cloud-build/pom.xml | 5 +++++ pom.xml | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/activiti-cloud-build/pom.xml b/activiti-cloud-build/pom.xml index 9d71c252b37..11310a4ce17 100644 --- a/activiti-cloud-build/pom.xml +++ b/activiti-cloud-build/pom.xml @@ -205,6 +205,11 @@ activiti-cloud-build-dependencies-parent + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + central Central Repository diff --git a/pom.xml b/pom.xml index 93ce58cd314..6b79d41e2be 100644 --- a/pom.xml +++ b/pom.xml @@ -191,11 +191,6 @@ 2020 - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - central Central Repository From a957f4c533e91463323b2635d4939e009f07355f Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Sun, 13 Dec 2020 23:00:52 -0800 Subject: [PATCH 06/25] fix: update deprecated websocket client spec builder --- .../notifications/NotificationsSteps.java | 34 +++++++++------- .../starter/ActivitiGraphQLStarterIT.java | 39 +++++++++++-------- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/activiti-cloud-acceptance-tests/activiti-cloud-acceptance-tests-core/src/main/java/org/activiti/cloud/acc/core/steps/notifications/NotificationsSteps.java b/activiti-cloud-acceptance-tests/activiti-cloud-acceptance-tests-core/src/main/java/org/activiti/cloud/acc/core/steps/notifications/NotificationsSteps.java index ad32275a37c..2379af34e66 100644 --- a/activiti-cloud-acceptance-tests/activiti-cloud-acceptance-tests-core/src/main/java/org/activiti/cloud/acc/core/steps/notifications/NotificationsSteps.java +++ b/activiti-cloud-acceptance-tests/activiti-cloud-acceptance-tests-core/src/main/java/org/activiti/cloud/acc/core/steps/notifications/NotificationsSteps.java @@ -17,13 +17,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import java.time.Duration; import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Consumer; -import net.thucydides.core.annotations.Step; + import org.activiti.cloud.acc.core.config.RuntimeTestsConfigurationProperties; import org.activiti.cloud.acc.core.rest.RuntimeDirtyContextHandler; import org.activiti.cloud.acc.core.rest.feign.EnableRuntimeFeignContext; @@ -31,10 +29,15 @@ import org.reactivestreams.Subscription; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import net.thucydides.core.annotations.Step; import reactor.core.publisher.Mono; import reactor.core.publisher.ReplayProcessor; import reactor.netty.http.client.HttpClient; import reactor.netty.http.client.HttpClient.WebsocketSender; +import reactor.netty.http.client.WebsocketClientSpec; import reactor.test.StepVerifier; @EnableRuntimeFeignContext @@ -43,6 +46,9 @@ public class NotificationsSteps { private static final String GRAPHQL_WS = "graphql-ws"; private static final String AUTHORIZATION = "Authorization"; private static final Duration TIMEOUT = Duration.ofMillis(90000); + private static final WebsocketClientSpec graphqlWsClientSpec = WebsocketClientSpec.builder() + .protocols(GRAPHQL_WS) + .build(); @Autowired private RuntimeDirtyContextHandler dirtyContextHandler; @@ -56,30 +62,30 @@ public class NotificationsSteps { @Autowired private ObjectMapper objectMapper; - + @Step public void checkServicesHealth() { assertThat(baseService.isServiceUp()).isTrue(); } - + public String getRuntimeBundleServiceName() { return properties.getRuntimeBundleServiceName(); } @SuppressWarnings({"serial"}) @Step - public ReplayProcessor subscribe(String accessToken, - String query, - Map variables, + public ReplayProcessor subscribe(String accessToken, + String query, + Map variables, Consumer action) throws InterruptedException { ReplayProcessor data = ReplayProcessor.create(); WebsocketSender client = HttpClient.create() .wiretap(true) .headers(h -> h.add(AUTHORIZATION, "Bearer " + accessToken)) - .websocket(GRAPHQL_WS) + .websocket(graphqlWsClientSpec) .uri(properties.getGraphqlWsUrl()); - + Map json = new LinkedHashMap() {{ put("type", "start"); put("id", "1"); @@ -95,8 +101,8 @@ public ReplayProcessor subscribe(String accessToken, } catch (JsonProcessingException e) { throw new RuntimeException(e); } - - + + // handle start subscription client.handle((i, o) -> { o.sendString(Mono.just(startMessage)) @@ -125,11 +131,11 @@ public ReplayProcessor subscribe(String accessToken, @Step public void verifyData(ReplayProcessor data, String...messages) { - + StepVerifier.create(data) .expectNext(messages) .expectComplete() .verify(TIMEOUT); } - + } diff --git a/activiti-cloud-notifications-graphql-service/starter/src/test/java/org/activiti/cloud/notifications/graphql/starter/ActivitiGraphQLStarterIT.java b/activiti-cloud-notifications-graphql-service/starter/src/test/java/org/activiti/cloud/notifications/graphql/starter/ActivitiGraphQLStarterIT.java index d9e706fac3c..410fbb306ed 100644 --- a/activiti-cloud-notifications-graphql-service/starter/src/test/java/org/activiti/cloud/notifications/graphql/starter/ActivitiGraphQLStarterIT.java +++ b/activiti-cloud-notifications-graphql-service/starter/src/test/java/org/activiti/cloud/notifications/graphql/starter/ActivitiGraphQLStarterIT.java @@ -15,11 +15,8 @@ */ package org.activiti.cloud.notifications.graphql.starter; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.introproventures.graphql.jpa.query.web.GraphQLController.GraphQLQueryRequest; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -29,6 +26,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.TimeoutException; + import org.activiti.api.runtime.model.impl.BPMNMessageImpl; import org.activiti.api.runtime.model.impl.BPMNSignalImpl; import org.activiti.api.runtime.model.impl.BPMNTimerImpl; @@ -66,7 +64,6 @@ import org.activiti.cloud.services.test.containers.RabbitMQContainerApplicationInitializer; import org.activiti.cloud.services.test.identity.keycloak.interceptor.KeycloakTokenProducer; import org.apache.groovy.util.Maps; -import static org.assertj.core.api.Assertions.assertThat; import org.assertj.core.util.Arrays; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -84,11 +81,17 @@ import org.springframework.http.ResponseEntity; import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.introproventures.graphql.jpa.query.web.GraphQLController.GraphQLQueryRequest; import reactor.core.publisher.Mono; import reactor.core.publisher.ReplayProcessor; -import reactor.netty.NettyPipeline; import reactor.netty.http.client.HttpClient; import reactor.netty.http.client.HttpClient.WebsocketSender; +import reactor.netty.http.client.WebsocketClientSpec; import reactor.test.StepVerifier; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @@ -104,7 +107,9 @@ public class ActivitiGraphQLStarterIT { private static final String GRAPHQL_URL = "/graphql"; private static final Duration TIMEOUT = Duration.ofMillis(20000); - + private static final WebsocketClientSpec graphqlWsClientSpec = WebsocketClientSpec.builder() + .protocols(GRAPHQL_WS) + .build(); @LocalServerPort private String port; @@ -159,7 +164,7 @@ public void testGraphqlWsSubprotocolConnectionInitXAuthorizationSupported() thro HttpClient.create() .baseUrl("ws://localhost:" + port) .wiretap(true) - .websocket(GRAPHQL_WS) + .websocket(graphqlWsClientSpec) .uri(WS_GRAPHQL_URI) .handle((i, o) -> { o.sendString(Mono.just(initMessage)) @@ -255,7 +260,7 @@ public void testGraphqlWsSubprotocolServerStartStopSubscription() throws JsonPro .baseUrl("ws://localhost:" + port) .wiretap(true) .headers(h -> h.add(AUTHORIZATION, auth)) - .websocket(GRAPHQL_WS) + .websocket(graphqlWsClientSpec) .uri(WS_GRAPHQL_URI); // start subscription @@ -347,7 +352,7 @@ public void testGraphqlSubscriptionPROCESS_DEPLOYED() throws JsonProcessingExcep .baseUrl("ws://localhost:" + port) .wiretap(true) .headers(h -> h.add(AUTHORIZATION, auth)) - .websocket(GRAPHQL_WS) + .websocket(graphqlWsClientSpec) .uri(WS_GRAPHQL_URI); // start subscription @@ -441,7 +446,7 @@ public void testGraphqlSubscriptionSIGNAL_RECEIVED() throws JsonProcessingExcept .baseUrl("ws://localhost:" + port) .wiretap(true) .headers(h -> h.add(AUTHORIZATION, auth)) - .websocket(GRAPHQL_WS) + .websocket(graphqlWsClientSpec) .uri(WS_GRAPHQL_URI); // start subscription @@ -539,7 +544,7 @@ public void testGraphqlSubscriptionShouldFilterEmptyResults() throws JsonProcess .baseUrl("ws://localhost:" + port) .wiretap(true) .headers(h -> h.add(AUTHORIZATION, auth)) - .websocket(GRAPHQL_WS) + .websocket(graphqlWsClientSpec) .uri(WS_GRAPHQL_URI); // start subscription @@ -724,7 +729,7 @@ public void testGraphqlSubscriptionCloudBPMNTimerEvents() throws JsonProcessingE .baseUrl("ws://localhost:" + port) .wiretap(true) .headers(h -> h.add(AUTHORIZATION, auth)) - .websocket(GRAPHQL_WS) + .websocket(graphqlWsClientSpec) .uri(WS_GRAPHQL_URI); // start subscription @@ -890,7 +895,7 @@ public void testGraphqlSubscriptionCloudBPMNMessageEvents() throws JsonProcessin .baseUrl("ws://localhost:" + port) .wiretap(true) .headers(h -> h.add(AUTHORIZATION, auth)) - .websocket(GRAPHQL_WS) + .websocket(graphqlWsClientSpec) .uri(WS_GRAPHQL_URI); // start subscription @@ -968,7 +973,7 @@ public void testGraphqlWsSubprotocolServerWithUserRoleNotAuthorized() HttpClient.create() .baseUrl("ws://localhost:" + port) .wiretap(true) - .websocket(GRAPHQL_WS) + .websocket(graphqlWsClientSpec) .uri(WS_GRAPHQL_URI) .handle((i, o) -> { o.sendString(Mono.just(initMessage)) @@ -1004,7 +1009,7 @@ public void testGraphqlWsSubprotocolServerUnauthorized() throws JsonProcessingEx .baseUrl("ws://localhost:" + port) .wiretap(true) //.headers(h -> h.add(AUTHORIZATION, auth)) // Anonymous request - .websocket(GRAPHQL_WS) + .websocket(graphqlWsClientSpec) .uri(WS_GRAPHQL_URI) .handle((i, o) -> { o.sendString(Mono.just(initMessage)) From 887d530317de15d14658810fc7f1384d191059d1 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Sun, 13 Dec 2020 23:52:09 -0800 Subject: [PATCH 07/25] fix: remove SI deprecated classes from messages core module --- ...MessageConnectorAggregatorFactoryBean.java | 63 ++++--------------- 1 file changed, 12 insertions(+), 51 deletions(-) diff --git a/activiti-cloud-messages-service/services/core/src/main/java/org/activiti/cloud/services/messages/core/aggregator/MessageConnectorAggregatorFactoryBean.java b/activiti-cloud-messages-service/services/core/src/main/java/org/activiti/cloud/services/messages/core/aggregator/MessageConnectorAggregatorFactoryBean.java index 503b35da1a5..d8cabc1c63c 100644 --- a/activiti-cloud-messages-service/services/core/src/main/java/org/activiti/cloud/services/messages/core/aggregator/MessageConnectorAggregatorFactoryBean.java +++ b/activiti-cloud-messages-service/services/core/src/main/java/org/activiti/cloud/services/messages/core/aggregator/MessageConnectorAggregatorFactoryBean.java @@ -28,7 +28,6 @@ import org.springframework.integration.handler.advice.HandleMessageAdvice; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.support.locks.LockRegistry; -import org.springframework.integration.support.management.AbstractMessageHandlerMetrics; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.scheduling.TaskScheduler; @@ -49,12 +48,6 @@ public class MessageConnectorAggregatorFactoryBean extends AbstractSimpleMessage private String outputChannelName; - private AbstractMessageHandlerMetrics metrics; - - private Boolean statsEnabled; - - private Boolean countsEnabled; - private LockRegistry lockRegistry; private MessageGroupStore messageStore; @@ -80,32 +73,30 @@ public class MessageConnectorAggregatorFactoryBean extends AbstractSimpleMessage private Boolean expireGroupsUponTimeout; private Boolean completeGroupsWhenEmpty; - + private Boolean popSequence; private Boolean releaseLockBeforeSend; - + public MessageConnectorAggregatorFactoryBean() { super(); - + // defaults this.popSequence(false) .completeGroupsWhenEmpty(true) .expireGroupsUponCompletion(true) - .sendPartialResultOnExpiry(true) - .statsEnabled(true) - .countsEnabled(true); + .sendPartialResultOnExpiry(true); } public MessageConnectorAggregatorFactoryBean processorBean(MessageGroupProcessor processorBean) { this.processorBean = processorBean; - + return this; } public MessageConnectorAggregatorFactoryBean expireGroupsUponCompletion(Boolean expireGroupsUponCompletion) { this.expireGroupsUponCompletion = expireGroupsUponCompletion; - + return this; } @@ -127,24 +118,6 @@ public MessageConnectorAggregatorFactoryBean outputChannel(MessageChannel output return this; } - public MessageConnectorAggregatorFactoryBean metrics(AbstractMessageHandlerMetrics metrics) { - this.metrics = metrics; - - return this; - } - - public MessageConnectorAggregatorFactoryBean statsEnabled(Boolean statsEnabled) { - this.statsEnabled = statsEnabled; - - return this; - } - - public MessageConnectorAggregatorFactoryBean countsEnabled(Boolean countsEnabled) { - this.countsEnabled = countsEnabled; - - return this; - } - public MessageConnectorAggregatorFactoryBean lockRegistry(LockRegistry lockRegistry) { this.lockRegistry = lockRegistry; @@ -195,7 +168,7 @@ public MessageConnectorAggregatorFactoryBean discardChannel(MessageChannel disca public MessageConnectorAggregatorFactoryBean discardChannelName(String discardChannelName) { this.discardChannelName = discardChannelName; - + return this; } @@ -234,19 +207,19 @@ public MessageConnectorAggregatorFactoryBean completeGroupsWhenEmpty(Boolean com return this; } - + public MessageConnectorAggregatorFactoryBean beanFactory(BeanFactory beanFactory) { this.setBeanFactory(beanFactory); - + return this; } public MessageConnectorAggregatorFactoryBean adviceChain(List adviceChain) { this.setAdviceChain(Arrays.asList(adviceChain.toArray(new HandleMessageAdvice[] {}))); - + return this; } - + @Override protected MessageConnectorAggregator createHandler() { MessageConnectorAggregator aggregator = new MessageConnectorAggregator(this.processorBean); @@ -263,18 +236,6 @@ protected MessageConnectorAggregator createHandler() { aggregator.setOutputChannelName(this.outputChannelName); } - if (this.metrics != null) { - aggregator.configureMetrics(this.metrics); - } - - if (this.statsEnabled != null) { - aggregator.setStatsEnabled(this.statsEnabled); - } - - if (this.countsEnabled != null) { - aggregator.setCountsEnabled(this.countsEnabled); - } - if (this.lockRegistry != null) { aggregator.setLockRegistry(this.lockRegistry); } @@ -326,7 +287,7 @@ protected MessageConnectorAggregator createHandler() { if (this.completeGroupsWhenEmpty != null) { aggregator.setCompleteGroupsWhenEmpty(this.completeGroupsWhenEmpty); } - + if (this.popSequence != null) { aggregator.setPopSequence(this.popSequence); } From fb4a0854c5adc2fcea2cce08b4668b7c5c16dd89 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Mon, 14 Dec 2020 00:44:27 -0800 Subject: [PATCH 08/25] fix: update spring-integration-hazelcast to 3.0.0 --- activiti-cloud-messages-service/starters/hazelcast/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activiti-cloud-messages-service/starters/hazelcast/pom.xml b/activiti-cloud-messages-service/starters/hazelcast/pom.xml index 6f8e1913fc5..6f10805b2d5 100644 --- a/activiti-cloud-messages-service/starters/hazelcast/pom.xml +++ b/activiti-cloud-messages-service/starters/hazelcast/pom.xml @@ -9,8 +9,8 @@ activiti-cloud-starter-messages-hazelcast - 2.0.0.RELEASE - 3.12.4 + 3.0.0 + 4.0.3 From 206491713d191b0bc343ffa142980a343093f879 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Mon, 14 Dec 2020 00:45:48 -0800 Subject: [PATCH 09/25] fix: add io.projectreactor.addons:reactor-extra module events --- .../services/events/pom.xml | 4 ++++ .../consumer/EngineEventsConsumerAutoConfiguration.java | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/activiti-cloud-notifications-graphql-service/services/events/pom.xml b/activiti-cloud-notifications-graphql-service/services/events/pom.xml index 2e96897c389..38817a41d9e 100644 --- a/activiti-cloud-notifications-graphql-service/services/events/pom.xml +++ b/activiti-cloud-notifications-graphql-service/services/events/pom.xml @@ -74,5 +74,9 @@ spring-boot-configuration-processor true + + io.projectreactor.addons + reactor-extra + diff --git a/activiti-cloud-notifications-graphql-service/services/events/src/main/java/org/activiti/cloud/services/notifications/graphql/events/consumer/EngineEventsConsumerAutoConfiguration.java b/activiti-cloud-notifications-graphql-service/services/events/src/main/java/org/activiti/cloud/services/notifications/graphql/events/consumer/EngineEventsConsumerAutoConfiguration.java index 6ff513b2154..4e43f9098c0 100644 --- a/activiti-cloud-notifications-graphql-service/services/events/src/main/java/org/activiti/cloud/services/notifications/graphql/events/consumer/EngineEventsConsumerAutoConfiguration.java +++ b/activiti-cloud-notifications-graphql-service/services/events/src/main/java/org/activiti/cloud/services/notifications/graphql/events/consumer/EngineEventsConsumerAutoConfiguration.java @@ -39,7 +39,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.FluxSink; -import reactor.core.publisher.TopicProcessor; +import reactor.extra.processor.TopicProcessor; /** * Notification Gateway configuration that enables messaging channel bindings @@ -51,7 +51,7 @@ @EnableConfigurationProperties(EngineEventsConsumerProperties.class) @ConditionalOnProperty(name = "spring.activiti.cloud.services.notifications.graphql.events.enabled", matchIfMissing = true) @PropertySources({ - @PropertySource(value = "classpath:META-INF/graphql-events.properties"), + @PropertySource(value = "classpath:META-INF/graphql-events.properties"), @PropertySource(value = "classpath:graphql-events.properties", ignoreResourceNotFound = true) }) public class EngineEventsConsumerAutoConfiguration { @@ -88,7 +88,7 @@ public EngineEventsConsumerMessageHandler engineEventsMessageHandler(Transformer } } - + @Configuration public static class EngineEventsFluxProcessorConfiguration implements SmartLifecycle { @@ -142,5 +142,5 @@ public boolean isRunning() { return running; } } - + } From 4f1599414afd9a1d8c54e7b97cb2c94cf083754e Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Mon, 14 Dec 2020 00:46:37 -0800 Subject: [PATCH 10/25] fix: update removed api in graphql-ws --- ...hQLWebSocketMessageBrokerAutoConfiguration.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/activiti-cloud-notifications-graphql-service/services/ws/src/main/java/org/activiti/cloud/services/notifications/graphql/ws/config/GraphQLWebSocketMessageBrokerAutoConfiguration.java b/activiti-cloud-notifications-graphql-service/services/ws/src/main/java/org/activiti/cloud/services/notifications/graphql/ws/config/GraphQLWebSocketMessageBrokerAutoConfiguration.java index 3db83e3c1a6..c05eb80cf89 100644 --- a/activiti-cloud-notifications-graphql-service/services/ws/src/main/java/org/activiti/cloud/services/notifications/graphql/ws/config/GraphQLWebSocketMessageBrokerAutoConfiguration.java +++ b/activiti-cloud-notifications-graphql-service/services/ws/src/main/java/org/activiti/cloud/services/notifications/graphql/ws/config/GraphQLWebSocketMessageBrokerAutoConfiguration.java @@ -15,8 +15,6 @@ */ package org.activiti.cloud.services.notifications.graphql.ws.config; -import graphql.GraphQL; -import graphql.schema.GraphQLSchema; import org.activiti.cloud.services.notifications.graphql.ws.transport.GraphQLBrokerMessageHandler; import org.activiti.cloud.services.notifications.graphql.ws.transport.GraphQLBrokerSubProtocolHandler; import org.activiti.cloud.services.notifications.graphql.ws.transport.GraphQLSubscriptionExecutor; @@ -30,6 +28,7 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.simp.config.MessageBrokerRegistry; +import org.springframework.messaging.support.AbstractSubscribableChannel; import org.springframework.scheduling.TaskScheduler; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.config.annotation.DelegatingWebSocketMessageBrokerConfiguration; @@ -41,6 +40,9 @@ import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor; +import graphql.GraphQL; +import graphql.schema.GraphQLSchema; + @Configuration @ConditionalOnWebApplication @ConditionalOnClass({GraphQL.class, EnableWebSocketMessageBroker.class}) @@ -98,9 +100,11 @@ public MessageHandler graphQLBrokerMessageHandler(SubscribableChannel clientInbo @Override @Bean @ConditionalOnMissingBean(SubProtocolWebSocketHandler.class) - public WebSocketHandler subProtocolWebSocketHandler() { - SubProtocolWebSocketHandler handler = new SubProtocolWebSocketHandler(clientInboundChannel(), - clientOutboundChannel()); + public WebSocketHandler subProtocolWebSocketHandler(AbstractSubscribableChannel clientInboundChannel, + AbstractSubscribableChannel clientOutboundChannel) { + SubProtocolWebSocketHandler handler = new SubProtocolWebSocketHandler(clientInboundChannel, + clientOutboundChannel); + handler.addProtocolHandler(graphQLBrokerSubProtocolHandler()); handler.setDefaultProtocolHandler(graphQLBrokerSubProtocolHandler()); From 3fdd20d65702e8ac942b910829cf84079e2de74a Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Mon, 14 Dec 2020 00:47:04 -0800 Subject: [PATCH 11/25] fix: update removed api in graphq-starter test --- .../test/EngineEventsMessageProducer.java | 706 +++++++++--------- 1 file changed, 354 insertions(+), 352 deletions(-) diff --git a/activiti-cloud-notifications-graphql-service/starter/src/test/java/org/activiti/cloud/notifications/graphql/test/EngineEventsMessageProducer.java b/activiti-cloud-notifications-graphql-service/starter/src/test/java/org/activiti/cloud/notifications/graphql/test/EngineEventsMessageProducer.java index f1a7ce17eb6..d07b60dd4f0 100644 --- a/activiti-cloud-notifications-graphql-service/starter/src/test/java/org/activiti/cloud/notifications/graphql/test/EngineEventsMessageProducer.java +++ b/activiti-cloud-notifications-graphql-service/starter/src/test/java/org/activiti/cloud/notifications/graphql/test/EngineEventsMessageProducer.java @@ -15,8 +15,12 @@ */ package org.activiti.cloud.notifications.graphql.test; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.time.Duration; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.stream.annotation.EnableBinding; @@ -25,37 +29,35 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.MessageBuilder; import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import reactor.core.Disposable; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; import reactor.util.context.Context; - -import java.io.IOException; -import java.time.Duration; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; +import reactor.util.retry.RetrySpec; @Component @EnableBinding(EngineEventsMessageProducer.EngineEvents.class) public class EngineEventsMessageProducer implements SmartLifecycle { - + public static final String ENGINE_EVENTS_PRODUCER = "engineEventsOutput"; - - + + private static final Logger logger = LoggerFactory.getLogger(EngineEventsMessageProducer.class); - + public interface EngineEvents { @Output(ENGINE_EVENTS_PRODUCER) MessageChannel output(); - } + } private final EngineEvents producerChannels; - + private Disposable control; - + public EngineEventsMessageProducer(EngineEvents producerChannels) { this.producerChannels = producerChannels; } @@ -63,7 +65,7 @@ public EngineEventsMessageProducer(EngineEvents producerChannels) { @Override public void start() { List> events; - + try { events = new ObjectMapper().readValue(json, new TypeReference>>(){}); @@ -76,7 +78,7 @@ public void start() { .build())) .doOnNext(producerChannels.output()::send) .doOnError(e -> logger.error("Error during processing: ", e)) - .retryBackoff(Integer.MAX_VALUE, Duration.ofSeconds(1)) + .retryWhen(RetrySpec.backoff(Integer.MAX_VALUE, Duration.ofSeconds(1))) .doOnEach(signal -> signal.getContext().get(AtomicInteger.class).getAndIncrement()) .subscriberContext(Context.of(AtomicInteger.class, new AtomicInteger())) .subscribe(); @@ -88,357 +90,357 @@ public void start() { @Override public void stop() { control.dispose(); - + } @Override public boolean isRunning() { return (control != null && !control.isDisposed()); } - -// // Does not recover on RabbitMq restart + +// // Does not recover on RabbitMq restart // @StreamEmitter // @Output("producer") // public void emit(FluxSender output) throws JsonParseException, JsonMappingException, IOException { // List> events = new ObjectMapper().readValue(json, new TypeReference>>(){}); -// +// // output.send(Flux.interval(Duration.ofMillis(0), Duration.ofMillis(1000), Schedulers.single()) // .map(interval -> MessageBuilder.withPayload(events) // .setHeader("routingKey", String.valueOf(interval)) // .build())); // } - + private static String json = - "[ \r\n" + - " { \r\n" + - " \"eventType\":\"PROCESS_CREATED\",\r\n" + - " \"id\":\"ebe2cb3b-c9ea-4d22-9c01-57c363405617\",\r\n" + - " \"timestamp\":1545701139583,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"id\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"initiator\":\"hruser\",\r\n" + - " \"startDate\":\"2018-12-25T01:25:39.583+0000\",\r\n" + - " \"status\":\"RUNNING\",\r\n" + - " \"processDefinitionVersion\":1\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"VARIABLE_CREATED\",\r\n" + - " \"id\":\"0b127388-3a2e-4b32-a19c-5de775fafa8f\",\r\n" + - " \"timestamp\":1545701139583,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"name\":\"firstName\",\r\n" + - " \"type\":\"string\",\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"value\":\"Paulo\",\r\n" + - " \"taskVariable\":false\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"firstName\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"VARIABLE_CREATED\",\r\n" + - " \"id\":\"19b30145-8109-424b-9437-2f0fbb07031e\",\r\n" + - " \"timestamp\":1545701139583,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"name\":\"lastName\",\r\n" + - " \"type\":\"string\",\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"value\":\"Silva\",\r\n" + - " \"taskVariable\":false\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"lastName\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"VARIABLE_CREATED\",\r\n" + - " \"id\":\"f743f526-34a1-45b1-b040-7c94ca742c58\",\r\n" + - " \"timestamp\":1545701139583,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"name\":\"age\",\r\n" + - " \"type\":\"integer\",\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"value\":25,\r\n" + - " \"taskVariable\":false\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"age\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"PROCESS_STARTED\",\r\n" + - " \"id\":\"743aa709-2450-42c4-ac53-b4f2ac92e558\",\r\n" + - " \"timestamp\":1545701139583,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"id\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"initiator\":\"hruser\",\r\n" + - " \"startDate\":\"2018-12-25T01:25:39.583+0000\",\r\n" + - " \"status\":\"RUNNING\",\r\n" + - " \"processDefinitionVersion\":1\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"ACTIVITY_STARTED\",\r\n" + - " \"id\":\"c57c3f3c-b54a-4312-be70-73662cf4a79d\",\r\n" + - " \"timestamp\":1545701139583,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"elementId\":\"startEvent1\",\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"activityType\":\"startEvent\"\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"startEvent1\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"ACTIVITY_COMPLETED\",\r\n" + - " \"id\":\"73811f1b-2d77-4558-846a-8ae0327e844a\",\r\n" + - " \"timestamp\":1545701139583,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"elementId\":\"startEvent1\",\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"activityType\":\"startEvent\"\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"startEvent1\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"SEQUENCE_FLOW_TAKEN\",\r\n" + - " \"id\":\"0dfb8430-86a5-4932-8d40-1ae45cc46ae1\",\r\n" + - " \"timestamp\":1545701139583,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"elementId\":\"sid-68945AF1-396F-4B8A-B836-FC318F62313F\",\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"sourceActivityElementId\":\"startEvent1\",\r\n" + - " \"sourceActivityType\":\"org.activiti.bpmn.model.StartEvent\",\r\n" + - " \"targetActivityElementId\":\"sid-CDFE7219-4627-43E9-8CA8-866CC38EBA94\",\r\n" + - " \"targetActivityName\":\"Perform action\",\r\n" + - " \"targetActivityType\":\"org.activiti.bpmn.model.UserTask\"\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"sid-68945AF1-396F-4B8A-B836-FC318F62313F\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"ACTIVITY_STARTED\",\r\n" + - " \"id\":\"56e3b7d3-61f7-4918-a729-2b9e3205bde2\",\r\n" + - " \"timestamp\":1545701139583,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"elementId\":\"sid-CDFE7219-4627-43E9-8CA8-866CC38EBA94\",\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"activityName\":\"Perform action\",\r\n" + - " \"activityType\":\"userTask\"\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"sid-CDFE7219-4627-43E9-8CA8-866CC38EBA94\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"VARIABLE_CREATED\",\r\n" + - " \"id\":\"36c3ef0a-af93-4181-8a83-a389b09c1c47\",\r\n" + - " \"timestamp\":1545701139584,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"name\":\"firstName\",\r\n" + - " \"type\":\"string\",\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"value\":\"Paulo\",\r\n" + - " \"taskId\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"taskVariable\":true\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"firstName\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"VARIABLE_CREATED\",\r\n" + - " \"id\":\"219cb834-88f3-461b-bcb7-61876b0a882c\",\r\n" + - " \"timestamp\":1545701139584,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"name\":\"lastName\",\r\n" + - " \"type\":\"string\",\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"value\":\"Silva\",\r\n" + - " \"taskId\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"taskVariable\":true\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"lastName\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"VARIABLE_CREATED\",\r\n" + - " \"id\":\"fa844c56-8081-4b28-b683-01b172406f17\",\r\n" + - " \"timestamp\":1545701139584,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"name\":\"age\",\r\n" + - " \"type\":\"integer\",\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"value\":25,\r\n" + - " \"taskId\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"taskVariable\":true\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"age\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"TASK_CANDIDATE_GROUP_ADDED\",\r\n" + - " \"id\":\"ce5bc8ec-f3d1-424f-a683-914a58213630\",\r\n" + - " \"timestamp\":1545701139585,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"taskId\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"groupId\":\"hr\"\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"hr\"\r\n" + - " },\r\n" + - " { \r\n" + - " \"eventType\":\"TASK_CREATED\",\r\n" + - " \"id\":\"cf639247-bdd9-4f9f-99ba-1efec7d301d3\",\r\n" + - " \"timestamp\":1545701139585,\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + - " \"processDefinitionVersion\":1,\r\n" + - " \"entity\":{ \r\n" + - " \"id\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"name\":\"Perform action\",\r\n" + - " \"status\":\"CREATED\",\r\n" + - " \"createdDate\":\"2018-12-25T01:25:39.583+0000\",\r\n" + - " \"priority\":50,\r\n" + - " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + - " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\"\r\n" + - " },\r\n" + - " \"appName\":\"default-app\",\r\n" + - " \"serviceFullName\":\"rb-my-app\",\r\n" + - " \"appVersion\":\"\",\r\n" + - " \"serviceName\":\"rb-my-app\",\r\n" + - " \"serviceVersion\":\"\",\r\n" + - " \"serviceType\":\"runtime-bundle\",\r\n" + - " \"entityId\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\"\r\n" + - " }\r\n" + + "[ \r\n" + + " { \r\n" + + " \"eventType\":\"PROCESS_CREATED\",\r\n" + + " \"id\":\"ebe2cb3b-c9ea-4d22-9c01-57c363405617\",\r\n" + + " \"timestamp\":1545701139583,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"id\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"initiator\":\"hruser\",\r\n" + + " \"startDate\":\"2018-12-25T01:25:39.583+0000\",\r\n" + + " \"status\":\"RUNNING\",\r\n" + + " \"processDefinitionVersion\":1\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"VARIABLE_CREATED\",\r\n" + + " \"id\":\"0b127388-3a2e-4b32-a19c-5de775fafa8f\",\r\n" + + " \"timestamp\":1545701139583,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"name\":\"firstName\",\r\n" + + " \"type\":\"string\",\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"value\":\"Paulo\",\r\n" + + " \"taskVariable\":false\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"firstName\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"VARIABLE_CREATED\",\r\n" + + " \"id\":\"19b30145-8109-424b-9437-2f0fbb07031e\",\r\n" + + " \"timestamp\":1545701139583,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"name\":\"lastName\",\r\n" + + " \"type\":\"string\",\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"value\":\"Silva\",\r\n" + + " \"taskVariable\":false\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"lastName\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"VARIABLE_CREATED\",\r\n" + + " \"id\":\"f743f526-34a1-45b1-b040-7c94ca742c58\",\r\n" + + " \"timestamp\":1545701139583,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"name\":\"age\",\r\n" + + " \"type\":\"integer\",\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"value\":25,\r\n" + + " \"taskVariable\":false\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"age\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"PROCESS_STARTED\",\r\n" + + " \"id\":\"743aa709-2450-42c4-ac53-b4f2ac92e558\",\r\n" + + " \"timestamp\":1545701139583,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"id\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"initiator\":\"hruser\",\r\n" + + " \"startDate\":\"2018-12-25T01:25:39.583+0000\",\r\n" + + " \"status\":\"RUNNING\",\r\n" + + " \"processDefinitionVersion\":1\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"ACTIVITY_STARTED\",\r\n" + + " \"id\":\"c57c3f3c-b54a-4312-be70-73662cf4a79d\",\r\n" + + " \"timestamp\":1545701139583,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"elementId\":\"startEvent1\",\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"activityType\":\"startEvent\"\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"startEvent1\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"ACTIVITY_COMPLETED\",\r\n" + + " \"id\":\"73811f1b-2d77-4558-846a-8ae0327e844a\",\r\n" + + " \"timestamp\":1545701139583,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"elementId\":\"startEvent1\",\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"activityType\":\"startEvent\"\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"startEvent1\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"SEQUENCE_FLOW_TAKEN\",\r\n" + + " \"id\":\"0dfb8430-86a5-4932-8d40-1ae45cc46ae1\",\r\n" + + " \"timestamp\":1545701139583,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"elementId\":\"sid-68945AF1-396F-4B8A-B836-FC318F62313F\",\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"sourceActivityElementId\":\"startEvent1\",\r\n" + + " \"sourceActivityType\":\"org.activiti.bpmn.model.StartEvent\",\r\n" + + " \"targetActivityElementId\":\"sid-CDFE7219-4627-43E9-8CA8-866CC38EBA94\",\r\n" + + " \"targetActivityName\":\"Perform action\",\r\n" + + " \"targetActivityType\":\"org.activiti.bpmn.model.UserTask\"\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"sid-68945AF1-396F-4B8A-B836-FC318F62313F\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"ACTIVITY_STARTED\",\r\n" + + " \"id\":\"56e3b7d3-61f7-4918-a729-2b9e3205bde2\",\r\n" + + " \"timestamp\":1545701139583,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"elementId\":\"sid-CDFE7219-4627-43E9-8CA8-866CC38EBA94\",\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"activityName\":\"Perform action\",\r\n" + + " \"activityType\":\"userTask\"\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"sid-CDFE7219-4627-43E9-8CA8-866CC38EBA94\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"VARIABLE_CREATED\",\r\n" + + " \"id\":\"36c3ef0a-af93-4181-8a83-a389b09c1c47\",\r\n" + + " \"timestamp\":1545701139584,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"name\":\"firstName\",\r\n" + + " \"type\":\"string\",\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"value\":\"Paulo\",\r\n" + + " \"taskId\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"taskVariable\":true\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"firstName\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"VARIABLE_CREATED\",\r\n" + + " \"id\":\"219cb834-88f3-461b-bcb7-61876b0a882c\",\r\n" + + " \"timestamp\":1545701139584,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"name\":\"lastName\",\r\n" + + " \"type\":\"string\",\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"value\":\"Silva\",\r\n" + + " \"taskId\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"taskVariable\":true\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"lastName\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"VARIABLE_CREATED\",\r\n" + + " \"id\":\"fa844c56-8081-4b28-b683-01b172406f17\",\r\n" + + " \"timestamp\":1545701139584,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"name\":\"age\",\r\n" + + " \"type\":\"integer\",\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"value\":25,\r\n" + + " \"taskId\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"taskVariable\":true\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"age\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"TASK_CANDIDATE_GROUP_ADDED\",\r\n" + + " \"id\":\"ce5bc8ec-f3d1-424f-a683-914a58213630\",\r\n" + + " \"timestamp\":1545701139585,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"taskId\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"groupId\":\"hr\"\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"hr\"\r\n" + + " },\r\n" + + " { \r\n" + + " \"eventType\":\"TASK_CREATED\",\r\n" + + " \"id\":\"cf639247-bdd9-4f9f-99ba-1efec7d301d3\",\r\n" + + " \"timestamp\":1545701139585,\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processDefinitionKey\":\"SimpleProcess\",\r\n" + + " \"processDefinitionVersion\":1,\r\n" + + " \"entity\":{ \r\n" + + " \"id\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"name\":\"Perform action\",\r\n" + + " \"status\":\"CREATED\",\r\n" + + " \"createdDate\":\"2018-12-25T01:25:39.583+0000\",\r\n" + + " \"priority\":50,\r\n" + + " \"processDefinitionId\":\"SimpleProcess:1:715f2fd2-07b1-11e9-a0d3-0a580a2c00cd\",\r\n" + + " \"processInstanceId\":\"fd0ae1ca-07e3-11e9-a0d3-0a580a2c00cd\"\r\n" + + " },\r\n" + + " \"appName\":\"default-app\",\r\n" + + " \"serviceFullName\":\"rb-my-app\",\r\n" + + " \"appVersion\":\"\",\r\n" + + " \"serviceName\":\"rb-my-app\",\r\n" + + " \"serviceVersion\":\"\",\r\n" + + " \"serviceType\":\"runtime-bundle\",\r\n" + + " \"entityId\":\"fd0b08e0-07e3-11e9-a0d3-0a580a2c00cd\"\r\n" + + " }\r\n" + "]"; } From 3cce9dd43d9c98cc36e961f384a5d0db70397ea7 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Mon, 14 Dec 2020 19:48:01 -0800 Subject: [PATCH 12/25] fix(modeling): set default spring.jackson.dateFormat to yyyy-MM-dd'T'HH:mm:ss.SSSZ --- .../src/test/resources/application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/src/test/resources/application.properties b/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/src/test/resources/application.properties index 5bec4c829f0..6e143aab944 100644 --- a/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/src/test/resources/application.properties +++ b/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/src/test/resources/application.properties @@ -6,3 +6,4 @@ keycloak.resource=activiti keycloak.public-client=true keycloak.principal-attribute=preferred-username +spring.jackson.dateFormat=yyyy-MM-dd'T'HH:mm:ss.SSSZ \ No newline at end of file From cb6eae5b648cb9f3fd68aaed1d539855cab58636 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Mon, 14 Dec 2020 19:50:18 -0800 Subject: [PATCH 13/25] fix(rb): set default spring.jackson.dateFormat to yyyy-MM-dd'T'HH:mm:ss.SSSZ --- .../src/main/resources/metadata.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/src/main/resources/metadata.properties b/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/src/main/resources/metadata.properties index ea63f4b1b8f..f92b9813e32 100644 --- a/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/src/main/resources/metadata.properties +++ b/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/src/main/resources/metadata.properties @@ -9,3 +9,5 @@ spring.cloud.stream.bindings.auditProducer.producer.required-groups=${ACT_QUERY_ #ensures that producer participates in the Spring transactions spring.cloud.stream.rabbit.bindings.auditProducer.producer.transacted=${ACT_AUDIT_PRODUCER_TRANSACTED:true} spring.cloud.stream.kafka.binder.transaction.transactionIdPrefix=${ACT_AUDIT_PRODUCER_TRANSACTION_ID_PREFIX:tx-} + +spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ \ No newline at end of file From 5c5ed0af1fb5dea55b12b5c0393f0f4cda40b2a9 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Mon, 14 Dec 2020 22:12:59 -0800 Subject: [PATCH 14/25] fix: extract default jackson.date-format to activiti-cloud-service-common-config --- .../activiti-cloud-services-modeling-rest/pom.xml | 4 ++++ .../src/test/resources/application.properties | 1 - .../activiti-cloud-starter-modeling/pom.xml | 4 ++++ .../activiti-cloud-starter-runtime-bundle/pom.xml | 4 ++++ .../src/main/resources/metadata.properties | 2 -- .../src/main/resources/conf/common-configuration.properties | 4 +++- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/pom.xml b/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/pom.xml index d6b5cede50c..9394c5dbc7b 100644 --- a/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/pom.xml +++ b/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/pom.xml @@ -10,6 +10,10 @@ activiti-cloud-services-modeling-rest Activiti Cloud Services :: Modeling REST + + org.activiti.cloud + activiti-cloud-service-common-config + org.activiti.cloud activiti-cloud-services-modeling-core diff --git a/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/src/test/resources/application.properties b/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/src/test/resources/application.properties index 6e143aab944..5bec4c829f0 100644 --- a/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/src/test/resources/application.properties +++ b/activiti-cloud-modeling-service/activiti-cloud-services-modeling/activiti-cloud-services-modeling-rest/src/test/resources/application.properties @@ -6,4 +6,3 @@ keycloak.resource=activiti keycloak.public-client=true keycloak.principal-attribute=preferred-username -spring.jackson.dateFormat=yyyy-MM-dd'T'HH:mm:ss.SSSZ \ No newline at end of file diff --git a/activiti-cloud-modeling-service/activiti-cloud-starter-modeling/pom.xml b/activiti-cloud-modeling-service/activiti-cloud-starter-modeling/pom.xml index f827ea36783..431f353c8f0 100644 --- a/activiti-cloud-modeling-service/activiti-cloud-starter-modeling/pom.xml +++ b/activiti-cloud-modeling-service/activiti-cloud-starter-modeling/pom.xml @@ -11,6 +11,10 @@ activiti-cloud-starter-modeling Activiti Cloud Starter :: Modeling + + org.activiti.cloud + activiti-cloud-service-common-config + org.activiti.cloud activiti-cloud-services-modeling-api diff --git a/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/pom.xml b/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/pom.xml index 38bbf089927..5407a7238e6 100644 --- a/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/pom.xml +++ b/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/pom.xml @@ -16,6 +16,10 @@ org.activiti activiti-engine + + org.activiti.cloud + activiti-cloud-service-common-config + org.activiti.cloud activiti-cloud-services-api diff --git a/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/src/main/resources/metadata.properties b/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/src/main/resources/metadata.properties index f92b9813e32..ea63f4b1b8f 100644 --- a/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/src/main/resources/metadata.properties +++ b/activiti-cloud-runtime-bundle-service/activiti-cloud-starter-runtime-bundle/src/main/resources/metadata.properties @@ -9,5 +9,3 @@ spring.cloud.stream.bindings.auditProducer.producer.required-groups=${ACT_QUERY_ #ensures that producer participates in the Spring transactions spring.cloud.stream.rabbit.bindings.auditProducer.producer.transacted=${ACT_AUDIT_PRODUCER_TRANSACTED:true} spring.cloud.stream.kafka.binder.transaction.transactionIdPrefix=${ACT_AUDIT_PRODUCER_TRANSACTION_ID_PREFIX:tx-} - -spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ \ No newline at end of file diff --git a/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties index fbe690b5298..297e38b2dad 100644 --- a/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties +++ b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties @@ -1,2 +1,4 @@ # enable deletion endpoints -activiti.rest.enable-deletion=true \ No newline at end of file +activiti.rest.enable-deletion=true +# configure jackson Java Date format +spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSS'Z' \ No newline at end of file From bcaff8dc6b92453fa9270c20c0aceda91731b6c6 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Mon, 14 Dec 2020 23:00:11 -0800 Subject: [PATCH 15/25] fix: update default date format to yyyy-MM-dd'T'HH:mm:ss.SSSZZZ --- .../src/main/resources/conf/common-configuration.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties index 297e38b2dad..e5e7028117c 100644 --- a/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties +++ b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties @@ -1,4 +1,4 @@ # enable deletion endpoints activiti.rest.enable-deletion=true # configure jackson Java Date format -spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSS'Z' \ No newline at end of file +spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZZZ \ No newline at end of file From 149189bd5f16b5a7a15546dd3169e8640c156158 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Mon, 14 Dec 2020 23:53:06 -0800 Subject: [PATCH 16/25] fix: set jackson.date-format to yyyy-MM-dd'T'HH:mm:ss.SSSZ --- .../src/main/resources/conf/common-configuration.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties index e5e7028117c..27f67262c4c 100644 --- a/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties +++ b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties @@ -1,4 +1,4 @@ # enable deletion endpoints activiti.rest.enable-deletion=true -# configure jackson Java Date format -spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZZZ \ No newline at end of file +# configure jackson Java Date format, i.e. 2020-12-14T12:08:56.235-0700 +spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ \ No newline at end of file From 5f5c3f72d6e418fcfae083e34d89a95b66ed0ce7 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Tue, 15 Dec 2020 00:32:45 -0800 Subject: [PATCH 17/25] fix: override StdDateFormat without colon in time zone --- .../pom.xml | 4 +++ .../StdDateFormatWithoutColonInTimeZone.java | 29 +++++++++++++++++++ .../conf/common-configuration.properties | 4 +-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/java/org/activiti/cloud/common/properties/StdDateFormatWithoutColonInTimeZone.java diff --git a/activiti-cloud-service-common/activiti-cloud-service-common-config/pom.xml b/activiti-cloud-service-common/activiti-cloud-service-common-config/pom.xml index 7c1e533a247..5b19938cbe6 100644 --- a/activiti-cloud-service-common/activiti-cloud-service-common-config/pom.xml +++ b/activiti-cloud-service-common/activiti-cloud-service-common-config/pom.xml @@ -14,5 +14,9 @@ org.springframework spring-context + + com.fasterxml.jackson.core + jackson-databind + diff --git a/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/java/org/activiti/cloud/common/properties/StdDateFormatWithoutColonInTimeZone.java b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/java/org/activiti/cloud/common/properties/StdDateFormatWithoutColonInTimeZone.java new file mode 100644 index 00000000000..c1e8f0fbf8e --- /dev/null +++ b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/java/org/activiti/cloud/common/properties/StdDateFormatWithoutColonInTimeZone.java @@ -0,0 +1,29 @@ +/* + * Copyright 2017-2020 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.activiti.cloud.common.properties; + +import com.fasterxml.jackson.databind.util.StdDateFormat; + +public class StdDateFormatWithoutColonInTimeZone extends StdDateFormat { + + private static final long serialVersionUID = 1L; + + public StdDateFormatWithoutColonInTimeZone() { + withColonInTimeZone(false); + } + + +} diff --git a/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties index 27f67262c4c..c3e6bb84bd9 100644 --- a/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties +++ b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/resources/conf/common-configuration.properties @@ -1,4 +1,4 @@ # enable deletion endpoints activiti.rest.enable-deletion=true -# configure jackson Java Date format, i.e. 2020-12-14T12:08:56.235-0700 -spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ \ No newline at end of file +# configure jackson Java Date format +spring.jackson.date-format=org.activiti.cloud.common.properties.StdDateFormatWithoutColonInTimeZone From 66914f78744e42122412e335f2f29f1590ee5e53 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Tue, 15 Dec 2020 00:56:13 -0800 Subject: [PATCH 18/25] fix: use super constructor for StdDateFormat override --- .../common/properties/StdDateFormatWithoutColonInTimeZone.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/java/org/activiti/cloud/common/properties/StdDateFormatWithoutColonInTimeZone.java b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/java/org/activiti/cloud/common/properties/StdDateFormatWithoutColonInTimeZone.java index c1e8f0fbf8e..540b34dfbd6 100644 --- a/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/java/org/activiti/cloud/common/properties/StdDateFormatWithoutColonInTimeZone.java +++ b/activiti-cloud-service-common/activiti-cloud-service-common-config/src/main/java/org/activiti/cloud/common/properties/StdDateFormatWithoutColonInTimeZone.java @@ -22,7 +22,7 @@ public class StdDateFormatWithoutColonInTimeZone extends StdDateFormat { private static final long serialVersionUID = 1L; public StdDateFormatWithoutColonInTimeZone() { - withColonInTimeZone(false); + super(DEFAULT_TIMEZONE, DEFAULT_LOCALE, null, false); } From 116485294edd4b439c08ee1e9ba864addb684f89 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Tue, 15 Dec 2020 08:58:20 -0800 Subject: [PATCH 19/25] fix(build): add deploy preview to Nexus --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index d80a2396b2f..2ffa3f8c58a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ env: stages: - name: test +- name: deploy_preview + if: type = pull_request - name: publish reports - name: tag_deploy_updatebot if: type != pull_request @@ -49,6 +51,11 @@ jobs: - name: activiti-cloud-connectors stage: test script: ${MAVEN_VERIFY_CMD} -f activiti-cloud-connectors/pom.xml + - name: Deploy Preview + stage: deploy_preview + script: | + mvn versions:set -DnewVersion=$(cat VERSION) -DprocessAllModules=true -DgenerateBackupPoms=false || travis_terminate 1 + mvn clean deploy -DskipTests || travis_terminate 1 - name: publish reports stage: publish reports before_script: aws s3 sync ${S3_JACCO_DIR} . From deb2d2494dd46d86e36636f9d282eca5682ea68d Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Tue, 15 Dec 2020 09:02:04 -0800 Subject: [PATCH 20/25] fix: add SNAPSHOT qualifier to preview version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ffa3f8c58a..70980e19b6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ jobs: - name: Deploy Preview stage: deploy_preview script: | - mvn versions:set -DnewVersion=$(cat VERSION) -DprocessAllModules=true -DgenerateBackupPoms=false || travis_terminate 1 + mvn versions:set -DnewVersion=$(cat VERSION)-SNAPSHOT -DprocessAllModules=true -DgenerateBackupPoms=false || travis_terminate 1 mvn clean deploy -DskipTests || travis_terminate 1 - name: publish reports stage: publish reports From b1e0587281daaf60bcc4fe596b59368a48fc1dc3 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Tue, 15 Dec 2020 11:49:50 -0800 Subject: [PATCH 21/25] fix(version): update spring-cloud.version to 2020.0.0-RC1 --- .../activiti-cloud-build-dependencies-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml b/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml index 6e8af549cdd..825f2e01c5a 100755 --- a/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml +++ b/activiti-cloud-build/activiti-cloud-build-dependencies-parent/pom.xml @@ -12,7 +12,7 @@ pom Activiti Cloud :: Dependencies Parent - 2020.0.0-M6 + 2020.0.0-RC1 1.14.2 From a8a6bed7962656951d45f9de5ab5908eed8211e6 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Tue, 15 Dec 2020 17:17:00 -0800 Subject: [PATCH 22/25] fix(version): update Activiti PR version to 0.0.1-PR-3497-6683-SNAPSHOT --- activiti-cloud-api/pom.xml | 2 +- activiti-cloud-modeling-service/pom.xml | 2 +- activiti-cloud-query-service/pom.xml | 2 +- activiti-cloud-runtime-bundle-service/pom.xml | 2 +- activiti-cloud-service-common/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/activiti-cloud-api/pom.xml b/activiti-cloud-api/pom.xml index 1d7cc78ba31..72a85f7e779 100644 --- a/activiti-cloud-api/pom.xml +++ b/activiti-cloud-api/pom.xml @@ -14,7 +14,7 @@ Activiti Cloud :: Runtime API Parent pom - 7.1.279 + 0.0.1-PR-3497-6683-SNAPSHOT activiti-cloud-api-dependencies diff --git a/activiti-cloud-modeling-service/pom.xml b/activiti-cloud-modeling-service/pom.xml index f4bd7ae74e4..34ae58a9e3c 100644 --- a/activiti-cloud-modeling-service/pom.xml +++ b/activiti-cloud-modeling-service/pom.xml @@ -20,7 +20,7 @@ activiti-cloud-acceptance-tests-modeling - 7.1.279 + 0.0.1-PR-3497-6683-SNAPSHOT 1.12.1 4.4 diff --git a/activiti-cloud-query-service/pom.xml b/activiti-cloud-query-service/pom.xml index f9d5ece6616..09ea90724f9 100644 --- a/activiti-cloud-query-service/pom.xml +++ b/activiti-cloud-query-service/pom.xml @@ -20,7 +20,7 @@ activiti-cloud-starter-query - 7.1.279 + 0.0.1-PR-3497-6683-SNAPSHOT diff --git a/activiti-cloud-runtime-bundle-service/pom.xml b/activiti-cloud-runtime-bundle-service/pom.xml index 5db059764dc..7bf728534d7 100644 --- a/activiti-cloud-runtime-bundle-service/pom.xml +++ b/activiti-cloud-runtime-bundle-service/pom.xml @@ -21,7 +21,7 @@ activiti-cloud-starter-runtime-bundle-it - 7.1.279 + 0.0.1-PR-3497-6683-SNAPSHOT diff --git a/activiti-cloud-service-common/pom.xml b/activiti-cloud-service-common/pom.xml index e01fb49b756..dd6d436d215 100644 --- a/activiti-cloud-service-common/pom.xml +++ b/activiti-cloud-service-common/pom.xml @@ -33,7 +33,7 @@ activiti-cloud-services-test-containers - 7.1.279 + 0.0.1-PR-3497-6683-SNAPSHOT 1.9.4 1.8 From 00d474e3d14ff0086bdfe5ed8c080812a9c982b2 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Tue, 15 Dec 2020 17:25:21 -0800 Subject: [PATCH 23/25] fix(build): add activiti-snapshots repository --- activiti-cloud-build/pom.xml | 4 ++++ pom.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/activiti-cloud-build/pom.xml b/activiti-cloud-build/pom.xml index 11310a4ce17..1dc7ac3f961 100644 --- a/activiti-cloud-build/pom.xml +++ b/activiti-cloud-build/pom.xml @@ -223,6 +223,10 @@ activiti-releases https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases + + activiti-snapshots + https://artifacts.alfresco.com/nexus/content/repositories/activiti-snapshots + diff --git a/pom.xml b/pom.xml index 6b79d41e2be..b6d31576fb1 100644 --- a/pom.xml +++ b/pom.xml @@ -204,6 +204,10 @@ activiti-releases https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases + + activiti-snapshots + https://artifacts.alfresco.com/nexus/content/repositories/activiti-snapshots + From b6e89c417d5a3ff1239c48bf42f93d9dd7e32a4e Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Thu, 17 Dec 2020 20:53:28 -0800 Subject: [PATCH 24/25] fix(travis): add deploy conditional preview on preview branch prefix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 70980e19b6a..fae67154d1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: stages: - name: test - name: deploy_preview - if: type = pull_request + if: type = pull_request AND head_branch =~ ^.*preview$ - name: publish reports - name: tag_deploy_updatebot if: type != pull_request From e778b5106e29e31ec25258fe1d11e335a04ba7d9 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Mon, 21 Dec 2020 08:16:54 -0800 Subject: [PATCH 25/25] fix(version): update activiti.version to 0.0.1-PR-3505-6694-SNAPSHOT --- activiti-cloud-api/pom.xml | 2 +- activiti-cloud-modeling-service/pom.xml | 2 +- activiti-cloud-query-service/pom.xml | 2 +- activiti-cloud-runtime-bundle-service/pom.xml | 2 +- activiti-cloud-service-common/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/activiti-cloud-api/pom.xml b/activiti-cloud-api/pom.xml index 72a85f7e779..9334ca495c3 100644 --- a/activiti-cloud-api/pom.xml +++ b/activiti-cloud-api/pom.xml @@ -14,7 +14,7 @@ Activiti Cloud :: Runtime API Parent pom - 0.0.1-PR-3497-6683-SNAPSHOT + 0.0.1-PR-3505-6694-SNAPSHOT activiti-cloud-api-dependencies diff --git a/activiti-cloud-modeling-service/pom.xml b/activiti-cloud-modeling-service/pom.xml index 34ae58a9e3c..fafcb74dae7 100644 --- a/activiti-cloud-modeling-service/pom.xml +++ b/activiti-cloud-modeling-service/pom.xml @@ -20,7 +20,7 @@ activiti-cloud-acceptance-tests-modeling - 0.0.1-PR-3497-6683-SNAPSHOT + 0.0.1-PR-3505-6694-SNAPSHOT 1.12.1 4.4 diff --git a/activiti-cloud-query-service/pom.xml b/activiti-cloud-query-service/pom.xml index 09ea90724f9..df2ce5051e2 100644 --- a/activiti-cloud-query-service/pom.xml +++ b/activiti-cloud-query-service/pom.xml @@ -20,7 +20,7 @@ activiti-cloud-starter-query - 0.0.1-PR-3497-6683-SNAPSHOT + 0.0.1-PR-3505-6694-SNAPSHOT diff --git a/activiti-cloud-runtime-bundle-service/pom.xml b/activiti-cloud-runtime-bundle-service/pom.xml index 7bf728534d7..e11fde44805 100644 --- a/activiti-cloud-runtime-bundle-service/pom.xml +++ b/activiti-cloud-runtime-bundle-service/pom.xml @@ -21,7 +21,7 @@ activiti-cloud-starter-runtime-bundle-it - 0.0.1-PR-3497-6683-SNAPSHOT + 0.0.1-PR-3505-6694-SNAPSHOT diff --git a/activiti-cloud-service-common/pom.xml b/activiti-cloud-service-common/pom.xml index dd6d436d215..7a416e1c3bb 100644 --- a/activiti-cloud-service-common/pom.xml +++ b/activiti-cloud-service-common/pom.xml @@ -33,7 +33,7 @@ activiti-cloud-services-test-containers - 0.0.1-PR-3497-6683-SNAPSHOT + 0.0.1-PR-3505-6694-SNAPSHOT 1.9.4 1.8