You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2022/07/30 22:55:16 UTC
[servicecomb-pack] branch master updated (a6f25ac6 -> fbffe451)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
from a6f25ac6 SCB-2641 Increase wait time for slow CI
new 7bdf3347 SCB-2641 Fix wrong version placeholder
new 62676a1c SCB-2641 Fix wrong version placeholder
new fbffe451 SCB-2641 Increase waiting time for slow CI
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../spec/saga/akka/it/SagaIntegrationTest.java | 24 +++++++++++-----------
demo/saga-dubbo-demo/service-api/pom.xml | 2 +-
demo/saga-dubbo-demo/serviceb/pom.xml | 2 +-
demo/saga-dubbo-demo/servicec/pom.xml | 2 +-
integration-tests/coverage-aggregate/pom.xml | 4 ++--
pom.xml | 2 +-
6 files changed, 18 insertions(+), 18 deletions(-)
[servicecomb-pack] 02/03: SCB-2641 Fix wrong version placeholder
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 62676a1cf30af1c8d4af070daa6ec6ff939775ea
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Tue Jul 26 09:52:43 2022 +0800
SCB-2641 Fix wrong version placeholder
---
demo/saga-dubbo-demo/serviceb/pom.xml | 2 +-
demo/saga-dubbo-demo/servicec/pom.xml | 2 +-
integration-tests/coverage-aggregate/pom.xml | 4 ++--
pom.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/demo/saga-dubbo-demo/serviceb/pom.xml b/demo/saga-dubbo-demo/serviceb/pom.xml
index d5261d45..ab4c6862 100644
--- a/demo/saga-dubbo-demo/serviceb/pom.xml
+++ b/demo/saga-dubbo-demo/serviceb/pom.xml
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>service-api</artifactId>
- <version>${revision}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/demo/saga-dubbo-demo/servicec/pom.xml b/demo/saga-dubbo-demo/servicec/pom.xml
index 2704a054..9d9839e0 100644
--- a/demo/saga-dubbo-demo/servicec/pom.xml
+++ b/demo/saga-dubbo-demo/servicec/pom.xml
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>service-api</artifactId>
- <version>${revision}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/integration-tests/coverage-aggregate/pom.xml b/integration-tests/coverage-aggregate/pom.xml
index ddae2d8c..45733f06 100644
--- a/integration-tests/coverage-aggregate/pom.xml
+++ b/integration-tests/coverage-aggregate/pom.xml
@@ -76,12 +76,12 @@
<dependency>
<groupId>org.apache.servicecomb.pack.tests</groupId>
<artifactId>pack-tests</artifactId>
- <version>${revision}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.pack.tests</groupId>
<artifactId>explicit-transaction-context-tests</artifactId>
- <version>${revision}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 95084569..74b37008 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
<mixin>
<groupId>org.apache.servicecomb.pack</groupId>
<artifactId>docker-build-config</artifactId>
- <version>${revision}</version>
+ <version>${project.version}</version>
</mixin>
</mixins>
</configuration>
[servicecomb-pack] 03/03: SCB-2641 Increase waiting time for slow CI
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit fbffe4512c48ff1a6945472bc48c4ebabb571057
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Tue Jul 26 10:56:35 2022 +0800
SCB-2641 Increase waiting time for slow CI
---
.../spec/saga/akka/it/SagaIntegrationTest.java | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/alpha/alpha-spec-saga-akka/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/akka/it/SagaIntegrationTest.java b/alpha/alpha-spec-saga-akka/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/akka/it/SagaIntegrationTest.java
index 2d24caca..3b3cdcf9 100644
--- a/alpha/alpha-spec-saga-akka/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/akka/it/SagaIntegrationTest.java
+++ b/alpha/alpha-spec-saga-akka/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/akka/it/SagaIntegrationTest.java
@@ -99,7 +99,7 @@ public class SagaIntegrationTest {
SagaEventSender.successfulEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
- await().atMost(60, SECONDS).until(() -> {
+ await().atMost(120, SECONDS).until(() -> {
SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system)
.getLastSagaData();
return sagaData != null && sagaData.isTerminated()
@@ -127,7 +127,7 @@ public class SagaIntegrationTest {
memoryActorEventChannel.send(event);
});
- await().atMost(60, SECONDS).until(() -> {
+ await().atMost(120, SECONDS).until(() -> {
SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -146,7 +146,7 @@ public class SagaIntegrationTest {
SagaEventSender.middleTxAbortedEvents(globalTxId, localTxId_1, localTxId_2).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
- await().atMost(60, SECONDS).until(() -> {
+ await().atMost(120, SECONDS).until(() -> {
SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -167,7 +167,7 @@ public class SagaIntegrationTest {
SagaEventSender.lastTxAbortedEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
- await().atMost(60, SECONDS).until(() -> {
+ await().atMost(120, SECONDS).until(() -> {
SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -189,7 +189,7 @@ public class SagaIntegrationTest {
SagaEventSender.sagaAbortedEventBeforeTxComponsitedEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
- await().atMost(60, SECONDS).until(() -> {
+ await().atMost(120, SECONDS).until(() -> {
SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -211,7 +211,7 @@ public class SagaIntegrationTest {
SagaEventSender.receivedRemainingEventAfterFirstTxAbortedEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
- await().atMost(60, SECONDS).until(() -> {
+ await().atMost(120, SECONDS).until(() -> {
SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -233,7 +233,7 @@ public class SagaIntegrationTest {
SagaEventSender.sagaAbortedEventAfterAllTxEndedsEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
- await().atMost(60, SECONDS).until(() -> {
+ await().atMost(120, SECONDS).until(() -> {
SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -255,7 +255,7 @@ public class SagaIntegrationTest {
SagaEventSender.omegaSendSagaTimeoutEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
- await().atMost(60, SECONDS).until(() -> {
+ await().atMost(120, SECONDS).until(() -> {
SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.SUSPENDED;
});
@@ -278,7 +278,7 @@ public class SagaIntegrationTest {
SagaEventSender.sagaActorTriggerTimeoutEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3, timeout).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
- await().atMost(timeout + 60, SECONDS).until(() -> {
+ await().atMost(timeout + 120, SECONDS).until(() -> {
SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.SUSPENDED;
});
@@ -322,7 +322,7 @@ public class SagaIntegrationTest {
SagaEventSender.successfulWithTxConcurrentCrossEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
- await().atMost(60, SECONDS).until(() -> {
+ await().atMost(120, SECONDS).until(() -> {
SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMMITTED;
});
@@ -344,7 +344,7 @@ public class SagaIntegrationTest {
SagaEventSender.lastTxAbortedEventWithTxConcurrentEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
- await().atMost(60, SECONDS).until(() -> {
+ await().atMost(120, SECONDS).until(() -> {
SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -352,7 +352,7 @@ public class SagaIntegrationTest {
assertNotNull(sagaData.getBeginTime());
assertNotNull(sagaData.getEndTime());
assertEquals(sagaData.getTxEntities().size(),3);
- await().atMost(60, SECONDS).until(() -> {
+ await().atMost(120, SECONDS).until(() -> {
return sagaData.getTxEntities().get(localTxId_1) != null
&& sagaData.getTxEntities().get(localTxId_2) != null
&& sagaData.getTxEntities().get(localTxId_3) != null;
[servicecomb-pack] 01/03: SCB-2641 Fix wrong version placeholder
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 7bdf3347f9943d90692c0b91221e1e37e9193ae0
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Mon Jul 25 23:29:17 2022 +0800
SCB-2641 Fix wrong version placeholder
---
demo/saga-dubbo-demo/service-api/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/demo/saga-dubbo-demo/service-api/pom.xml b/demo/saga-dubbo-demo/service-api/pom.xml
index 54841f2b..abbb2057 100644
--- a/demo/saga-dubbo-demo/service-api/pom.xml
+++ b/demo/saga-dubbo-demo/service-api/pom.xml
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.apache.servicecomb.pack.demo</groupId>
<artifactId>service-pub</artifactId>
- <version>${revision}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>