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/25 14:41:18 UTC
[servicecomb-pack] branch master updated (264d7d27 -> a6f25ac6)
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 264d7d27 Bump netty-codec-http in /pack-dependencies
new 684d9037 SCB-2641 Use flatten-maven-plugin to update version placeholders ${revision} for the main pom
new a6f25ac6 SCB-2641 Increase wait time for slow CI
The 2 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 | 2 +-
.../grpc/saga/SagaLoadBalancedSenderTest.java | 2 +-
pom.xml | 39 ++++++++++++++++++++++
3 files changed, 41 insertions(+), 2 deletions(-)
[servicecomb-pack] 01/02: SCB-2641 Use flatten-maven-plugin to update version placeholders ${revision} for the main pom
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 684d9037925c72de0a3ec52253a995083b5c4098
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Mon Jul 25 21:54:36 2022 +0800
SCB-2641 Use flatten-maven-plugin to update version placeholders ${revision} for the main pom
---
pom.xml | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/pom.xml b/pom.xml
index cac1a11d..95084569 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,6 +344,41 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven.failsafe.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>${flatten-maven-plugin.version}</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <flattenMode>bom</flattenMode>
+ <pomElements>
+ <parent>expand</parent>
+ <dependencies>keep</dependencies>
+ <dependencyManagement>remove</dependencyManagement>
+ <pluginManagement>remove</pluginManagement>
+ <distributionManagement>remove</distributionManagement>
+ <repositories>remove</repositories>
+ <properties>remove</properties>
+ </pomElements>
+ </configuration>
+ </execution>
+ <execution>
+ <id>flatten-clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
<!-- enable the rat check by default -->
@@ -369,6 +404,10 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
[servicecomb-pack] 02/02: SCB-2641 Increase wait 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 a6f25ac6d1696a2039af60ed007713feb0f217e9
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Mon Jul 25 22:20:39 2022 +0800
SCB-2641 Increase wait time for slow CI
---
.../servicecomb/pack/alpha/spec/saga/akka/it/SagaIntegrationTest.java | 2 +-
.../pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java | 2 +-
2 files changed, 2 insertions(+), 2 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 11479dfe..2d24caca 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
@@ -300,7 +300,7 @@ public class SagaIntegrationTest {
SagaEventSender.successfulWithTxConcurrentEvents(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;
});
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
index aa1e8947..b7615f4b 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
@@ -123,7 +123,7 @@ public class SagaLoadBalancedSenderTest extends SagaLoadBalancedSenderTestBase {
messageSender.send(event);
startServerOnPort(deadPort);
- await().atMost(30, SECONDS).until(new Callable<Boolean>() {
+ await().atMost(120, SECONDS).until(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {