(servicecomb-pack) branch master updated: Disable insecure spring boot actuator endpoints by default.
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 The following commit(s) were added to refs/heads/master by this push: new 3220db48 Disable insecure spring boot actuator endpoints by default. 3220db48 is described below commit 3220db4832492146ab00fc072884fddd13056341 Author: Lei Zhang AuthorDate: Wed Mar 13 13:20:28 2024 +0800 Disable insecure spring boot actuator endpoints by default. Spring Boot Actuator only exposes the /actuator/health /actuator/info endpoint by default --- alpha/alpha-server/src/main/resources/application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpha/alpha-server/src/main/resources/application.yaml b/alpha/alpha-server/src/main/resources/application.yaml index 59ed23f8..3cb99aa7 100644 --- a/alpha/alpha-server/src/main/resources/application.yaml +++ b/alpha/alpha-server/src/main/resources/application.yaml @@ -140,7 +140,7 @@ management: endpoints: web: exposure: -include: "*" +include: "health,info" health: redis: enabled: false
(servicecomb-pack) branch master updated: SCB-2858 Bump maven from 3.5.2 to 3.6.3
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
The following commit(s) were added to refs/heads/master by this push:
new 10bd2b43 SCB-2858 Bump maven from 3.5.2 to 3.6.3
10bd2b43 is described below
commit 10bd2b432b3d21e4b5b1bf7ad66aa416ace86588
Author: Lei Zhang
AuthorDate: Fri Feb 2 16:12:29 2024 +0800
SCB-2858 Bump maven from 3.5.2 to 3.6.3
---
.mvn/wrapper/MavenWrapperDownloader.java | 107 ---
.mvn/wrapper/maven-wrapper.properties| 35 ++---
mvnw | 226 +--
mvnw.cmd | 86 +---
4 files changed, 207 insertions(+), 247 deletions(-)
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java
b/.mvn/wrapper/MavenWrapperDownloader.java
deleted file mode 100755
index 77b50e81..
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * 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.
- */
-
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-/**
- * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl'
is provided.
- */
-private static final String DEFAULT_DOWNLOAD_URL =
-
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar;;
-
-/**
- * Path to the maven-wrapper.properties file, which might contain a
downloadUrl property to
- * use instead of the default one.
- */
-private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-".mvn/wrapper/maven-wrapper.properties";
-
-/**
- * Path where the maven-wrapper.jar will be saved to.
- */
-private static final String MAVEN_WRAPPER_JAR_PATH =
-".mvn/wrapper/maven-wrapper.jar";
-
-/**
- * Name of the property which should be used to override the default
download url for the wrapper.
- */
-private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-public static void main(String args[]) {
-System.out.println("- Downloader started");
-File baseDirectory = new File(args[0]);
-System.out.println("- Using base directory: " +
baseDirectory.getAbsolutePath());
-
-// If the maven-wrapper.properties exists, read it and check if it
contains a custom
-// wrapperUrl parameter.
-File mavenWrapperPropertyFile = new File(baseDirectory,
MAVEN_WRAPPER_PROPERTIES_PATH);
-String url = DEFAULT_DOWNLOAD_URL;
-if(mavenWrapperPropertyFile.exists()) {
-FileInputStream mavenWrapperPropertyFileInputStream = null;
-try {
-mavenWrapperPropertyFileInputStream = new
FileInputStream(mavenWrapperPropertyFile);
-Properties mavenWrapperProperties = new Properties();
-
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-url =
mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-} catch (IOException e) {
-System.out.println("- ERROR loading '" +
MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-} finally {
-try {
-if(mavenWrapperPropertyFileInputStream != null) {
-mavenWrapperPropertyFileInputStream.close();
-}
-} catch (IOException e) {
-// Ignore ...
-}
-}
-}
-System.out.println("- Downloading from: : " + url);
-
-File outputFile = new File(baseDirectory.getAbsolutePath(),
MAVEN_WRAPPER_JAR_PATH);
-if(!outputFile.getParentFile().exists()) {
-if(!outputFile.getParentFile().mkdirs()) {
-System.out.println(
-"- ERROR creating output direcrory '" +
outputFile.getParentFile().getAbsolutePath() + "'");
-}
-}
-System.out.println("- Downloading to: " +
outputFile.getAbsolutePath());
-try {
-downloadFileFromURL(url, outputFile);
-System.
(servicecomb-pack) branch master updated: Bump @angular/core in /web/src/main/resources/saga-frontend
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 The following commit(s) were added to refs/heads/master by this push: new 8226199b Bump @angular/core in /web/src/main/resources/saga-frontend 8226199b is described below commit 8226199b9d95e734b890fe61b0fcecf8f5e606fe Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Aug 22 05:26:27 2023 + Bump @angular/core in /web/src/main/resources/saga-frontend Bumps [@angular/core](https://github.com/angular/angular/tree/HEAD/packages/core) from 6.0.0 to 11.0.5. - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/11.0.5/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/11.0.5/packages/core) --- updated-dependencies: - dependency-name: "@angular/core" dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- web/src/main/resources/saga-frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/main/resources/saga-frontend/package.json b/web/src/main/resources/saga-frontend/package.json index 720b971c..c2dd95a6 100644 --- a/web/src/main/resources/saga-frontend/package.json +++ b/web/src/main/resources/saga-frontend/package.json @@ -27,7 +27,7 @@ "@angular/animations": "6.0.0", "@angular/common": "6.0.0", "@angular/compiler": "6.0.0", -"@angular/core": "6.0.0", +"@angular/core": "11.0.5", "@angular/forms": "6.0.0", "@angular/http": "6.0.0", "@angular/platform-browser": "6.0.0",
(servicecomb-pack) branch master updated: Bump bootstrap in /web/src/main/resources/saga-frontend
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 The following commit(s) were added to refs/heads/master by this push: new 12613bff Bump bootstrap in /web/src/main/resources/saga-frontend 12613bff is described below commit 12613bfffdd269f19b762bc6e1c30b7c733a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Aug 22 05:26:24 2023 + Bump bootstrap in /web/src/main/resources/saga-frontend Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.0.0 to 4.3.1. - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](https://github.com/twbs/bootstrap/compare/v4.0.0...v4.3.1) --- updated-dependencies: - dependency-name: bootstrap dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- web/src/main/resources/saga-frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/main/resources/saga-frontend/package.json b/web/src/main/resources/saga-frontend/package.json index 4a7f09d8..720b971c 100644 --- a/web/src/main/resources/saga-frontend/package.json +++ b/web/src/main/resources/saga-frontend/package.json @@ -38,7 +38,7 @@ "@nebular/theme": "2.0.0-rc.10", "@ng-bootstrap/ng-bootstrap": "1.0.0", "angular2-toaster": "6.0.0", -"bootstrap": "4.0.0", +"bootstrap": "4.3.1", "classlist.js": "1.1.20150312", "core-js": "2.5.1", "express": "^4.16.4",
(servicecomb-pack) branch master updated (8226199b -> 17300082)
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 8226199b Bump @angular/core in /web/src/main/resources/saga-frontend add 17300082 Bump grpc-protobuf from 1.44.1 to 1.53.0 in /pack-dependencies No new revisions were added by this update. Summary of changes: pack-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[servicecomb-pack] branch dependabot/maven/pack-dependencies/io.netty-netty-handler-4.1.94.Final updated (c5a7b0a3 -> b323df4a)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch dependabot/maven/pack-dependencies/io.netty-netty-handler-4.1.94.Final in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git from c5a7b0a3 Bump netty-handler in /pack-dependencies add 050699f4 Bump netty-codec-http in /pack-dependencies add b323df4a Merge branch 'master' into dependabot/maven/pack-dependencies/io.netty-netty-handler-4.1.94.Final No new revisions were added by this update. Summary of changes: pack-dependencies/pom.xml | 1 + 1 file changed, 1 insertion(+)
[servicecomb-pack] branch master updated (b2c4dd4f -> 050699f4)
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 b2c4dd4f Merge pull request #771 from apache/SCB-2727 add 050699f4 Bump netty-codec-http in /pack-dependencies No new revisions were added by this update. Summary of changes: pack-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[servicecomb-pack] 01/01: SCB-2727 Using integrity to verify the js and css files
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch SCB-2727 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git commit 0081089a7fce7c098547cc5b68bf64076037a213 Author: Willem Jiang AuthorDate: Fri Nov 18 18:36:43 2022 +0800 SCB-2727 Using integrity to verify the js and css files --- web/src/main/resources/static/detail.html | 2 +- web/src/main/resources/static/request.html | 10 +- web/src/main/resources/static/result.html | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/src/main/resources/static/detail.html b/web/src/main/resources/static/detail.html index ef7cbe08..daaa7363 100755 --- a/web/src/main/resources/static/detail.html +++ b/web/src/main/resources/static/detail.html @@ -20,7 +20,7 @@ Detail http://code.jquery.com/jquery-1.12.4.min.js"</a>; integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"> https://cdnjs.cloudflare.com/ajax/libs/raphael/1.3.2/raphael-min.js"</a>; integrity="sha256-5C/soUzPY/Tqibm8m0ScOsVh++6jF/FIe7EwzCJNc9I=" crossorigin="anonymous"> - https://cdnjs.cloudflare.com/ajax/libs/graphdracula/1.0.3/dracula.min.js"</a>;> + https://cdnjs.cloudflare.com/ajax/libs/graphdracula/1.0.3/dracula.min.js"</a>; integrity="sha384-aXfg8XqWGUVAJP52yC2HsTDAqjI2PMGT+Ssh3/UtNXIhwnQLsL2sa8EA/VPSQqfn" crossorigin="anonymous"> var redraw; var height = 600; diff --git a/web/src/main/resources/static/request.html b/web/src/main/resources/static/request.html index aed6f0a3..7ff473ee 100644 --- a/web/src/main/resources/static/request.html +++ b/web/src/main/resources/static/request.html @@ -21,13 +21,13 @@ <link rel="stylesheet" href="css/style.css" type="text/css"> <link rel="stylesheet" href="css/request.css" type="text/css"> <link rel="stylesheet" href="<a rel="nofollow" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"">https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"</a>; integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> - <link rel="stylesheet" href="<a rel="nofollow" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.4/css/bootstrap2/bootstrap-switch.min.css"">https://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.4/css/bootstrap2/bootstrap-switch.min.css"</a>; type="text/css"> - <link rel="stylesheet" href="<a rel="nofollow" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.13/css/bootstrap-multiselect.css"">https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.13/css/bootstrap-multiselect.css"</a>; /> - + <link rel="stylesheet" href="<a rel="nofollow" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.4/css/bootstrap2/bootstrap-switch.min.css"">https://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.4/css/bootstrap2/bootstrap-switch.min.css"</a>; integrity="sha384-bDkCW2W9XKz0K2L7w7J7mse8GRURBXv490SjeqNLlveePQ1mzj21t11q1bVl6g3V" crossorigin="anonymous"> + <link rel="stylesheet" href="<a rel="nofollow" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.13/css/bootstrap-multiselect.css"">https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.13/css/bootstrap-multiselect.css"</a>; integrity="sha384-l1tju+TyzPCuWXt+knuFYVhe2ZnnEm0/t9T8BmqNedtIBYj1fmsYrIAap4MU2amm" crossorigin="anonymous"> + <script src="<a rel="nofollow" href="http://code.jquery.com/jquery-1.12.4.min.js"">http://code.jquery.com/jquery-1.12.4.min.js"</a>; integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"> https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"</a>; integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"> - https://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.4/js/bootstrap-switch.min.js"</a>;> - https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.13/js/bootstrap-multiselect.min.js"</a>;> + https://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.4/js/bootstrap-switch.min.js"</a>; integrity
[servicecomb-pack] branch SCB-2727 created (now 0081089a)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2727 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git at 0081089a SCB-2727 Using integrity to verify the js and css files This branch includes the following new commits: new 0081089a SCB-2727 Using integrity to verify the js and css files The 1 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.
[servicecomb-pack] branch master updated: update org.apache.commons:commons-dbcp2 2.1.1 to 2.9.0
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 The following commit(s) were added to refs/heads/master by this push: new 9c1396b4 update org.apache.commons:commons-dbcp2 2.1.1 to 2.9.0 9c1396b4 is described below commit 9c1396b4cab4ecd653265f2de019918a7a8a064d Author: claire9910 <115456186+claire9...@users.noreply.github.com> AuthorDate: Sat Oct 15 22:01:49 2022 +0800 update org.apache.commons:commons-dbcp2 2.1.1 to 2.9.0 --- demo/saga-dubbo-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/saga-dubbo-demo/pom.xml b/demo/saga-dubbo-demo/pom.xml index a21ffd75..dfa99a74 100644 --- a/demo/saga-dubbo-demo/pom.xml +++ b/demo/saga-dubbo-demo/pom.xml @@ -77,7 +77,7 @@ org.apache.commons commons-dbcp2 - 2.1.1 + 2.9.0
[servicecomb-pack] branch master updated: Bump protobuf-java from 3.19.2 to 3.19.6 in /pack-dependencies
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 The following commit(s) were added to refs/heads/master by this push: new 77b30a72 Bump protobuf-java from 3.19.2 to 3.19.6 in /pack-dependencies 77b30a72 is described below commit 77b30a72e11546fa63f1d4b7d4a4326918630a8b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Oct 4 23:33:49 2022 + Bump protobuf-java from 3.19.2 to 3.19.6 in /pack-dependencies Bumps [protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.19.2 to 3.19.6. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.19.2...v3.19.6) --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-java dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pack-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml index 080637cb..f60c955c 100644 --- a/pack-dependencies/pom.xml +++ b/pack-dependencies/pom.xml @@ -91,7 +91,7 @@ 2.2 1.2 3.6 -3.19.2 +3.19.6 0.45
[servicecomb-pack] 02/03: SCB-2679 Move test cases to the correct location
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 bbc42c8e405b7b37fabc81b697b5097145f5e1bb
Author: Lei Zhang
AuthorDate: Sun Sep 4 18:34:03 2022 +0800
SCB-2679 Move test cases to the correct location
---
.../saga/db/AlphaIntegrationWithSpecSagaDbTest.java} | 12 +---
...lphaIntegrationWithSpecSagaDbWithRandomPortTest.java} | 16 ++--
.../db/AlphaIntegrationWithSpecSagaDbWithSSLTest.java} | 12 +---
.../alpha/spec/tcc/db/test/AlphaTccEventController.java | 1 +
4 files changed, 29 insertions(+), 12 deletions(-)
diff --git
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationTest.java
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbTest.java
similarity index 98%
rename from
alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationTest.java
rename to
alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbTest.java
index 07994265..1056d3a8 100644
---
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationTest.java
+++
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.pack.alpha.server;
+package org.apache.servicecomb.pack.alpha.spec.saga.db;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -48,6 +48,8 @@ import java.util.function.Consumer;
import javax.annotation.PostConstruct;
import org.apache.servicecomb.pack.alpha.core.*;
+import org.apache.servicecomb.pack.alpha.server.AlphaApplication;
+import org.apache.servicecomb.pack.alpha.server.AlphaConfig;
import org.apache.servicecomb.pack.alpha.spec.saga.db.CommandEntityRepository;
import
org.apache.servicecomb.pack.alpha.spec.saga.db.TxEventEnvelopeRepository;
import
org.apache.servicecomb.pack.alpha.spec.saga.db.TxTimeoutEntityRepository;
@@ -78,9 +80,13 @@ import org.springframework.test.context.junit4.SpringRunner;
"alpha.server.host=0.0.0.0",
"alpha.server.port=8090",
"alpha.event.pollingInterval=1",
-"spring.main.allow-bean-definition-overriding=true"
+"spring.main.allow-bean-definition-overriding=true",
+"alpha.spec.names=saga-db",
+"alpha.spec.saga.db.datasource.username=sa",
+"alpha.spec.saga.db.datasource.url=jdbc:hsqldb:mem:saga",
+"alpha.spec.saga.db.cluster.enabled=false"
})
-public class AlphaIntegrationTest {
+public class AlphaIntegrationWithSpecSagaDbTest {
private static final int port = 8090;
protected static ManagedChannel clientChannel;
diff --git
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithRandomPortTest.java
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbWithRandomPortTest.java
similarity index 97%
rename from
alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithRandomPortTest.java
rename to
alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbWithRandomPortTest.java
index 6ec5a727..a47246e7 100644
---
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithRandomPortTest.java
+++
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbWithRandomPortTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.pack.alpha.server;
+package org.apache.servicecomb.pack.alpha.spec.saga.db;
import com.google.protobuf.ByteString;
import io.grpc.ManagedChannel;
@@ -23,9 +23,9 @@ import io.grpc.netty.NettyChannelBuilder;
import io.grpc.stub.StreamObserver;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.servicecomb.pack.alpha.core.*;
-import org.apache.servicecomb.pack.alpha.spec.saga.db.CommandEntityRepository;
-import
org.apache.servicecomb.pack.alpha.spec.saga.db.TxEventEnvelopeRepository;
-import
org.apache.servicecomb.pack.alpha.spec.saga.db.TxTimeoutEntityRepository;
+import org.apache.servicecomb.pack.alpha.server.AlphaApplication;
+import org.apache.servicecomb.pack.alpha.server.AlphaConfig;
+import org.apache.servicecomb.pack.alpha.server.ServerStartable;
import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.pack.contract.grpc.*;
import
org.apache.servicecomb.pack.con
[servicecomb-pack] 03/03: SCB-2679 Add table master_lock to schema.sql for test
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 e802aaff92686ec0c9537689cff97e9499d17ee8 Author: Lei Zhang AuthorDate: Sun Sep 4 18:36:18 2022 +0800 SCB-2679 Add table master_lock to schema.sql for test --- alpha/alpha-server/src/test/resources/schema.sql | 6 ++ 1 file changed, 6 insertions(+) diff --git a/alpha/alpha-server/src/test/resources/schema.sql b/alpha/alpha-server/src/test/resources/schema.sql index 292ade75..2b57211c 100644 --- a/alpha/alpha-server/src/test/resources/schema.sql +++ b/alpha/alpha-server/src/test/resources/schema.sql @@ -101,3 +101,9 @@ CREATE TABLE IF NOT EXISTS tcc_tx_event ( lastModified TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL ); +CREATE TABLE IF NOT EXISTS master_lock ( + serviceName varchar(36) NOT NULL PRIMARY KEY, + expireTime TIMESTAMP NOT NULL, + lockedTime TIMESTAMP NOT NULL, + instanceId varchar(255) NOT NULL +); \ No newline at end of file
[servicecomb-pack] 01/03: SCB-2679 Add a refactored module to coverage aggregate
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 415f960adbe9c8408e0ef9e0be1ef2255f2e2b8e Author: Lei Zhang AuthorDate: Sun Sep 4 18:33:10 2022 +0800 SCB-2679 Add a refactored module to coverage aggregate --- integration-tests/coverage-aggregate/pom.xml | 12 1 file changed, 12 insertions(+) diff --git a/integration-tests/coverage-aggregate/pom.xml b/integration-tests/coverage-aggregate/pom.xml index 45733f06..f3cd3d20 100644 --- a/integration-tests/coverage-aggregate/pom.xml +++ b/integration-tests/coverage-aggregate/pom.xml @@ -69,6 +69,18 @@ org.apache.servicecomb.pack alpha-core + + org.apache.servicecomb.pack + alpha-spec-saga-akka + + + org.apache.servicecomb.pack + alpha-spec-saga-db + + + org.apache.servicecomb.pack + alpha-spec-tcc-db + org.apache.servicecomb.pack alpha-server
[servicecomb-pack] branch master updated (5dda9dc1 -> e802aaff)
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 5dda9dc1 Bump gson from 2.8.4 to 2.8.9 in /pack-dependencies
new 415f960a SCB-2679 Add a refactored module to coverage aggregate
new bbc42c8e SCB-2679 Move test cases to the correct location
new e802aaff SCB-2679 Add table master_lock to schema.sql for test
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:
.../saga/db/AlphaIntegrationWithSpecSagaDbTest.java} | 12 +---
...lphaIntegrationWithSpecSagaDbWithRandomPortTest.java} | 16 ++--
.../db/AlphaIntegrationWithSpecSagaDbWithSSLTest.java} | 12 +---
alpha/alpha-server/src/test/resources/schema.sql | 6 ++
.../alpha/spec/tcc/db/test/AlphaTccEventController.java | 1 +
integration-tests/coverage-aggregate/pom.xml | 12
6 files changed, 47 insertions(+), 12 deletions(-)
rename
alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/{server/AlphaIntegrationTest.java
=> spec/saga/db/AlphaIntegrationWithSpecSagaDbTest.java} (98%)
rename
alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/{server/AlphaIntegrationWithRandomPortTest.java
=> spec/saga/db/AlphaIntegrationWithSpecSagaDbWithRandomPortTest.java} (97%)
rename
alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/{server/AlphaIntegrationWithSSLTest.java
=> spec/saga/db/AlphaIntegrationWithSpecSagaDbWithSSLTest.java} (81%)
[servicecomb-website] branch asf-site updated: Publish the website of ServiceComb
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new c87020de Publish the website of ServiceComb
c87020de is described below
commit c87020de16948b83deb7c7839966c09bb67662ab
Author: Willem Jiang
AuthorDate: Tue Aug 9 10:11:51 2022 +0800
Publish the website of ServiceComb
---
content/cn/index.html| 2 +-
content/cn/release/index.html| 5 +-
content/cn/release/pack-downloads/index.html | 7 +-
content/cn/release/pack-release-notes/index.html | 12 ++-
content/feed.xml | 2 +-
content/index.html | 2 +-
content/release/index.html | 5 +-
content/release/pack-downloads/index.html| 7 +-
content/release/pack-release-notes/index.html| 12 ++-
content/sitemap.xml | 112 +++
10 files changed, 95 insertions(+), 71 deletions(-)
diff --git a/content/cn/index.html b/content/cn/index.html
index 567cf2c1..47beca89 100644
--- a/content/cn/index.html
+++ b/content/cn/index.html
@@ -323,7 +323,7 @@
最新新闻
left_ul li{width:100%}
- Apache
ServiceComb Java-Chassis 发布 2.7.0 Apache ServiceComb 社区 暑假coding 2020 活动 Apache ServiceComb Pack 发布0.7.0
Apache ServiceComb
Service-Center 发布 2.1.0 Apache ServiceComb Toolkit 发布0.2.0
+ Apache
ServiceComb Java-Chassis 发布 2.7.0 Apache ServiceComb 社区 暑假coding 2020 活动 Apache ServiceComb Pack 发布 0.7.1
Apache ServiceComb
Service-Center 发布 2.1.0 Apache ServiceComb Toolkit 发布0.2.0
Apache
ServiceComb 社区接受新开普软件研究院的代码捐赠 Apache
ServiceComb 社区meetup及新品发布 Apache ServiceComb
荣获中国开源云联盟组织的中国优秀开源项目一等奖 Apache ServiceComb
社区联合传智播客的黑马程序员、博学谷、传智汇子品牌发布微服务化教程 https://gitter [...]
diff --git a/content/cn/release/index.html b/content/cn/release/index.html
index 19b22193..57b87195 100644
--- a/content/cn/release/index.html
+++ b/content/cn/release/index.html
@@ -533,10 +533,7 @@
-ServiceComb Pack 0.7.0
(released on 2022-05-16)
-
-
-ServiceComb Pack 0.6.0
(released on 2020-05-26)
+ServiceComb Pack 0.7.1
(released on 2022-08-09)
ServiceComb
Service-Center 2.1.0 (released on 2022-03-15)
diff --git a/content/cn/release/pack-downloads/index.html
b/content/cn/release/pack-downloads/index.html
index 98e82e80..75055fb2 100644
--- a/content/cn/release/pack-downloads/index.html
+++ b/content/cn/release/pack-downloads/index.html
@@ -537,7 +537,12 @@
- Apache ServiceComb Pack 0.7.0(LATEST)
+ Apache ServiceComb Pack 0.7.1(LATEST)
+ https://dlcdn.apache.org/servicecomb/servicecomb-pack/0.7.1/apache-servicecomb-pack-distribution-0.7.1-src.zip;>[src]
https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.1/apache-servicecomb-pack-distribution-0.7.1-src.zip.asc;>[asc]
https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.1/apache-servicecomb-pack-distribution-0.7.1-src.zip.sha512;>[sha512]
+ https://dlcdn.apache.org/servicecomb/servicecomb-pack/0.7.1/apache-servicecomb-pack-distribution-0.7.1-bin.zip;>[Binary]
https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.1/apache-servicecomb-pack-distribution-0.7.1-bin.zip.asc;>[asc]
https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.1/apache-servicecomb-pack-distribution-0.7.1-bin.zip.sha512;>[sha512]
+
+
+ Apache ServiceComb Pack 0.7.0
https://dlcdn.apache.org/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip;>[src]
https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip.asc;>[asc]
https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip.sha512;>[sha512]
https://dlcdn.apache.org/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-bin.zip;>[Binary]
https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-bin.zip.asc;>[asc]
https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-bin.zip.sha512;>[sha512]
diff --git a/content/cn/release/pack-release-notes/index.html
b/content/cn/release/pack-release-notes/index.html
index 17ae2c05..8c8d590d 100644
--- a/content/cn/release/pack-release-notes/index.html
+++ b/content/cn/release/pack-release-notes/index.html
@@ -525,7 +525,17 @@
-Release Notes - Apache
ServiceComb - Version pack-0.7.0
+Release Notes - Apache
ServiceComb - Version pack-0.7.1
+
+
+Sub-task
+
+
+[https://issues.apache.org/jira/browse/SCB-2657;>SCB-2657] -
[servicecomb-website] branch master updated: Pack Release 0.7.1 (#297)
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-website.git The following commit(s) were added to refs/heads/master by this push: new de4f9edb Pack Release 0.7.1 (#297) de4f9edb is described below commit de4f9edb9d27324285af13e5b283d57cda125ae8 Author: Lei Zhang AuthorDate: Tue Aug 9 10:08:48 2022 +0800 Pack Release 0.7.1 (#297) --- _pages/cn/home.md| 2 +- _pages/home.md | 2 +- _release/cn/pack_downloads.md| 15 --- _release/cn/pack_releaseNotes.md | 9 + _release/cn/release.md | 4 +--- _release/pack_downloads.md | 15 --- _release/pack_releaseNotes.md| 8 _release/release.md | 4 +--- 8 files changed, 37 insertions(+), 22 deletions(-) diff --git a/_pages/cn/home.md b/_pages/cn/home.md index 36081906..8fb3fff5 100755 --- a/_pages/cn/home.md +++ b/_pages/cn/home.md @@ -28,7 +28,7 @@ intro: Apache ServiceComb 社区 暑假coding 2020 活动 - Apache ServiceComb Pack 发布0.7.0 + Apache ServiceComb Pack 发布 0.7.1 Apache ServiceComb Service-Center 发布 2.1.0 diff --git a/_pages/home.md b/_pages/home.md index 9ca1b6f9..24c8103e 100755 --- a/_pages/home.md +++ b/_pages/home.md @@ -28,7 +28,7 @@ intro: Apache ServiceComb Summer Code 2020 -Apache ServiceComb Pack 0.7.0 is released +Apache ServiceComb Pack 0.7.1 is released Apache ServiceComb Service-Center Release Version 2.1.0 diff --git a/_release/cn/pack_downloads.md b/_release/cn/pack_downloads.md index 94ca3d71..58a79627 100644 --- a/_release/cn/pack_downloads.md +++ b/_release/cn/pack_downloads.md @@ -9,13 +9,14 @@ last_modified_at: 2022-05-16T00:50:43-55:00 ## 发布包 -| 版本号 | 源码| 发布包 | -| -- | - | - | -|**Apache ServiceComb Pack 0.7.0(LATEST)**|[[src]](https://dlcdn.apache.org/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip) [[asc]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip.asc) [[sha512]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip.sha512)|[[Binary]](https://dlcdn.apache.org/servicecomb/servicecomb-pack/0.7. [...] -|Apache ServiceComb Pack 0.6.0|[[src]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip) [[asc]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip.asc) [[sha512]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip.sha512)|[[Binary]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-pac [...] -|Apache ServiceComb Pack 0.5.0 |[[src]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-pack/0.5.0/apache-servicecomb-pack-distribution-0.5.0-src.zip) [[asc]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.5.0/apache-servicecomb-pack-distribution-0.5.0-src.zip.asc) [[sha512]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.5.0/apache-servicecomb-pack-distribution-0.5.0-src.zip.sha512)|[[Binary]](https://apache.org/dyn/closer.cgi/servicecomb/ser [...] -|Apache ServiceComb Pack 0.4.0 |[[src]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.4.0/apache-servicecomb-pack-distribution-0.4.0-src.zip) [[asc]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.4.0/apache-servicecomb-pack-distribution-0.4.0-src.zip.asc) [[sha512]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.4.0/apache-servicecomb-pack-distribution-0.4.0-src.zip.sha512)|[[Binary]](https://archive.apache.org/dist/servicecomb [...] -|Apache ServiceComb Pack 0.3.0 |[[src]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.3.0/apache-servicecomb-pack-distribution-0.3.0-src.zip) [[asc]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.3.0/apache-servicecomb-pack-distribution-0.3.0-src.zip.asc) [[sha512]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.3.0/apache-servicecomb-pack-distribution-0.3.0-src.zip.sha512)|[[Binary]](https://archive.apache.org/dist/servicecomb [...] +| 版本号 | 源码
svn commit: r56170 - /release/servicecomb/KEYS
Author: ningjiang Date: Mon Aug 8 09:17:15 2022 New Revision: 56170 Log: Added KEYS from dev/servicecomb to release/servicecomb Modified: release/servicecomb/KEYS Modified: release/servicecomb/KEYS == --- release/servicecomb/KEYS (original) +++ release/servicecomb/KEYS Mon Aug 8 09:17:15 2022 @@ -98,6 +98,162 @@ yZ/vv8enrX1JX9NDlovZ6olLZeSfnY2aZp93b6eh =SLFO -END PGP PUBLIC KEY BLOCK- -BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1 + +mQINBF1ojpYBEAD3/eOzKouAn2O0FIUPmzOeXjwAfzo8s7Q17fCCsLRsrrZdR4o9 +XF2zra5TCBwVFdaYtljP4bnAdcwHIwVlU1w6f3FIhxBTP3NEdqZsEkug2eVf2JXa +MSlNlLixKAKbtamAt91R929+D8Lvd6SUCgoLzv36MnnEqdvkayCwfgChWnIC9iKC +dNqTdLGNYqEW0ndIPnWe39ryqUqhKocvHPsLs5EpJu2/NdukT2W4JY/EipOosmsl +q7QNL14tMzjslHe7WWjV1RR1JcJYVtl11S60f+YnnLBmznF6fGF4w1QiGHqO+vXU +CSNqENTGTKGpiXc7HUzZVS1POvUmelEFScSw6uXdGKa6TZUf20PE0QqDT3bp9M1L +V8S7VX7sZpE7tXCx//T36InX2wir6xuV3SDvPWo6Tx49eLPCaEUVaIt21Seaew/A +VMh9pTuICJDYa7aJJz84Eee6ZWBGP/APl8zxcE2+npaOLWINXechB17GBREizy3y ++LsvH3h8RfPKZcnU+FiOX3GEVagyfoh0rjtnDlF8qTldIncbcSfkhZR7q+eN4hsE +1gcwDFIgKZeh+WXLIp4TJUvlxJEC7+fRxQBJnSS02zLC/8ZOJI8TEwH0I047el1p +DzDnBaG25YgbKgYxX7NpPFO36YrdKDjXCodEcdBXFidd+ozMBDcrKrP8FwARAQAB +tCl4aWFvbGlhbmcgdGlhbiA8dGlhbnhpYW9saWFuZ0BhcGFjaGUub3JnPokCOAQT +AQIAIgUCXWiOlgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQzuuveiSN +cc27AA//ZpOibNhZRMHpMszdHLS2pLJWQIcRIVKTnznpAr2Mky/IR2Lv07PG3XSz +xDXRSyaPT3T5H9yDRkknMiVZVuwwTRSQoVIkHBAglGIwMpeJ4LPmw+Hi2F7QI6PO +NfmUIs8HclvahJagHAdPhL+hqQPn/2PV++7g2YuyFlWUzgR+ZiuAV+OFEjqMtRzE +yVgj10CUeIJdVNSdRcnu1oOEbcIpuIzsj4slIZqhce4qs8phl/fq2h+9RMXb8eTg +L2cT6Ei0DOObGJ2J+Pup7WM9cFeYfkczEcKl/sLmnTFVZojsSXd6Ouon4G7hr2fD +IV1VXOUtzseMxyvhtH4fKiEMfGQggKhxpUwpZLgkgi7vTWSS8o2r6xawdQiCAYcp +XkhmwqajebsFfKbozdbK4l6hgzdmoPI2fed/RRP/hbF2nbcG4/4idLyz/hJkSDGH +7z70Ic3MzEFeKIDG+3UFsGDT1PNm2vdO6+UOO2yYuumTn0bMrEHtQBUDKN5yX3vP +bHEN3flGU5euTFuFXTYrMWQr/UupUOjvjot/hgs6ZIK5jBHm6xOtkN3XaZuZ0+yV +3eT1VetLacwcjUYtCZQGxxsL2LYsTzPFtUInjLfq7sA56ImKUDQiFdA16BV4SqhU +01SivI+3Vhs6t2N4eLIo8ELDi9uJ74uCncB+KAsB2R3LrPS2rAa5Ag0EXWiOlgEQ +ALrzpvmWUBG5q1+HnwHz/nurIX+0wmZtmp9KIl/LBiJOLu8G5/B5nX24LMlL/smV +lv2NJB3klrXLLe8GXa8zRJTzp/q9qpRwf+zQU/JnWPCvFn2htHdUso4cmuiCtnll +yAveS7K4mgWEjPPv8JJ24uAm6iIei2I+FP1T6JfT3AoDc19DWYNmQl4xFPBoE0aD +MOLSRdifzWgcOP5Be8T4SPPk55W6lofX634Lx/N0Cu5gsE6uRxZqK/ZZMc0fmJpT +XDYTAIMvRFxCEcYNiHyIxL7orJmXUfVao3KVRb/bVNMQld5cu1WkrZrArPWaQG9r +eXKQNROCUVq4ImF8m1nrTU0iZ0CahfpXdV3kmlnfK5IY4sm5RqCfIiimzTHpE1i9 +DmjXMNbtIK+CYVil8ARARzYwNdA8saVRyR8AvvrvhMRWcHnO5csC7/PYaWpqxiyS +j13Qg3g8vA/swFCqOoljOX2N6Nd8hKATzZzAjEQL3h5VUXfGnXmVR4SexXOloCMA +DWUrcO9/oF60+H1tpmwCEO9n970hiMcPjh1IU/Rsxxnklkzz89tXBT3XZ+bQG/bL +FFO3msc3jJrYxrizauykV2aqznSjYmWJx/pLHJ+DSlkuLSEO6P0KzaXMRaXIB7ni +Gkjm6s42RgA1hBBBghtS8lHRjgwIPvUB4MhiGGydTjzzABEBAAGJAh8EGAECAAkF +Al1ojpYCGwwACgkQzuuveiSNcc2pag//a4jRbtJKejl4DEM9JpnYyMYlQpixx20M +hnFcDkUgAFpG7I0X9uERNEmQXi9kcfkgYGQRLUCWe9vKTXUAYpXIJA36OJmk+C1R +AW+U+QhcHBf2UNYpu603dJyMOXeaINaZutSCQT2DvZeRAZG7FWjKHGUnG6Psv+H4 +cb1N8GfNlo0ClMOCKrYkyT5qqdizMJYehtjUYIcWVsCQ47psbI+0MnNKUenDXxGo +/HI3bahSMMg9KYJNNPg37sHTnT3469uAsH+3y/Tz0gTdn1nDKU+TTxZcIOpmtvUf +9oqeI+mjABL7KW6p5/vUyXO1CAn22rISgF6WPBZBjktm7BuQEqUyo/C/PCA1lF2J +mIH5WVR5dSw+Q9REjd7cFOiAfecqNCo/jKv3KVdDXc0/c5bE04c7dq1gmJ6pCgEp +SLfYPniQuHGS9P3XswHiVej5sLVby4QTtFxyVRUAXiKFtrdvj9Y2fxkA7+2qQaPN +U7KKa2oY5zFuLMyxvCrcPqtyXaKPeR6Pikyi7qG3XkQxbHCU2hQc3Ipma1nb4+P9 ++OIrdRevWuZGSeKGGK/KsbFO8eU4eNvpMR1t0Gb322IptsYgl4sP1AlfbcfjbTCl +j4vgXfbL4qlSmlBwc6yHn+S6XmSGL2EUz2k/zQK/dfxkJSVnniFNZAaWONXk/zzB +4F3Gx8yZslQ= +=N0TT +-END PGP PUBLIC KEY BLOCK- +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1 + +mQINBF2xT4IBEADF34jubOC9QD8p20wSi9iMYURzU6oAbt/8fdxUfWpsvbzyhDmf +7QPJ3e8fLLPkdvR2AS88wkGPQRPwd3ErJt2HaHTQWbzlZBgDfzbwAPP6WLyc1009 +urz89V0ErX8/D8CRJO5mw9FhKw+cSOjmrWwI6e7IbfP1PGrKDzq0oQmIHmmFlcEU +D+jXWajpWsBOuJCotjyQY6LCPtHDKCmMFxgcIoEoInR6gZ3H9Rrn93xVbpKXsy71 +Ih+tSyNCwdcE01Z30iWIte71qTMMygsMCOvhO9Y4Gwjqzfm6Bw+GQbgq7udYvTJA +5oCa4SxGTkz2Pz6TQk94rEwA9mAO42mSWkdaydpm55XetSjKHEtqnQ5JOsFr0jhU +W0GManrHCYXIW9eLEpy/+j1bg3DsPGcgpzaAWVmjyTFq9Fo5aOKwuCE2GaOLF++d +ajh/GcEXXJjTBAwW39O3B49QG6HmCkI6g5ndeuXvd6PWsEX/6WO586NZlxtSqDTA +sUQ/+ufRfI7hhr81fXR/QTji2AKH5emDaW5ntMS8nye87so2kvodWUno7gsAQFQ9 +Rc4nHEHJV5FPJzog1WyOeU0sZdJKIJ/sZhfqR8DpDXCc6kgkH5eB3Yg7Sup4xdYr +xTB5Ybi+Ncq2qIn+wyTopryzxF1kfuCPGnv5uIYfqTnHKdaadZwtXv6OLwARAQAB +tC1saXViYW8gKENPREUgU0lHTklORyBLRVkpIDxsaXViYW9AYXBhY2hlLm9yZz6J +AjgEEwECACIFAl2xT4ICGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEEAs +sPd2pQD6IuwP/RBueUO6JHgP/RtcfHPp9FCJlKM+JhA5ZvRieAcFVv5wB+IXCDpd +8XLmIO2flJs77Emu/N1V9OhHEBNy7zpsUC9Hl3QQIp0fCKG3VfJaD0QjpfTeplqt +GKsSmXTnmXoR9fO8PAgDLO/uq8xPDodioyWkbNJDbvAWDIGnjEawaaZ5jIFf+7sa +3m/59yk5bKxYvp7P3WJIfQKhqL34DAi1Saby8k+o9AIxfgnjjyFzsg+Fe/nxLrIn +VSsoKUIav/Klw2Xm7Z3kCd3JnLXmME0eEec9zSrptiJIu9qe3UtKqM9gK93noZUV +Y6/6tWViTlt5KvikCLCLkp162Ivi+BWiRhBroUo9GlOg+CGTcBlipptS0L/df/zP
[servicecomb-website] branch asf-site updated: Publish the website of ServiceComb
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 316054dd Publish the website of ServiceComb
316054dd is described below
commit 316054dd30d1fcbbb8e9b461cc18e03e06d9d272
Author: Willem Jiang
AuthorDate: Mon Aug 8 15:41:44 2022 +0800
Publish the website of ServiceComb
---
content/feed.xml | 2 +-
content/release/pack-release-guide/index.html | 103 ---
content/sitemap.xml | 112 +-
3 files changed, 108 insertions(+), 109 deletions(-)
diff --git a/content/feed.xml b/content/feed.xml
index 87f3a5b0..d85d5659 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -1,4 +1,4 @@
-http://www.w3.org/2005/Atom; >https://jekyllrb.com/;
version="3.9.0">Jekyll2022-08-08T15:22:36+08:00/feed.xmlApache ServiceCombThe homepage of
ServiceComb{name=nil,
avatar= [...]
+http://www.w3.org/2005/Atom; >https://jekyllrb.com/;
version="3.9.0">Jekyll2022-08-08T15:39:39+08:00/feed.xmlApache ServiceCombThe homepage of
ServiceComb{name=nil,
avatar= [...]
p本次讲座得到广东工业大学计算机院学生会同学们的鼎力支持和参与。报名通道开放后，报名人数迅速达到150+，活动放在学校报告厅举办。即便在周日，同学们的热情仍然很高，给广东工业大学的同学们点赞。/p
diff --git a/content/release/pack-release-guide/index.html
b/content/release/pack-release-guide/index.html
index 850385e5..12e99749 100644
--- a/content/release/pack-release-guide/index.html
+++ b/content/release/pack-release-guide/index.html
@@ -5,7 +5,7 @@
Free for personal and commercial use under the MIT license
https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt
-->
-
+
@@ -31,7 +31,7 @@
-
+
@@ -157,7 +157,7 @@
- https://www.apache.org/img/servicecomb.png;>
+ https://www.apache.org/img/servicecomb.png;>
@@ -167,7 +167,7 @@
- 首页
+ Home
@@ -178,7 +178,7 @@
- 项目
+ Projects
@@ -193,18 +193,18 @@
-文档
+Documentation
-
+
-入门指南
+Getting
started
-用户手册
+Docs
-大咖视频
+Video
-常见问题
+FAQ
@@ -216,7 +216,7 @@
- 博文
+ Blogs
@@ -227,7 +227,7 @@
- 下载
+ Downloads
@@ -238,8 +238,7 @@
-
-English
+中文
@@ -256,7 +255,7 @@
- 首页 > ServiceComb Pack
Release Guide
+ Home > ServiceComb Pack
Release Guide
@@ -271,7 +270,7 @@
- 切换菜单
+ Toggle Menu
@@ -288,7 +287,7 @@
-发布说明
+Release Notes
@@ -296,7 +295,7 @@
-发布包
+Downloads
@@ -316,7 +315,7 @@
-发布说明
+Release
Notes
@@ -324,7 +323,7 @@
-发布包
+Downloads
@@ -344,7 +343,7 @@
-发布说明
+Release Notes
@@ -352,7 +351,7 @@
-发布包
+Downloads
@@ -372,7 +371,7 @@
-发布说明
+Release
Notes
@@ -380,7 +379,7 @@
-发布包
+Downloads
@@ -400,7 +399,7 @@
-发布说明
+Release
Notes
@@ -408,7 +407,7 @@
-发布包
+Downloads
@@ -428,7 +427,7 @@
-发布说明
+Release
Notes
@@ -436,7 +435,7 @@
[servicecomb-website] branch master updated: Fixed the pack_releaseGuide mulit-languages error
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-website.git The following commit(s) were added to refs/heads/master by this push: new 791ff5d0 Fixed the pack_releaseGuide mulit-languages error 791ff5d0 is described below commit 791ff5d01468ccaa19dff8c9b7a5328235fae63b Author: Willem Jiang AuthorDate: Mon Aug 8 15:39:02 2022 +0800 Fixed the pack_releaseGuide mulit-languages error --- README.md | 2 ++ _release/pack_releaseGuide.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e21302cd..2ccac96b 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,8 @@ Please sent your PR to the master branch instead of asf-site. * Start web browser to access `http://localhost:4000` +* Build the website `sudo bundle exec jekyll build` + # How to push the change to apache website [Follow This Script](script/release) diff --git a/_release/pack_releaseGuide.md b/_release/pack_releaseGuide.md index 6484cfe0..ee8cd0a5 100644 --- a/_release/pack_releaseGuide.md +++ b/_release/pack_releaseGuide.md @@ -1,6 +1,6 @@ --- title: "ServiceComb Pack Release Guide" -lang: cn +lang: en ref: release permalink: /release/pack-release-guide/ excerpt: "ServiceComb Pack Release Guide"
[servicecomb-website] branch asf-site updated: Publish the website of Apache ServiceComb
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 241b0212 Publish the website of Apache ServiceComb
241b0212 is described below
commit 241b021268d7800c1cc0855cedb6d0f59e452172
Author: Willem Jiang
AuthorDate: Mon Aug 8 15:26:45 2022 +0800
Publish the website of Apache ServiceComb
---
content/cn/developers/release-guide/index.html | 93 +-
content/cn/release/pack-release-guide/index.html | 1257 ++
content/developers/release-guide/index.html | 99 +-
content/feed.xml |2 +-
content/release/pack-release-guide/index.html| 1240 +
content/sitemap.xml | 408 +++
6 files changed, 2710 insertions(+), 389 deletions(-)
diff --git a/content/cn/developers/release-guide/index.html
b/content/cn/developers/release-guide/index.html
index aac63b3f..00d395a0 100644
--- a/content/cn/developers/release-guide/index.html
+++ b/content/cn/developers/release-guide/index.html
@@ -801,98 +801,7 @@ gvt restore
发行Pack
-准备和校验发行包
-
-
- 如果~/.gnupg中没有GPG密钥文件，则将GPG密钥文件拷贝至~/.gnupg文件夹。
- gpg.conf
- pubring.gpg
- random_seed
- secring.gpg
- trustdb.gpg
-
-
-
-更新~/.m2/settings.xml文件中的GPG密码。
-
-
-更新~/.m2/settings.xml文件中的Apache帐户用户名和密码。
-
- 克隆Pack代码。
-git clone
https://github.com/apache/servicecomb-pack.git
-
-
- 使用以下perl命令，替换所有pom.xml文件中的版本号并提交改动至本地。
-find . -name 'pom.xml'|xargs
perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g'
-
-
-
-在需要release的分支上打上准备发布版本的标签。
-
- 运行以下命令。
-mvn deploy -DskipTests -Prelease
-Pdistribution -Ppassphrase
-
-
-
-上述命令执行成功，所有的jar包都成功上传至临时仓库后，运行门槛测试以验证基本功能, 如果执行失败，需要解决问题，从步骤7重新开始。
-
-
-如果步骤7命令执行成功，则所有的jar包都已经成功上传至maven临时仓库。
-使用apache帐号登录到https://repository.apache.org/;>Apache
Nexus，点击“Staging
Repositories”，搜索“servicecomb-pack”，根据时间找到最近的pack相关的记录，close该条记录，得到maven临时仓库的链接，例如：https://repository.apache.org/content/repositories/orgapacheservicecomb-1385
-
- 将release分支以及标签分别push至主仓库。
-
-
-给发行包签名
-
-
-
-从临时仓库下载二进制包和源码包。
-
-
-生成二进制包和源码包的签名和校验和。
-
-
-上传发行包到https://dist.apache.org/repos/dist/dev/servicecomb/servicecomb-pack/;>Apache发行开发仓库.
-
-
-从SVN下载发行包，验证签名和校验。
-
-
-
-PMC批准
-
-
-
-发送投票邮件至 d...@servicecomb.apache.org，
发起PMC批准.
-
-
-
等待72小时，或者获得3票+1并且没有-1。如果有-1票，修正问题并从第1步重新开始。
-
-
-将投票结果发布到d...@servicecomb.apache.org。
-
-
-
-通告
-
-
-
-上传发行包至https://dist.apache.org/repos/dist/release/servicecomb/servicecomb-pack/;>Apache发行仓库。
-
-
-等待24小时，让所有镜像同步。
-
-
-将https://dist.apache.org/repos/dist/dev;>dev的文件移动到https://dist.apache.org/repos/dist/release;>release目录中，同时确认已经被存档,同时更新网站上相关链接。
-
-
-上传发行页面至ServiceComb网站。
-
-
-发送发行通告邮件到d...@servicecomb.apache.org， annou...@apache.org。
-
-
+请参考 ServiceComb Pack 发行指南
diff --git a/content/cn/release/pack-release-guide/index.html
b/content/cn/release/pack-release-guide/index.html
new file mode 100644
index ..3faec8d4
--- /dev/null
+++ b/content/cn/release/pack-release-guide/index.html
@@ -0,0 +1,1257 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ServiceComb Pack Release Guide - Apache ServiceComb
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ https://github.com/pages/apache/incubator-servicecomb-website/cn/release/pack-release-guide/;>
+ https://github.com/pages/apache/incubator-servicecomb-website/cn/release/pack-release-guide/;>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{
+ "@context" : "<a rel="nofollow" href="http://schema.org"">http://schema.org"</a>;,
+ "@type" : "Person",
+ "name" : "Apache ServiceComb",
+ "url" : "<a rel="nofollow" href="https://github.com/pages/apache/incubator-servicecomb-website"">https://github.com/pages/apache/incubator-servicecomb-website"</a>;,
+ "sameAs" : null
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ document.documentElement.className =
document.documentElement.className.replace(/\bno-js\b/g, '') + ' js ';
+
+https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.7.1/clipboard.min.js"</a>;>
+
+
+https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-MML-AM_CHTML"</a>;>
+
+
+https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css;
integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M"
crossorigin="anonymous">
+
+https://www.apachecon.com/event-images/snippet.js"</a>;>
+h
[servicecomb-website] branch master updated: Add ServiceComb Pack Release Guide (#296)
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-website.git The following commit(s) were added to refs/heads/master by this push: new 4e427a2f Add ServiceComb Pack Release Guide (#296) 4e427a2f is described below commit 4e427a2fde803ef8c5c47404f3202ef497d250a9 Author: Lei Zhang AuthorDate: Mon Aug 8 15:14:10 2022 +0800 Add ServiceComb Pack Release Guide (#296) * Add ServiceComb Pack Release Guide * Fix wrong link --- _developers/cn/release_guide.md | 68 + _developers/release_guide.md | 69 + _release/cn/pack_releaseGuide.md | 576 +++ _release/pack_releaseGuide.md| 562 ++ 4 files changed, 1141 insertions(+), 134 deletions(-) diff --git a/_developers/cn/release_guide.md b/_developers/cn/release_guide.md index 57e9ed86..0eb46a04 100755 --- a/_developers/cn/release_guide.md +++ b/_developers/cn/release_guide.md @@ -258,70 +258,4 @@ gvt restore ## 发行Pack -***准备和校验发行包*** - -1. 如果`~/.gnupg`中没有GPG密钥文件，则将GPG密钥文件拷贝至`~/.gnupg`文件夹。 - ``` - gpg.conf - pubring.gpg - random_seed - secring.gpg - trustdb.gpg - ``` - -2. 更新`~/.m2/settings.xml`文件中的GPG密码。 - -3. 更新`~/.m2/settings.xml`文件中的Apache帐户用户名和密码。 - -4. 克隆Pack代码。 -``` -git clone https://github.com/apache/servicecomb-pack.git -``` - -5. 使用以下perl命令，替换所有pom.xml文件中的版本号并提交改动至本地。 -``` -find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g' -``` -6. 在需要release的分支上打上准备发布版本的标签。 - -7. 运行以下命令。 -``` -mvn deploy -DskipTests -Prelease -Pdistribution -Ppassphrase -``` - -8. 上述命令执行成功，所有的jar包都成功上传至临时仓库后，运行门槛测试以验证基本功能, 如果执行失败，需要解决问题，从步骤7重新开始。 - -9. 如果步骤7命令执行成功，则所有的jar包都已经成功上传至maven临时仓库。 - 使用apache帐号登录到[Apache Nexus](https://repository.apache.org/)，点击“Staging Repositories”，搜索“servicecomb-pack”，根据时间找到最近的pack相关的记录，close该条记录，得到maven临时仓库的链接，例如：`https://repository.apache.org/content/repositories/orgapacheservicecomb-1385` - -10. 将release分支以及标签分别push至主仓库。 - -***给发行包签名*** - -13. 从临时仓库下载二进制包和源码包。 - -14. 生成二进制包和源码包的签名和校验和。 - -15. 上传发行包到[Apache发行开发仓库](https://dist.apache.org/repos/dist/dev/servicecomb/servicecomb-pack/). - -16. 从SVN下载发行包，验证签名和校验。 - -***PMC批准*** - -17. 发送投票邮件至 ***d...@servicecomb.apache.org***， 发起PMC批准. - -18. 等待72小时，或者获得3票+1并且没有-1。如果有-1票，修正问题并从***第1步***重新开始。 - -19. 将投票结果发布到d...@servicecomb.apache.org。 - -***通告*** - -20. 上传发行包至[Apache发行仓库](https://dist.apache.org/repos/dist/release/servicecomb/servicecomb-pack/)。 - -21. 等待24小时，让所有镜像同步。 - -22. 将[dev](https://dist.apache.org/repos/dist/dev)的文件移动到[release](https://dist.apache.org/repos/dist/release)目录中，同时确认已经被存档,同时更新网站上相关链接。 - -23. 上传发行页面至ServiceComb网站。 - -24. 发送发行通告邮件到d...@servicecomb.apache.org， annou...@apache.org。 +请参考 [ServiceComb Pack 发行指南](/cn/release/pack-release-guide) \ No newline at end of file diff --git a/_developers/release_guide.md b/_developers/release_guide.md index 4c0bea58..3283a37c 100755 --- a/_developers/release_guide.md +++ b/_developers/release_guide.md @@ -277,74 +277,9 @@ or [2.0.0 RP](https://github.com/apache/servicecomb-website/pull/240) 6. Send announcements to `d...@servicecomb.apache.org`， `annou...@apache.org`。 -## Major Steps for doing Saga Release - -***Make and Verify the Release*** -1. Clone the saga code. -``` -git clone https://github.com/apache/servicecomb-saga.git -``` - -2. Cut the release using per command to replace all the versions in pom.xml files - -3. Create a Tag from the master branch using the version number. -``` -find . -name 'pom.xml'|xargs perl -pi -e 's/1.0.0-m2-SNAPSHOT/1.0.0-m2/g' -``` - -4. Clear all the redundant servicecomb releases in repository.apache.org - -5. Add the keys in a reference folder. - -6. Update the key path and passphrase in your ~/.m2/settings.xml file. - -7. Update the apache account username and password in the settings.xml file. - -8. Run the maven deploy command. -``` -mvn deploy -DskipTests -Ppassphrase -Prelease -``` - -9. Once every thing is uploaded then use the staging repo to verify the build using the acceptance test. - -10. Share the staging repo with peers to verify on different OS and machines using the demo. - -11. If everything is fine then push the tag to master. - -12. Close the staging repo is apache repositories. - -***Sign the Releases*** - -1. Download the source code and distribution from the staging repo. - -2. Sign the 2 releases(distribution, src) and checksum. - -3. Create a new directory [Apache dev Release SVN](https://dist.apache.org/repos/dist/dev/servicecomb/servicecomb-saga/) with release package name and release candidate number. (for example : if you want to release 1.0.0-m2 and this is the third attempt of the release then the folder structure will be `1.0.0-m2/rc03`) - -4. Upload the release to directory created in last step. - -5. Download all the releases from SVN and verify the signature and checksum. - -***PMC
[servicecomb-pack] branch master updated: Bump gson from 2.8.4 to 2.8.9 in /pack-dependencies
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 The following commit(s) were added to refs/heads/master by this push: new 5dda9dc1 Bump gson from 2.8.4 to 2.8.9 in /pack-dependencies 5dda9dc1 is described below commit 5dda9dc1ffc221378e374a77b8ed0fcad8da919c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri May 20 22:13:41 2022 + Bump gson from 2.8.4 to 2.8.9 in /pack-dependencies Bumps [gson](https://github.com/google/gson) from 2.8.4 to 2.8.9. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.4...gson-parent-2.8.9) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pack-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml index f2473571..080637cb 100644 --- a/pack-dependencies/pom.xml +++ b/pack-dependencies/pom.xml @@ -67,7 +67,7 @@ 2.13.1 -2.8.4 +2.8.9 3.3.7 2.6.12
[servicecomb-pack] 02/02: SCB-2657 When Pull Request 0.7.x branch triggers the Github Actions
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch 0.7.x in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git commit 294afefd0b9d3b7dce6bf023136615607b96ea00 Author: Lei Zhang AuthorDate: Mon Aug 1 17:51:40 2022 +0800 SCB-2657 When Pull Request 0.7.x branch triggers the Github Actions --- .github/workflows/master-pr-build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/master-pr-build.yaml b/.github/workflows/master-pr-build.yaml index 88e9066f..5b56b179 100644 --- a/.github/workflows/master-pr-build.yaml +++ b/.github/workflows/master-pr-build.yaml @@ -21,6 +21,7 @@ on: pull_request: branches: - master + - 0.7.x env: MAVEN_OPTS: -Xmx4g -Xms1g -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3
[servicecomb-pack] 01/02: SCB-2657 Fix wrong version placeholder
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch 0.7.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 6d787714b07f44980bd178a78ce32c0e6f37bc06
Author: Lei Zhang
AuthorDate: Mon Aug 1 17:45:18 2022 +0800
SCB-2657 Fix wrong version placeholder
---
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 | 43 ++--
5 files changed, 46 insertions(+), 7 deletions(-)
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 @@
org.apache.servicecomb.pack.demo
service-pub
- ${revision}
+ ${project.version}
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 @@
org.apache.servicecomb.pack.demo
service-api
- ${revision}
+ ${project.version}
compile
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 @@
org.apache.servicecomb.pack.demo
service-api
- ${revision}
+ ${project.version}
compile
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 @@
org.apache.servicecomb.pack.tests
pack-tests
- ${revision}
+ ${project.version}
org.apache.servicecomb.pack.tests
explicit-transaction-context-tests
- ${revision}
+ ${project.version}
diff --git a/pom.xml b/pom.xml
index 4e0ac16e..926e12b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
UTF-8
UTF-8
1.8
-0.7.0
+0.7.1-SNAPSHOT
0.8.6
1.19
@@ -197,7 +197,7 @@
org.apache.servicecomb.pack
docker-build-config
-${revision}
+${project.version}
@@ -344,6 +344,41 @@
maven-failsafe-plugin
${maven.failsafe.version}
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+ ${flatten-maven-plugin.version}
+ true
+
+
+ flatten
+ process-resources
+
+flatten
+
+
+true
+bom
+
+ expand
+ keep
+ remove
+ remove
+ remove
+ remove
+ remove
+
+
+
+
+ flatten-clean
+ clean
+
+clean
+
+
+
+
@@ -369,6 +404,10 @@
+
+org.codehaus.mojo
+flatten-maven-plugin
+
[servicecomb-pack] branch 0.7.x updated (fae7326c -> 294afefd)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch 0.7.x in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git from fae7326c Cut 0.7.0 Release new 6d787714 SCB-2657 Fix wrong version placeholder new 294afefd SCB-2657 When Pull Request 0.7.x branch triggers the Github Actions 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: .github/workflows/master-pr-build.yaml | 1 + 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 | 43 ++-- 6 files changed, 47 insertions(+), 7 deletions(-)
[servicecomb-pack] 01/03: SCB-2641 Fix wrong version placeholder
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
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 @@
org.apache.servicecomb.pack.demo
service-pub
- ${revision}
+ ${project.version}
[servicecomb-pack] 02/03: SCB-2641 Fix wrong version placeholder
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
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 @@
org.apache.servicecomb.pack.demo
service-api
- ${revision}
+ ${project.version}
compile
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 @@
org.apache.servicecomb.pack.demo
service-api
- ${revision}
+ ${project.version}
compile
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 @@
org.apache.servicecomb.pack.tests
pack-tests
- ${revision}
+ ${project.version}
org.apache.servicecomb.pack.tests
explicit-transaction-context-tests
- ${revision}
+ ${project.version}
diff --git a/pom.xml b/pom.xml
index 95084569..74b37008 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
org.apache.servicecomb.pack
docker-build-config
-${revision}
+${project.version}
[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] 03/03: SCB-2641 Increase waiting time for slow CI
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
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 {
S
[servicecomb-pack] 02/02: SCB-2641 Increase wait time for slow CI
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
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() {
+await().atMost(120, SECONDS).until(new Callable() {
@Override
public Boolean call() throws Exception {
[servicecomb-pack] 01/02: SCB-2641 Use flatten-maven-plugin to update version placeholders ${revision} for the main pom
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
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 @@
maven-failsafe-plugin
${maven.failsafe.version}
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+ ${flatten-maven-plugin.version}
+ true
+
+
+ flatten
+ process-resources
+
+flatten
+
+
+true
+bom
+
+ expand
+ keep
+ remove
+ remove
+ remove
+ remove
+ remove
+
+
+
+
+ flatten-clean
+ clean
+
+clean
+
+
+
+
@@ -369,6 +404,10 @@
+
+org.codehaus.mojo
+flatten-maven-plugin
+
[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-website] branch asf-site updated: Publish the website
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 51128b84 Publish the website
51128b84 is described below
commit 51128b84d9c9c1e74ea4450d050b9c87fbd43312
Author: Willem Jiang
AuthorDate: Mon May 16 19:32:33 2022 +0800
Publish the website
---
content/cn/index.html | 2 +-
content/feed.xml | 2 +-
content/index.html| 2 +-
content/sitemap.xml | 112 +-
4 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/content/cn/index.html b/content/cn/index.html
index 1e255649..567cf2c1 100644
--- a/content/cn/index.html
+++ b/content/cn/index.html
@@ -323,7 +323,7 @@
最新新闻
left_ul li{width:100%}
- Apache
ServiceComb Java-Chassis 发布 2.7.0 Apache ServiceComb 社区 暑假coding 2020 活动 Apache ServiceComb Pack 发布0.6.0
Apache ServiceComb
Service-Center 发布 2.1.0 Apache ServiceComb Toolkit 发布0.2.0
+ Apache
ServiceComb Java-Chassis 发布 2.7.0 Apache ServiceComb 社区 暑假coding 2020 活动 Apache ServiceComb Pack 发布0.7.0
Apache ServiceComb
Service-Center 发布 2.1.0 Apache ServiceComb Toolkit 发布0.2.0
Apache
ServiceComb 社区接受新开普软件研究院的代码捐赠 Apache
ServiceComb 社区meetup及新品发布 Apache ServiceComb
荣获中国开源云联盟组织的中国优秀开源项目一等奖 Apache ServiceComb
社区联合传智播客的黑马程序员、博学谷、传智汇子品牌发布微服务化教程 https://gitter [...]
diff --git a/content/feed.xml b/content/feed.xml
index 42e5566b..f22b16d9 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -1,4 +1,4 @@
-http://www.w3.org/2005/Atom; >https://jekyllrb.com/;
version="3.9.0">Jekyll2022-05-16T17:38:00+08:00/feed.xmlApache ServiceCombThe homepage of
ServiceComb{name=nil,
avatar= [...]
+http://www.w3.org/2005/Atom; >https://jekyllrb.com/;
version="3.9.0">Jekyll2022-05-16T19:30:38+08:00/feed.xmlApache ServiceCombThe homepage of
ServiceComb{name=nil,
avatar= [...]
p本次讲座得到广东工业大学计算机院学生会同学们的鼎力支持和参与。报名通道开放后，报名人数迅速达到150+，活动放在学校报告厅举办。即便在周日，同学们的热情仍然很高，给广东工业大学的同学们点赞。/p
diff --git a/content/index.html b/content/index.html
index 1e349639..0c71f4fe 100644
--- a/content/index.html
+++ b/content/index.html
@@ -322,7 +322,7 @@
Latest News
left_ul li{width:100%}
- Apache
ServiceComb Java-Chassis Release Version 2.7.0 Apache ServiceComb Summer Code 2020 Apache ServiceComb Pack 0.6.0 is released
Apache ServiceComb
Service-Center Release Version 2.1.0 Apache ServiceComb Toolkit 0.2.0 i [...]
+ Apache
ServiceComb Java-Chassis Release Version 2.7.0 Apache ServiceComb Summer Code 2020 Apache ServiceComb Pack 0.7.0 is released
Apache ServiceComb
Service-Center Release Version 2.1.0 Apache ServiceComb Toolkit 0.2.0 i [...]
Apache
ServiceComb accept code donation from NewCapec Institute Apache
ServiceComb Meetup and new projects release Apache
ServiceComb won the first prize of China's outstanding open source project
organized by China Open Source Cloud Alliance
[servicecomb-website] branch home-update created (now 3ebfeb8d)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch home-update in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git at 3ebfeb8d Updated the pack release version This branch includes the following new commits: new 3ebfeb8d Updated the pack release version The 1 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.
[servicecomb-website] 01/01: Updated the pack release version
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch home-update in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git commit 3ebfeb8d7b3c97110331de7c1723f3585abbf4ee Author: Willem Jiang AuthorDate: Mon May 16 19:13:39 2022 +0800 Updated the pack release version --- _pages/cn/home.md | 2 +- _pages/home.md| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_pages/cn/home.md b/_pages/cn/home.md index b63a3861..36081906 100755 --- a/_pages/cn/home.md +++ b/_pages/cn/home.md @@ -28,7 +28,7 @@ intro: Apache ServiceComb 社区 暑假coding 2020 活动 - Apache ServiceComb Pack 发布0.6.0 + Apache ServiceComb Pack 发布0.7.0 Apache ServiceComb Service-Center 发布 2.1.0 diff --git a/_pages/home.md b/_pages/home.md index 3e57baa6..9ca1b6f9 100755 --- a/_pages/home.md +++ b/_pages/home.md @@ -28,7 +28,7 @@ intro: Apache ServiceComb Summer Code 2020 -Apache ServiceComb Pack 0.6.0 is released +Apache ServiceComb Pack 0.7.0 is released Apache ServiceComb Service-Center Release Version 2.1.0
[servicecomb-website] branch asf-site updated: Publish the website
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git The following commit(s) were added to refs/heads/asf-site by this push: new cefdaca1 Publish the website cefdaca1 is described below commit cefdaca1a0f8137f34f1c232e52443dad600cdcb Author: Willem Jiang AuthorDate: Mon May 16 17:41:00 2022 +0800 Publish the website --- content/cn/release/index.html| 3 + content/cn/release/pack-downloads/index.html | 9 +- content/cn/release/pack-release-notes/index.html | 149 ++- content/feed.xml | 2 +- content/release/index.html | 5 +- content/release/pack-downloads/index.html| 9 +- content/release/pack-release-notes/index.html| 149 ++- content/sitemap.xml | 122 +-- 8 files changed, 377 insertions(+), 71 deletions(-) diff --git a/content/cn/release/index.html b/content/cn/release/index.html index 5bd93f95..19b22193 100644 --- a/content/cn/release/index.html +++ b/content/cn/release/index.html @@ -532,6 +532,9 @@ 稳定发布版 - 最新版本: + +ServiceComb Pack 0.7.0 (released on 2022-05-16) + ServiceComb Pack 0.6.0 (released on 2020-05-26) diff --git a/content/cn/release/pack-downloads/index.html b/content/cn/release/pack-downloads/index.html index 344e79cf..98e82e80 100644 --- a/content/cn/release/pack-downloads/index.html +++ b/content/cn/release/pack-downloads/index.html @@ -511,7 +511,7 @@ - + @@ -537,7 +537,12 @@ - Apache ServiceComb Pack 0.6.0(LATEST) + Apache ServiceComb Pack 0.7.0(LATEST) + https://dlcdn.apache.org/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip;>[src] https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip.asc;>[asc] https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip.sha512;>[sha512] + https://dlcdn.apache.org/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-bin.zip;>[Binary] https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-bin.zip.asc;>[asc] https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-bin.zip.sha512;>[sha512] + + + Apache ServiceComb Pack 0.6.0 https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip;>[src] https://www.apache.org/dist/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip.asc;>[asc] https://www.apache.org/dist/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip.sha512;>[sha512] https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-bin.zip;>[Binary] https://www.apache.org/dist/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-bin.zip.asc;>[asc] https://www.apache.org/dist/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-bin.zip.sha512;>[sha512] diff --git a/content/cn/release/pack-release-notes/index.html b/content/cn/release/pack-release-notes/index.html index ce02e13b..17ae2c05 100644 --- a/content/cn/release/pack-release-notes/index.html +++ b/content/cn/release/pack-release-notes/index.html @@ -511,7 +511,7 @@ - + @@ -525,7 +525,152 @@ -Release Notes - Apache ServiceComb - Version pack-0.6.0 +Release Notes - Apache ServiceComb - Version pack-0.7.0 + + +Sub-task + + +[https://issues.apache.org/jira/browse/SCB-1370;>SCB-1370] - Support for in-process nested global transactions + +[https://issues.apache.org/jira/browse/SCB-2219;>SCB-2219] - Use Github secrets to configure snapshot deploy to Nexus authentication + +[https://issues.apache.org/jira/browse/SCB-2220;>SCB-2220] - Adding Github actions workflow status badge to README.md + +[https://issues.apache.org/jira/browse/SCB-2223;>SCB-2223] - NEXUSs secret name is wrong + +[https://issues.apache.org/jira/browse/SCB-2248;>SCB-2248] - Update jacoco version 0.8.6 for Java 11 + +[https://issues.apache.org/jira/browse/SCB-2397;>SCB-2397] - Add pack-dependencies module management dependencies + +[https://issues.apache.org/jira/browse/SCB-2421;>SCB-2421] - Migrate Spring-Boot from 2.1.X.RELEASE to 2.3.X.RELEASE + + + +Bug + + +[https://issues.apache.org/jira/browse/SCB-2192;>SCB-2192] - servicecom
[servicecomb-website] branch master updated: Update Pack Release Info (#293)
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-website.git The following commit(s) were added to refs/heads/master by this push: new d83184aa Update Pack Release Info (#293) d83184aa is described below commit d83184aadff68df2caa0c54230af434ce0a100f8 Author: Lei Zhang AuthorDate: Mon May 16 17:36:39 2022 +0800 Update Pack Release Info (#293) * Update Pack Release Info * use https://dlcdn.apache.org instead https://apache.org/dyn/closer.cgi --- _release/cn/pack_downloads.md| 5 +- _release/cn/pack_releaseNotes.md | 162 --- _release/cn/release.md | 2 + _release/pack_downloads.md | 5 +- _release/pack_releaseNotes.md| 161 -- _release/release.md | 4 +- 6 files changed, 317 insertions(+), 22 deletions(-) diff --git a/_release/cn/pack_downloads.md b/_release/cn/pack_downloads.md index 1dc2f2c4..94ca3d71 100644 --- a/_release/cn/pack_downloads.md +++ b/_release/cn/pack_downloads.md @@ -4,14 +4,15 @@ lang: cn ref: release permalink: /cn/release/pack-downloads/ excerpt: "ServiceComb Pack Downloads" -last_modified_at: 2020-04-06T00:50:43-55:00 +last_modified_at: 2022-05-16T00:50:43-55:00 --- ## 发布包 | 版本号 | 源码| 发布包 | | -- | - | - | -|**Apache ServiceComb Pack 0.6.0(LATEST)**|[[src]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip) [[asc]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip.asc) [[sha512]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip.sha512)|[[Binary]](https://apache.org/dyn/closer.cgi/servicecomb/ser [...] +|**Apache ServiceComb Pack 0.7.0(LATEST)**|[[src]](https://dlcdn.apache.org/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip) [[asc]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip.asc) [[sha512]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.7.0/apache-servicecomb-pack-distribution-0.7.0-src.zip.sha512)|[[Binary]](https://dlcdn.apache.org/servicecomb/servicecomb-pack/0.7. [...] +|Apache ServiceComb Pack 0.6.0|[[src]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip) [[asc]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip.asc) [[sha512]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.6.0/apache-servicecomb-pack-distribution-0.6.0-src.zip.sha512)|[[Binary]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-pac [...] |Apache ServiceComb Pack 0.5.0 |[[src]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-pack/0.5.0/apache-servicecomb-pack-distribution-0.5.0-src.zip) [[asc]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.5.0/apache-servicecomb-pack-distribution-0.5.0-src.zip.asc) [[sha512]](https://www.apache.org/dist/servicecomb/servicecomb-pack/0.5.0/apache-servicecomb-pack-distribution-0.5.0-src.zip.sha512)|[[Binary]](https://apache.org/dyn/closer.cgi/servicecomb/ser [...] |Apache ServiceComb Pack 0.4.0 |[[src]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.4.0/apache-servicecomb-pack-distribution-0.4.0-src.zip) [[asc]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.4.0/apache-servicecomb-pack-distribution-0.4.0-src.zip.asc) [[sha512]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.4.0/apache-servicecomb-pack-distribution-0.4.0-src.zip.sha512)|[[Binary]](https://archive.apache.org/dist/servicecomb [...] |Apache ServiceComb Pack 0.3.0 |[[src]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.3.0/apache-servicecomb-pack-distribution-0.3.0-src.zip) [[asc]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.3.0/apache-servicecomb-pack-distribution-0.3.0-src.zip.asc) [[sha512]](https://archive.apache.org/dist/servicecomb/servicecomb-pack/0.3.0/apache-servicecomb-pack-distribution-0.3.0-src.zip.sha512)|[[Binary]](https://archive.apache.org/dist/servicecomb [...] diff --git a/_release/cn/pack_releaseNotes.md b/_release/cn/pack_releaseNotes.md index bf09ac25..1f0d5150 100644 --- a/_release/cn/pack_releaseNotes.md +++ b/_release/cn/pack_releaseNotes.md @@ -4,11 +4,155 @@ lang: cn ref: release permalink: /cn/release/pack-release-notes/ excerpt: "ServiceComb Pack Release Notes" -last_modified_at: 2020-04-06T00:50:43-55:00 +last_modifi
[servicecomb-pack] branch master updated: Bump netty-codec-http in /pack-dependencies
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 The following commit(s) were added to refs/heads/master by this push: new 264d7d27 Bump netty-codec-http in /pack-dependencies 264d7d27 is described below commit 264d7d2718cf5d87619b8f5f9b908c8c821989a6 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu May 12 05:32:31 2022 + Bump netty-codec-http in /pack-dependencies Bumps [netty-codec-http](https://github.com/netty/netty) from 4.1.74.Final to 4.1.77.Final. - [Release notes](https://github.com/netty/netty/releases) - [Commits](https://github.com/netty/netty/compare/netty-4.1.74.Final...netty-4.1.77.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pack-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml index 627fcbd3..f2473571 100644 --- a/pack-dependencies/pom.xml +++ b/pack-dependencies/pom.xml @@ -63,7 +63,7 @@ 1.44.1 2.0.48.Final -4.1.74.Final +4.1.77.Final 2.13.1
[servicecomb-pack] branch master updated: Create codeql-analysis.yml
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
The following commit(s) were added to refs/heads/master by this push:
new ebc5bb9c Create codeql-analysis.yml
ebc5bb9c is described below
commit ebc5bb9cdc1b2a392eeacb51e84a6f2faaf5322e
Author: Willem Jiang
AuthorDate: Sun May 8 15:07:57 2022 +0800
Create codeql-analysis.yml
---
.github/workflows/codeql-analysis.yml | 72 +++
1 file changed, 72 insertions(+)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
new file mode 100644
index ..aedf033d
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# NOTE
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+ push:
+branches: [ master ]
+ pull_request:
+# The branches below must be a subset of the branches above
+branches: [ master ]
+ schedule:
+- cron: '18 8 * * 2'
+
+jobs:
+ analyze:
+name: Analyze
+runs-on: ubuntu-latest
+permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+strategy:
+ fail-fast: false
+ matrix:
+language: [ 'java', 'javascript' ]
+# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript',
'python', 'ruby' ]
+# Learn more about CodeQL language support at
https://aka.ms/codeql-docs/language-support
+
+steps:
+- name: Checkout repository
+ uses: actions/checkout@v3
+
+# Initializes the CodeQL tools for scanning.
+- name: Initialize CodeQL
+ uses: github/codeql-action/init@v2
+ with:
+languages: ${{ matrix.language }}
+# If you wish to specify custom queries, you can do so here or in a
config file.
+# By default, queries listed here will override any specified in a
config file.
+# Prefix the list here with "+" to use these queries and those in the
config file.
+
+# Details on CodeQL's query packs refer to :
https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+# queries: security-extended,security-and-quality
+
+
+# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+# If this step fails, then you should remove it and run the build manually
(see below)
+- name: Autobuild
+ uses: github/codeql-action/autobuild@v2
+
+# ℹ️ Command-line programs to run using the OS shell.
+# See
https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+# If the Autobuild fails above, remove it and uncomment the following
three lines.
+# modify them (or add more) to build your code if your project, please
refer to the EXAMPLE below for guidance.
+
+# - run: |
+# echo "Run, Build Application using script"
+# ./location_of_script_within_repo/buildscript.sh
+
+- name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v2
[servicecomb-pack] branch master updated (30913f92 -> f6f7f931)
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 30913f92 Bump spring-cloud-function-core in /pack-dependencies new e687f449 SCB-2477 Use CI friendly maven version new f6f7f931 SCB-2477 Add comments for flatten-maven-plugin 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: .gitignore | 3 ++ .../acceptance-pack-akka-spring-demo/pom.xml | 2 +- .../acceptance-pack-cluster-spring-demo/pom.xml| 2 +- .../acceptance-pack-dubbo-demo/pom.xml | 2 +- .../pom.xml| 2 +- .../acceptance-pack-spring-demo-with-nacos/pom.xml | 2 +- .../pom.xml| 2 +- .../acceptance-pack-spring-demo/pom.xml| 2 +- .../acceptance-pack-tcc-spring-demo/pom.xml| 2 +- acceptance-tests/acceptance-test-common/pom.xml| 2 +- acceptance-tests/pom.xml | 2 +- alpha/alpha-benchmark/pom.xml | 2 +- alpha/alpha-core/pom.xml | 2 +- alpha/alpha-persistence-jpa/pom.xml| 2 +- alpha/alpha-server/pom.xml | 2 +- alpha/alpha-spec-saga-akka/pom.xml | 2 +- alpha/alpha-spec-saga-db/pom.xml | 2 +- alpha/alpha-spec-tcc-db/pom.xml| 2 +- alpha/alpha-spring-cloud-starter-consul/pom.xml| 2 +- alpha/alpha-spring-cloud-starter-eureka/pom.xml| 2 +- alpha/alpha-spring-cloud-starter-nacos/pom.xml | 2 +- alpha/alpha-spring-cloud-starter-zookeeper/pom.xml | 2 +- alpha/alpha-ui/pom.xml | 2 +- alpha/pom.xml | 2 +- demo/pom.xml | 2 +- demo/saga-dubbo-demo/pom.xml | 2 +- demo/saga-dubbo-demo/service-api/pom.xml | 4 +- demo/saga-dubbo-demo/service-pub/pom.xml | 2 +- demo/saga-dubbo-demo/servicea/pom.xml | 2 +- demo/saga-dubbo-demo/serviceb/pom.xml | 4 +- demo/saga-dubbo-demo/servicec/pom.xml | 4 +- demo/saga-servicecomb-demo/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-booking/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-car/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-hotel/pom.xml | 2 +- demo/saga-spring-demo/booking/pom.xml | 2 +- demo/saga-spring-demo/car/pom.xml | 2 +- demo/saga-spring-demo/hotel/pom.xml| 2 +- demo/saga-spring-demo/pom.xml | 2 +- demo/tcc-spring-demo/inventory/pom.xml | 2 +- demo/tcc-spring-demo/ordering/pom.xml | 2 +- demo/tcc-spring-demo/payment/pom.xml | 2 +- demo/tcc-spring-demo/pom.xml | 2 +- distribution/pom.xml | 7 +-- docker-build-config/pom.xml| 5 ++- integration-tests/coverage-aggregate/pom.xml | 6 +-- .../explicit-transaction-context-tests/pom.xml | 2 +- integration-tests/pack-tests/pom.xml | 2 +- integration-tests/pom.xml | 2 +- omega/omega-connector/omega-connector-grpc/pom.xml | 2 +- omega/omega-connector/pom.xml | 2 +- omega/omega-context/pom.xml| 2 +- omega/omega-format/pom.xml | 2 +- omega/omega-spring-cloud-consul-starter/pom.xml| 2 +- omega/omega-spring-cloud-eureka-starter/pom.xml| 2 +- omega/omega-spring-cloud-nacos-starter/pom.xml | 2 +- omega/omega-spring-cloud-zookeeper-starter/pom.xml | 2 +- omega/omega-spring-starter/pom.xml | 2 +- omega/omega-spring-tx/pom.xml | 2 +- omega/omega-transaction/pom.xml| 2 +- .../omega-transport/omega-transport-dubbo/pom.xml | 2 +- .../omega-transport/omega-transport-feign/pom.xml | 2 +- .../omega-transport-hystrix/pom.xml| 2 +- .../omega-transport-resttemplate/pom.xml | 2 +- .../omega-transport-servicecomb/pom.xml| 2 +- omega/omega-transport/pom.xml | 2 +- omega/pom.xml | 2 +- pack-common/pom.xml| 2 +- pack-contracts/pack-contract-grpc/pom.xml | 2 +- pack-contracts/pom.xml | 2 +- pack-dependencies/pom.xml | 51 +- pom.xml|
[servicecomb-pack] 02/02: SCB-2477 Add comments for flatten-maven-plugin
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 f6f7f931cf425dabf890c039247080c555121dfe Author: Lei Zhang AuthorDate: Fri May 6 09:02:37 2022 +0800 SCB-2477 Add comments for flatten-maven-plugin --- pack-dependencies/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml index ed72f86c..627fcbd3 100644 --- a/pack-dependencies/pom.xml +++ b/pack-dependencies/pom.xml @@ -847,6 +847,7 @@ + org.codehaus.mojo flatten-maven-plugin
[servicecomb-pack] 01/02: SCB-2477 Use CI friendly maven version
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 e687f44973d30f9621876eed9d83e408704ed231 Author: Lei Zhang AuthorDate: Thu May 5 20:58:07 2022 +0800 SCB-2477 Use CI friendly maven version --- .gitignore | 3 ++ .../acceptance-pack-akka-spring-demo/pom.xml | 2 +- .../acceptance-pack-cluster-spring-demo/pom.xml| 2 +- .../acceptance-pack-dubbo-demo/pom.xml | 2 +- .../pom.xml| 2 +- .../acceptance-pack-spring-demo-with-nacos/pom.xml | 2 +- .../pom.xml| 2 +- .../acceptance-pack-spring-demo/pom.xml| 2 +- .../acceptance-pack-tcc-spring-demo/pom.xml| 2 +- acceptance-tests/acceptance-test-common/pom.xml| 2 +- acceptance-tests/pom.xml | 2 +- alpha/alpha-benchmark/pom.xml | 2 +- alpha/alpha-core/pom.xml | 2 +- alpha/alpha-persistence-jpa/pom.xml| 2 +- alpha/alpha-server/pom.xml | 2 +- alpha/alpha-spec-saga-akka/pom.xml | 2 +- alpha/alpha-spec-saga-db/pom.xml | 2 +- alpha/alpha-spec-tcc-db/pom.xml| 2 +- alpha/alpha-spring-cloud-starter-consul/pom.xml| 2 +- alpha/alpha-spring-cloud-starter-eureka/pom.xml| 2 +- alpha/alpha-spring-cloud-starter-nacos/pom.xml | 2 +- alpha/alpha-spring-cloud-starter-zookeeper/pom.xml | 2 +- alpha/alpha-ui/pom.xml | 2 +- alpha/pom.xml | 2 +- demo/pom.xml | 2 +- demo/saga-dubbo-demo/pom.xml | 2 +- demo/saga-dubbo-demo/service-api/pom.xml | 4 +- demo/saga-dubbo-demo/service-pub/pom.xml | 2 +- demo/saga-dubbo-demo/servicea/pom.xml | 2 +- demo/saga-dubbo-demo/serviceb/pom.xml | 4 +- demo/saga-dubbo-demo/servicec/pom.xml | 4 +- demo/saga-servicecomb-demo/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-booking/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-car/pom.xml | 2 +- demo/saga-servicecomb-demo/scb-hotel/pom.xml | 2 +- demo/saga-spring-demo/booking/pom.xml | 2 +- demo/saga-spring-demo/car/pom.xml | 2 +- demo/saga-spring-demo/hotel/pom.xml| 2 +- demo/saga-spring-demo/pom.xml | 2 +- demo/tcc-spring-demo/inventory/pom.xml | 2 +- demo/tcc-spring-demo/ordering/pom.xml | 2 +- demo/tcc-spring-demo/payment/pom.xml | 2 +- demo/tcc-spring-demo/pom.xml | 2 +- distribution/pom.xml | 7 +-- docker-build-config/pom.xml| 5 ++- integration-tests/coverage-aggregate/pom.xml | 6 +-- .../explicit-transaction-context-tests/pom.xml | 2 +- integration-tests/pack-tests/pom.xml | 2 +- integration-tests/pom.xml | 2 +- omega/omega-connector/omega-connector-grpc/pom.xml | 2 +- omega/omega-connector/pom.xml | 2 +- omega/omega-context/pom.xml| 2 +- omega/omega-format/pom.xml | 2 +- omega/omega-spring-cloud-consul-starter/pom.xml| 2 +- omega/omega-spring-cloud-eureka-starter/pom.xml| 2 +- omega/omega-spring-cloud-nacos-starter/pom.xml | 2 +- omega/omega-spring-cloud-zookeeper-starter/pom.xml | 2 +- omega/omega-spring-starter/pom.xml | 2 +- omega/omega-spring-tx/pom.xml | 2 +- omega/omega-transaction/pom.xml| 2 +- .../omega-transport/omega-transport-dubbo/pom.xml | 2 +- .../omega-transport/omega-transport-feign/pom.xml | 2 +- .../omega-transport-hystrix/pom.xml| 2 +- .../omega-transport-resttemplate/pom.xml | 2 +- .../omega-transport-servicecomb/pom.xml| 2 +- omega/omega-transport/pom.xml | 2 +- omega/pom.xml | 2 +- pack-common/pom.xml| 2 +- pack-contracts/pack-contract-grpc/pom.xml | 2 +- pack-contracts/pom.xml | 2 +- pack-dependencies/pom.xml | 50 +- pom.xml| 7 +-- web/pom.xml| 2 +- 73 files changed, 136 insertions(+), 82 deletions(-) diff --git a/.gitignore b/.gitignore index 621755d5..8e9d9c44 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,6 @@ target/ #akka distributed data ddata-* + +#flatten-maven-plugin
[servicecomb-website] branch master updated: Added the apachecon event into the website
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-website.git
The following commit(s) were added to refs/heads/master by this push:
new b26eec99 Added the apachecon event into the website
b26eec99 is described below
commit b26eec99196c1fefbd0e356427f2354bb624e854
Author: Willem Jiang
AuthorDate: Thu Apr 28 17:18:34 2022 +0800
Added the apachecon event into the website
---
_includes/footer.html | 6 ++
_includes/head.html | 1 +
2 files changed, 7 insertions(+)
diff --git a/_includes/footer.html b/_includes/footer.html
index bc21fefe..23d577ce 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -5,6 +5,12 @@
{% else %}
{% assign prefix = "" %}
{% endif %}
+
+
+{{ site.data.ui-text[page.lang].events | default:
"Events" }}
+
+
+
{{ site.data.ui-text[page.lang].resources | default:
"Resources" }}
diff --git a/_includes/head.html b/_includes/head.html
index 1a7b40c3..414dccfc 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -21,6 +21,7 @@
https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css;
integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M"
crossorigin="anonymous">
+https://www.apachecon.com/event-images/snippet.js"</a>;>
https://code.jquery.com/jquery-3.2.1.slim.min.js"</a>;
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
crossorigin="anonymous">
https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"</a>;
integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4"
crossorigin="anonymous">
https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js"</a>;
integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1"
crossorigin="anonymous">
[servicecomb-pack] branch master updated: Bump spring-cloud-function-core in /pack-dependencies
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 The following commit(s) were added to refs/heads/master by this push: new 30913f92 Bump spring-cloud-function-core in /pack-dependencies 30913f92 is described below commit 30913f9238fea31929e83919d773edaea539620d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Apr 6 14:25:58 2022 + Bump spring-cloud-function-core in /pack-dependencies Bumps spring-cloud-function-core from 3.0.14.RELEASE to 3.1.7. --- updated-dependencies: - dependency-name: org.springframework.cloud:spring-cloud-function-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pack-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml index 780eeea1..95ce48fb 100644 --- a/pack-dependencies/pom.xml +++ b/pack-dependencies/pom.xml @@ -49,7 +49,7 @@ 2.2.5.RELEASE 2.2.6.RELEASE 3.0.13.RELEASE - 3.0.14.RELEASE +3.1.7 5.2.20.RELEASE
[servicecomb-pack] branch master updated: SCB-2459 Upgrade the version of zstd-jni and lz4-java
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
The following commit(s) were added to refs/heads/master by this push:
new 1614d01d SCB-2459 Upgrade the version of zstd-jni and lz4-java
1614d01d is described below
commit 1614d01dceb651c5ffe3802669324e2c3309
Author: Willem Jiang
AuthorDate: Thu Apr 21 16:00:43 2022 +0800
SCB-2459 Upgrade the version of zstd-jni and lz4-java
---
pack-dependencies/pom.xml | 17 +
1 file changed, 17 insertions(+)
diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml
index 73674cc9..780eeea1 100644
--- a/pack-dependencies/pom.xml
+++ b/pack-dependencies/pom.xml
@@ -32,6 +32,9 @@
pom
+
+1.5.2-2
+1.8.0
2.17.1
1.2
@@ -196,6 +199,20 @@
${spring.cloud.starter.alibaba.nacos.discovery.version}
+
+
+com.github.luben
+zstd-jni
+${zstd-jni.version}
+
+
+
+
+org.lz4
+lz4-java
+${lz4-java.version}
+
+
org.apache.servicecomb
[servicecomb-pack] branch SCB-2459 created (now 6dfb248b)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2459 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git at 6dfb248b SCB-2459 Upgrade the version of zstd-jni and lz4-java This branch includes the following new commits: new 6dfb248b SCB-2459 Upgrade the version of zstd-jni and lz4-java The 1 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.
[servicecomb-pack] 01/01: SCB-2459 Upgrade the version of zstd-jni and lz4-java
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-2459
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 6dfb248b5869d2ab1ab32b75f935c99b8c5cc127
Author: Willem Jiang
AuthorDate: Thu Apr 21 16:00:43 2022 +0800
SCB-2459 Upgrade the version of zstd-jni and lz4-java
---
pack-dependencies/pom.xml | 17 +
1 file changed, 17 insertions(+)
diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml
index 2c41dbfd..b8b31178 100644
--- a/pack-dependencies/pom.xml
+++ b/pack-dependencies/pom.xml
@@ -32,6 +32,9 @@
pom
+
+1.5.2-2
+1.8.0
2.17.1
1.2
@@ -196,6 +199,20 @@
${spring.cloud.starter.alibaba.nacos.discovery.version}
+
+
+com.github.luben
+zstd-jni
+${zstd-jni.version}
+
+
+
+
+org.lz4
+lz4-java
+${lz4-java.version}
+
+
org.apache.servicecomb
[servicecomb-pack] branch master updated: Bump commons-io from 2.4 to 2.7 in /pack-dependencies
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 The following commit(s) were added to refs/heads/master by this push: new 4cb5947a Bump commons-io from 2.4 to 2.7 in /pack-dependencies 4cb5947a is described below commit 4cb5947ac0e3db248070af2fe5b031ffee52c6f4 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Apr 8 14:40:27 2022 + Bump commons-io from 2.4 to 2.7 in /pack-dependencies Bumps commons-io from 2.4 to 2.7. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pack-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml index 2c41dbfd..73674cc9 100644 --- a/pack-dependencies/pom.xml +++ b/pack-dependencies/pom.xml @@ -83,7 +83,7 @@ 3.6.2 1.5.12 9.5.1 -2.4 +2.7 1.8.10 2.2 1.2
[servicecomb-pack] branch master updated: Bump junit from 4.12 to 4.13.1 in /pack-dependencies
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 The following commit(s) were added to refs/heads/master by this push: new 142aed27 Bump junit from 4.12 to 4.13.1 in /pack-dependencies 142aed27 is described below commit 142aed27088ecbfd3f81e740b2533628061e07f7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Apr 8 14:38:30 2022 + Bump junit from 4.12 to 4.13.1 in /pack-dependencies Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) --- updated-dependencies: - dependency-name: junit:junit dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- pack-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml index 0222fec2..2c41dbfd 100644 --- a/pack-dependencies/pom.xml +++ b/pack-dependencies/pom.xml @@ -106,7 +106,7 @@ 2.23.4 2.3.1 3.0.4 -4.12 +4.13.1 1.3 3.0.0 1.0.0
[servicecomb-pack] 02/03: Rename module alpha-spec-saga-fsm to alpha-spec-saga-akka
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 e59635833ce36f7e8a13b269a8e1bba4f47afd2f Author: Lei Zhang AuthorDate: Sun Apr 3 01:17:52 2022 +0800 Rename module alpha-spec-saga-fsm to alpha-spec-saga-akka --- alpha/alpha-benchmark/pom.xml | 2 +- .../jpa/EclipseLinkJpaConfiguration.java | 54 alpha/alpha-server/pom.xml | 2 +- .../src/main/resources/application.yaml| 3 + ...a => AlphaIntegrationWithSpecSagaAkkaTest.java} | 7 +- .../README.md | 0 .../pom.xml| 4 +- .../akka/AlphaSpecSagaAkkaAutoConfiguration.java} | 81 +-- .../saga/akka}/CompensateAckCountDownLatch.java| 2 +- .../alpha/spec/saga/akka}/GrpcOmegaCallback.java | 2 +- .../spec/saga/akka}/GrpcSagaEventService.java | 2 +- .../pack/alpha/spec/saga/akka}/SagaActor.java | 20 +-- .../pack/alpha/spec/saga/akka}/SagaActorState.java | 2 +- .../spec/saga/akka}/SagaShardRegionActor.java | 2 +- .../saga/akka/api/SagaAkkaAPIv1Controller.java}| 4 +- .../spec/saga/akka/api/SagaAkkaAPIv1Impl.java} | 6 +- .../akka}/channel/AbstractActorEventChannel.java | 5 +- .../saga/akka}/channel/AbstractEventConsumer.java | 4 +- .../akka/channel/kafka/KafkaActorEventChannel.java | 84 +++ .../akka}/channel/kafka/KafkaMessagePublisher.java | 17 ++- .../channel/kafka/KafkaSagaEventConsumer.java | 10 +- .../channel/memory/MemoryActorEventChannel.java| 6 +- .../channel/memory/MemorySagaEventConsumer.java| 6 +- .../channel/rabbit/RabbitActorEventChannel.java| 6 +- .../rabbit/RabbitChannelAutoConfiguration.java | 8 +- .../akka}/channel/rabbit/RabbitMessageChannel.java | 2 +- .../channel/rabbit/RabbitMessagePublisher.java | 2 +- .../channel/rabbit/RabbitSagaEventConsumer.java| 8 +- .../akka}/channel/redis/MessageSerializer.java | 2 +- .../channel/redis/RedisActorEventChannel.java | 6 +- .../redis/RedisChannelAutoConfiguration.java | 6 +- .../akka}/channel/redis/RedisMessagePublisher.java | 2 +- .../channel/redis/RedisSagaEventConsumer.java | 6 +- .../spec/saga/akka}/domain/AddTxEventDomain.java | 2 +- .../alpha/spec/saga/akka}/domain/DomainEvent.java | 2 +- .../spec/saga/akka}/domain/SagaEndedDomain.java| 4 +- .../spec/saga/akka}/domain/SagaStartedDomain.java | 2 +- .../saga/akka}/domain/UpdateTxEventDomain.java | 2 +- .../akka}/metrics/AlphaMetricsEndpointImpl.java| 2 +- .../spec/saga/akka}/metrics/MetricsService.java| 2 +- .../pack/alpha/spec/saga/akka}/model/SagaData.java | 4 +- .../alpha/spec/saga/akka}/model/TxEntities.java| 2 +- .../pack/alpha/spec/saga/akka}/model/TxEntity.java | 2 +- .../akka/properties/ChannelKafkaProperties.java| 76 ++ .../akka}/properties/ChannelMemoryProperties.java | 2 +- .../saga/akka}/properties/ChannelProperties.java | 12 +- .../akka}/properties/ElasticsearchProperties.java | 2 +- .../akka}/properties/RepositoryProperties.java | 2 +- .../akka}/properties/SpecSagaAkkaProperties.java | 2 +- .../AbstractTransactionRepositoryChannel.java | 4 +- .../repository/NoneTransactionRepository.java | 2 +- .../akka}/repository/TransactionRepository.java| 2 +- .../repository/TransactionRepositoryChannel.java | 2 +- .../DefaultTransactionRepositoryChannel.java | 11 +- .../ElasticsearchTransactionRepository.java| 8 +- .../elasticsearch/GlobalTransactionDocument.java | 2 +- .../integration/akka/AkkaClusterListener.java | 2 +- .../akka/AkkaConfigPropertyAdapter.java| 2 +- .../spring/integration/akka/SagaDataExtension.java | 12 +- .../integration/akka/SpringAkkaExtension.java | 6 +- .../saga/akka}/test/FsmSagaDataController.java | 6 +- .../src/main/resources/META-INF/spring.factories | 2 +- .../alpha/spec/saga/akka/it/SagaApplication.java | 0 .../spec/saga/akka/it/SagaIntegrationTest.java | 10 +- .../alpha/spec/saga/akka/ut/SagaActorTest.java | 22 +-- .../spec/saga/akka/ut/api/APIv1ControllerTest.java | 10 +- .../spec/saga/akka/ut/api/TestConfiguration.java | 18 +-- .../spec/saga/akka/ut/model/TxEntitiesTest.java| 4 +- .../ElasticsearchTransactionRepositoryTest.java| 10 +- .../alpha/spec/saga/akka/util/SagaEventSender.java | 0 .../src/test/resources/application.yaml| 0 .../src/test/resources/log4j2.xml | 0 .../fsm/channel/kafka/KafkaActorEventChannel.java | 37 - .../kafka/KafkaChannelAutoConfiguration.java | 153 - .../fsm/properties/ChannelKafkaProperties.java | 21 --- alpha/pom.
[servicecomb-pack] branch master updated (6b71dd15 -> 9dca5c1b)
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 6b71dd15 Merge pull request #747 from apache/SCB-2438
new 68851b7e Refactoring the Alpha module using Spring SPI
new e5963583 Rename module alpha-spec-saga-fsm to alpha-spec-saga-akka
new 9dca5c1b Update document
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:
.github/workflows/master-pr-build.yaml | 6 +-
.../acceptance-pack-akka-spring-demo/pom.xml | 41 +
.../acceptance-pack-cluster-spring-demo/pom.xml| 19 +-
.../acceptance-pack-dubbo-demo/pom.xml | 10 +-
.../pom.xml| 10 +-
.../acceptance-pack-spring-demo-with-nacos/pom.xml | 12 +-
.../pom.xml| 10 +-
.../acceptance-pack-spring-demo/pom.xml| 10 +-
.../acceptance-pack-tcc-spring-demo/pom.xml| 18 +-
alpha/alpha-benchmark/README.md| 2 +-
alpha/alpha-benchmark/pom.xml | 2 +-
.../pack/alpha/benchmark/Application.java | 1 +
.../servicecomb/pack/alpha/core/api/APIv1.java | 4 +-
.../AlphaMetricsEndpoint.java} | 11 +-
.../pack/alpha/fsm/FsmAutoConfiguration.java | 124 -
.../fsm/channel/kafka/KafkaActorEventChannel.java | 37
.../kafka/KafkaChannelAutoConfiguration.java | 153
.../memory/MemoryChannelAutoConfiguration.java | 62 ---
.../alpha-persistence-jpa}/pom.xml | 10 +-
.../jpa/EclipseLinkJpaConfiguration.java | 1 -
alpha/alpha-server/pom.xml | 20 +-
.../servicecomb/pack/alpha/server/AlphaConfig.java | 130 ++---
.../src/main/resources/application.yaml| 85 +++--
.../pack/alpha/server/AlphaIntegrationTest.java| 3 +
.../server/AlphaIntegrationWithRandomPortTest.java | 3 +
.../AlphaIntegrationWithSpecSagaAkkaTest.java} | 28 ++-
.../saga/akka}/OmegaEventSagaSimulator.java| 2 +-
.../fsm => spec/saga/akka}/OmegaEventSender.java | 2 +-
.../saga/db}/ClusterLockServiceTest.java | 13 +-
.../tcc/db}/AlphaTccEventControllerTest.java | 9 +-
.../tcc/db}/AlphaTccServerTestBase.java| 17 +-
.../tcc/db}/MemoryAlphaTccServerTest.java | 6 +-
.../tcc => spec/tcc/db}/RdbAlphaTccServerTest.java | 4 +-
.../tcc => spec/tcc/db}/TccApplication.java| 2 +-
.../tcc => spec/tcc/db}/TccCallbackEngineTest.java | 16 +-
.../tcc => spec/tcc/db}/TccConfiguration.java | 8 +-
.../db}/TccCoordinateCommandStreamObserver.java| 2 +-
.../tcc/db}/jpa/EventConverterTest.java| 2 +-
.../tcc/db}/service/MemoryEventRegistryTest.java | 6 +-
.../tcc/db}/service/TccTxEventServiceTest.java | 20 +-
.../service/TccTxEventServiceTransactionTest.java | 21 ++-
.../{alpha-fsm => alpha-spec-saga-akka}/README.md | 0
alpha/{alpha-fsm => alpha-spec-saga-akka}/pom.xml | 22 ++-
.../akka/AlphaSpecSagaAkkaAutoConfiguration.java | 201 +
.../saga/akka}/CompensateAckCountDownLatch.java| 2 +-
.../alpha/spec/saga/akka}/GrpcOmegaCallback.java | 2 +-
.../spec/saga/akka}/GrpcSagaEventService.java | 4 +-
.../pack/alpha/spec/saga/akka}/SagaActor.java | 20 +-
.../pack/alpha/spec/saga/akka}/SagaActorState.java | 2 +-
.../spec/saga/akka}/SagaShardRegionActor.java | 3 +-
.../saga/akka/api/SagaAkkaAPIv1Controller.java}| 23 ++-
.../spec/saga/akka/api/SagaAkkaAPIv1Impl.java} | 10 +-
.../akka}/channel/AbstractActorEventChannel.java | 5 +-
.../saga/akka}/channel/AbstractEventConsumer.java | 4 +-
.../akka/channel/kafka/KafkaActorEventChannel.java | 84 +
.../akka}/channel/kafka/KafkaMessagePublisher.java | 17 +-
.../channel/kafka/KafkaSagaEventConsumer.java | 10 +-
.../channel/memory/MemoryActorEventChannel.java| 8 +-
.../channel/memory/MemorySagaEventConsumer.java| 6 +-
.../channel/rabbit/RabbitActorEventChannel.java| 6 +-
.../rabbit/RabbitChannelAutoConfiguration.java | 11 +-
.../akka}/channel/rabbit/RabbitMessageChannel.java | 2 +-
.../channel/rabbit/RabbitMessagePublisher.java | 5 +-
.../channel/rabbit/RabbitSagaEventConsumer.java| 17 +-
.../akka}/channel/redis/MessageSerializer.java | 2 +-
.../channel/redis/RedisActorEventChannel.java | 7 +-
.../redis/RedisChannelAutoConfiguration.java | 7 +-
.../akka}/channel/redis/RedisMessagePublisher.java | 2 +-
.../channel/redis/RedisSagaEventConsumer.java
[servicecomb-pack] 03/03: Update document
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 9dca5c1b92b40eccacf8d1ed1800c1117d1098e0
Author: Lei Zhang
AuthorDate: Thu Apr 7 22:17:03 2022 +0800
Update document
---
alpha/alpha-benchmark/README.md| 2 +-
docs/fsm/eventchannel_zh.md| 56 -
docs/{fsm => spec-saga-akka}/akka_zh.md| 0
docs/{fsm => spec-saga-akka}/apis_zh.md| 0
.../assets/alpha-cluster-architecture.png | Bin
.../assets/benchmark-alpha-1.png | Bin
.../assets/benchmark-alpha-2.png | Bin
.../assets/cmd-0.4.0-1w-100.png| Bin
.../assets/cmd-0.4.0-1w-500.png| Bin
.../assets/cmd-0.5.0-1w-100.png| Bin
.../assets/cmd-0.5.0-1w-1000.png | Bin
.../assets/cmd-0.5.0-1w-2000.png | Bin
.../assets/cmd-0.5.0-1w-500.png| Bin
.../assets/cmd-0.5.0-5w-1000.png | Bin
.../assets/cmd-0.5.0-5w-2000.png | Bin
.../assets/cmd-0.5.0-5w-3000.png | Bin
docs/{fsm => spec-saga-akka}/assets/fsm.png| Bin
.../assets/saga_state_diagram.png | Bin
.../{fsm => spec-saga-akka}/assets/state_table.png | Bin
.../assets/ui-dashboard.png| Bin
.../assets/ui-transaction-details-compensated.png | Bin
.../ui-transaction-details-failed-timeout.png | Bin
...ui-transaction-details-failed-unpredictable.png | Bin
.../assets/ui-transaction-details-failed.png | Bin
.../assets/ui-transaction-details-successful.png | Bin
.../assets/ui-transactions-list.png| Bin
.../assets/vm-0.4.0-1w-100.png | Bin
.../assets/vm-0.4.0-1w-500.png | Bin
.../assets/vm-0.5.0-1w-100.png | Bin
.../assets/vm-0.5.0-1w-1000.png| Bin
.../assets/vm-0.5.0-1w-2000.png| Bin
.../assets/vm-0.5.0-1w-500.png | Bin
.../assets/vm-0.5.0-5w-1000.png| Bin
.../assets/vm-0.5.0-5w-2000.png| Bin
.../assets/vm-0.5.0-5w-3000.png| Bin
docs/{fsm => spec-saga-akka}/benchmark_zh.md | 11 ++--
docs/{fsm => spec-saga-akka}/design_fsm_zh.md | 0
docs/spec-saga-akka/eventchannel_zh.md | 56 +
docs/{fsm => spec-saga-akka}/fsm_manual.md | 51 +--
docs/{fsm => spec-saga-akka}/fsm_manual_zh.md | 35 +++--
docs/{fsm => spec-saga-akka}/persistence_zh.md | 12 ++---
.../plantuml/saga-state-diagram.puml | 0
docs/user_guide.md | 28 +--
docs/user_guide_zh.md | 32 +---
44 files changed, 159 insertions(+), 124 deletions(-)
diff --git a/alpha/alpha-benchmark/README.md b/alpha/alpha-benchmark/README.md
index 32d01e7e..27658475 100644
--- a/alpha/alpha-benchmark/README.md
+++ b/alpha/alpha-benchmark/README.md
@@ -70,7 +70,7 @@ java \
-Dcom.sun.management.jmxremote.port=9090 \
-Dcom.sun.management.jmxremote.ssl=false \
-Dcom.sun.management.jmxremote.authenticate=false \
- -jar alpha-server-0.5.0-SNAPSHOT-exec.jar \
+ -jar alpha-server-0.7.0-SNAPSHOT-exec.jar \
--spring.datasource.username=saga-user \
--spring.datasource.password=saga-password \
--spring.datasource.url="jdbc:postgresql://0.0.09.0:5432/saga?useSSL=false" \
diff --git a/docs/fsm/eventchannel_zh.md b/docs/fsm/eventchannel_zh.md
deleted file mode 100644
index 207eb935..
--- a/docs/fsm/eventchannel_zh.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# 事件通道
-
-Alpha 收到 Omeag 发送的事件后放入事件通道等待 Akka 处理，事件通道有三种实现方式，一种是内存通道另外是 Kafka,Rabbit 通道
-
-| 通道类型 | 模式 | 说明 |
-| | |
|
-| memory | 单例 | 使用内存作为数据通道，不建议在生产环境使用 |
-| kafka| 集群 | 使用 Kafka 作为数据通道，使用全局事务ID作为分区策略，集群中的所有节点同时工作，可水平扩展，当配置了
spring.profiles.active=prd,cluster 参数后默认就使用 kafka 通道 |
-| rabbit| 集群 | 使用 rabbit 作为数据通道，使用全局事务ID作为分区策略, 由于rabbit 原生不支持分区，所以引用了
[spring-cloud-stream](https://github.com/spring-cloud/spring-cloud-stream-binder-rabbit)
|
-
- 可以使用参数 `alpha.feature.akka.channel.type` 配置通道类型
-
-- Memory 通道参数
-
-| 参数名 | 参数值 | 说明
|
-| -- | -- |
--- |
-| alpha.feature.akka.channel.type| memory |
|
-| alpha.feature.akka.channel.memory.size | -1 |
momory类型时内存队列大小，-1表示Integer.MAX |
-
-- Kafka 通道参数
-
-| 参数名
[servicecomb-pack] 01/01: SCB-2438 Upgrade the spring framework version to 5.2.20
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-2438
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit f44a643e93d4ec535530a98cf5e9e7e6b97148a8
Author: Willem Jiang
AuthorDate: Sat Apr 2 08:50:06 2022 +0800
SCB-2438 Upgrade the spring framework version to 5.2.20
---
pack-dependencies/pom.xml | 10 ++
1 file changed, 10 insertions(+)
diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml
index ba7e04a..8b57a99 100644
--- a/pack-dependencies/pom.xml
+++ b/pack-dependencies/pom.xml
@@ -48,6 +48,9 @@
3.0.13.RELEASE
3.0.14.RELEASE
+
+5.2.20.RELEASE
+
2.5.32
1.0.5
@@ -116,6 +119,13 @@
+org.springframework
+spring-framework-bom
+${spring-framework.version}
+pom
+import
+
+
org.springframework.boot
spring-boot-dependencies
${spring.boot.version}
[servicecomb-pack] branch SCB-2438 created (now f44a643)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2438 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. at f44a643 SCB-2438 Upgrade the spring framework version to 5.2.20 This branch includes the following new commits: new f44a643 SCB-2438 Upgrade the spring framework version to 5.2.20 The 1 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.
[servicecomb-website] branch asf-site updated: Publish the website
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git The following commit(s) were added to refs/heads/asf-site by this push: new a887998 Publish the website a887998 is described below commit a8879986ed0c23f90eeae4da84f0c99e2d4f3d39 Author: Willem Jiang AuthorDate: Mon Mar 28 19:45:14 2022 +0800 Publish the website --- content/cn/release/index.html | 6 +- .../cn/release/java-chassis-downloads/index.html | 79 ++- content/feed.xml | 2 +- content/release/index.html | 7 +- content/release/java-chassis-downloads/index.html | 75 +- content/sitemap.xml| 112 ++--- 6 files changed, 168 insertions(+), 113 deletions(-) diff --git a/content/cn/release/index.html b/content/cn/release/index.html index 37b8fc8..65a6ee6 100644 --- a/content/cn/release/index.html +++ b/content/cn/release/index.html @@ -535,13 +535,13 @@ ServiceComb Pack 0.6.0 (released on 2020-05-26) -ServiceComb Service-Center 2.0.0 (released on 2021-06-04) +ServiceComb Service-Center 2.1.0 (released on 2022-03-15) ServiceComb toolkit 0.2.0 (released on 2020-01-05) -ServiceComb Java-Chassis 2.6.0 (released on 2021-12-01) +ServiceComb Java-Chassis 2.6.3 (released on 2022-03-15) ServiceComb Saga Actuator 0.3.0 (released on 2018-12-18) @@ -560,6 +560,7 @@ 先前发行版本 : + ServiceComb Service-Center 2.0.0 (released on 2021-06-04) ServiceComb Service-Center 1.3.0 (released on 2019-11-07) ServiceComb Service-Center 1.2.0 (released on 2019-04-06) ServiceComb Service-Center 1.1.0 (released on 2018-11-30) @@ -568,6 +569,7 @@ ServiceComb Service-Center 1.0.0-m1 (released on 2018-03-27) + ServiceComb Java-Chassis 2.6.0 (released on 2021-12-17) ServiceComb Java-Chassis 2.5.0 (released on 2021-08-17) ServiceComb Java-Chassis 2.3.0 (released on 2021-06-22) ServiceComb Java-Chassis 2.2.0 (released on 2021-02-28) diff --git a/content/cn/release/java-chassis-downloads/index.html b/content/cn/release/java-chassis-downloads/index.html index 0621fdf..5ac6830 100644 --- a/content/cn/release/java-chassis-downloads/index.html +++ b/content/cn/release/java-chassis-downloads/index.html @@ -533,74 +533,107 @@ 源码 发布包 Recommended Version of Service-Center + - Apache ServiceComb Java-Chassis 2.6.0 (Latest) - https://dist.apache.org/repos/dist/release/servicecomb/servicecomb-java-chassis/2.6.0/;>下载 - https://dist.apache.org/repos/dist/release/servicecomb/servicecomb-java-chassis/2.6.0/;>下载 + Apache ServiceComb Java-Chassis 2.6.3 (Latest) + https://dlcdn.apache.org/servicecomb/servicecomb-java-chassis/2.6.3/apache-servicecomb-java-chassis-distribution-2.6.3-src.zip;>[src] https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.6.3/apache-servicecomb-java-chassis-distribution-2.6.3-src.zip.asc;>[asc] https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.6.3/apache-servicecomb-java-chassis-distribution-2.6.3-src.zip.sha512;>[sha512] + https://dlcdn.apache.org/servicecomb/servicecomb-java-chassis/2.6.3/apache-servicecomb-java-chassis-distribution-2.6.3-bin.zip;>[Binary] https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.6.3/apache-servicecomb-java-chassis-distribution-2.6.3-bin.zip.asc;>[asc] https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.6.3/apache-servicecomb-java-chassis-distribution-2.6.3-bin.zip.sha512;>[sha512] Service-Center 1.3.0 or above + + + + Apache ServiceComb Java-Chassis 2.6.0 + https://archive.apache.org/dist/servicecomb/servicecomb-java-chassis/2.6.0/apache-servicecomb-java-chassis-distribution-2.6.0-src.zip;>[src] https://archive.apache.org/dist/servicecomb/servicecomb-java-chassis/2.6.0/apache-servicecomb-java-chassis-distribution-2.6.0-src.zip.asc;>[asc] https://archive.apache.org/dist/servicecomb/servicecomb-java-chassis/2.6.0/apache-servicecomb-java-chassis-distribution-2.6.0-src.zip.sha512;>[sha512] + https://archive.apache.org/dist/servicecomb/servicecomb-java-chassis/2.6.0/apache-servicecomb-java-chassis-distribution-2.6.0-bin.zip;>[Binary] https://archive.apache.org/dist/servicecomb/servicecomb-java-chassis/2.6.0/apache-servicecomb-java-chassis-distribution-2.6.0-bin.zip.asc;>[asc] https://archive.apache.org/dist/servicecomb/servicecomb-java-chassis/2.6.0/apache-servicecomb-java-chassis-distribution-2.6.0-bin.zip.sha512;>[sha512] + Service-Center 1.3.0 or above + Apache ServiceComb Java-Chassis 2.5.0 - https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-java-chassis/2.5.0/ap
[servicecomb-website] 01/01: Update the release links of java-chassis
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch release-update in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git commit 2d702fc92d314343f31be7dbc46b89655c20177d Author: Willem Jiang AuthorDate: Mon Mar 28 14:50:27 2022 +0800 Update the release links of java-chassis --- _release/cn/java_chassis_downloads.md | 101 +++-- _release/cn/release.md| 6 +- _release/java_chassis_downloads.md| 103 +++--- _release/release.md | 6 +- 4 files changed, 123 insertions(+), 93 deletions(-) diff --git a/_release/cn/java_chassis_downloads.md b/_release/cn/java_chassis_downloads.md index fa6d300..32e04d3 100644 --- a/_release/cn/java_chassis_downloads.md +++ b/_release/cn/java_chassis_downloads.md @@ -11,54 +11,69 @@ last_modified_at: 2019-04-12T00:50:43-55:00 | Release | 源码| 发布包 | Recommended Version of Service-Center | | -- | - | - | - | -|**Apache ServiceComb Java-Chassis 2.6.0 (Latest)**|[下载][download_2_6_0]|[下载][download_2_6_0]|Service-Center 1.3.0 or above| +|**Apache ServiceComb Java-Chassis 2.6.3 (Latest)**|[[src]][src_2_6_3] [[asc]][src_asc_2_6_3] [[sha512]][src_sha512_2_6_3]|[[Binary]][bin_2_6_3] [[asc]][bin_asc_2_6_3] [[sha512]][bin_sha512_2_6_3]|Service-Center 1.3.0 or above|| +|Apache ServiceComb Java-Chassis 2.6.0 |[[src]][src_2_6_0] [[asc]][src_asc_2_6_0] [[sha512]][src_sha512_2_6_0]|[[Binary]][bin_2_6_0] [[asc]][bin_asc_2_6_0] [[sha512]][bin_sha512_2_6_0]|Service-Center 1.3.0 or above|| |Apache ServiceComb Java-Chassis 2.5.0|[[src]][src_2_5_0] [[asc]][src_asc_2_5_0] [[sha512]][src_sha512_2_5_0]|[[Binary]][bin_2_5_0] [[asc]][bin_asc_2_5_0] [[sha512]][bin_sha512_2_5_0]|Service-Center 1.3.0 or above| |Apache ServiceComb Java-Chassis 2.3.0|[[src]][src_2_3_0] [[asc]][src_asc_2_3_0] [[sha512]][src_sha512_2_3_0]|[[Binary]][bin_2_3_0] [[asc]][bin_asc_2_3_0] [[sha512]][bin_sha512_2_3_0]|Service-Center 1.3.0 or above| |Apache ServiceComb Java-Chassis 2.2.0|[[src]][src_2_2_0] [[asc]][src_asc_2_2_0] [[sha512]][src_sha512_2_2_0]|[[Binary]][bin_2_2_0] [[asc]][bin_asc_2_2_0] [[sha512]][bin_sha512_2_2_0]|Service-Center 1.3.0 or above| |Apache ServiceComb Java-Chassis 2.1.5|[[src]][src_2_1_5] [[asc]][src_asc_2_1_5] [[sha512]][src_sha512_2_1_5]|[[Binary]][bin_2_1_5] [[asc]][bin_asc_2_1_5] [[sha512]][bin_sha512_2_1_5]|Service-Center 1.3.0 or above| |Apache ServiceComb Java-Chassis 2.1.3|[[src]][src_2_1_3] [[asc]][src_asc_2_1_3] [[sha512]][src_sha512_2_1_3]|[[Binary]][bin_2_1_3] [[asc]][bin_asc_2_1_3] [[sha512]][bin_sha512_2_1_3]|Service-Center 1.3.0 or above| -|Apache ServiceComb Java-Chassis 2.1.2|[[src]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-java-chassis/2.1.2/apache-servicecomb-java-chassis-distribution-2.1.2-src.zip) [[asc]](https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.1.2/apache-servicecomb-java-chassis-distribution-2.1.2-src.zip.asc) [[sha512]](https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.1.2/apache-servicecomb-java-chassis-distribution-2.1.2-src.zip.sha512)|[[Binary]](https [...] -|Apache ServiceComb Java-Chassis 2.1.0|[[src]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-java-chassis/2.1.0/apache-servicecomb-java-chassis-distribution-2.1.0-src.zip) [[asc]](https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.1.0/apache-servicecomb-java-chassis-distribution-2.1.0-src.zip.asc) [[sha512]](https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.1.0/apache-servicecomb-java-chassis-distribution-2.1.0-src.zip.sha512)|[[Binary]](https [...] -|Apache ServiceComb Java-Chassis 2.0.2|[[src]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-java-chassis/2.0.2/apache-servicecomb-java-chassis-distribution-2.0.2-src.zip) [[asc]](https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.0.2/apache-servicecomb-java-chassis-distribution-2.0.2-src.zip.asc) [[sha512]](https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.0.2/apache-servicecomb-java-chassis-distribution-2.0.2-src.zip.sha512)|[[Binary]](https [...] -|Apache ServiceComb Java-Chassis 2.0.1|[[src]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-java-chassis/2.0.1/apache-servicecomb-java-chassis-distribution-2.0.1-src.zip) [[asc]](https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.0.1/apache-servicecomb-java-chassis-distribution-2.0.1-src.zip.asc) [[sha512]](https://www.apache.org/dist/servicecomb/servicecomb-java-chassis/2.0.1/apache-servicecomb-java-chassis-distribution-2.0.1-src.zip.sha512)|[[Binary]](https [...] -|Apache ServiceComb Java-Chassis 2.0.0|[[src]](https://apache.org/dyn/closer.cgi
[servicecomb-website] branch release-update created (now 2d702fc)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch release-update in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git. at 2d702fc Update the release links of java-chassis This branch includes the following new commits: new 2d702fc Update the release links of java-chassis The 1 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.
svn commit: r53355 - /release/servicecomb/servicecomb-toolkit/0.1.0/
Author: ningjiang Date: Mon Mar 28 02:58:38 2022 New Revision: 53355 Log: Removed the old version of servicecomb-toolkit Removed: release/servicecomb/servicecomb-toolkit/0.1.0/
svn commit: r53354 - in /release/servicecomb/servicecomb-service-center: 1.3.0/ 2.0.0/
Author: ningjiang Date: Mon Mar 28 02:57:58 2022 New Revision: 53354 Log: Removed the old version of servicecomb-service-center Removed: release/servicecomb/servicecomb-service-center/1.3.0/ release/servicecomb/servicecomb-service-center/2.0.0/
svn commit: r53353 - /release/servicecomb/servicecomb-pack/0.5.0/
Author: ningjiang Date: Mon Mar 28 02:56:47 2022 New Revision: 53353 Log: Removed the old version of servicecomb-pack Removed: release/servicecomb/servicecomb-pack/0.5.0/
svn commit: r53352 - /release/servicecomb/servicecomb-kie/0.1.0/
Author: ningjiang Date: Mon Mar 28 02:55:58 2022 New Revision: 53352 Log: Removed the old version of servicecomb-kie Removed: release/servicecomb/servicecomb-kie/0.1.0/
svn commit: r53351 - in /release/servicecomb/servicecomb-java-chassis: 2.0.0/ 2.0.1/ 2.0.2/ 2.1.0/ 2.1.2/ 2.1.3/ 2.1.5/ 2.2.0/ 2.3.0/ 2.5.0/ 2.6.0/
Author: ningjiang Date: Mon Mar 28 02:55:01 2022 New Revision: 53351 Log: Removed the old version kit of servicecomb-java-chassis Removed: release/servicecomb/servicecomb-java-chassis/2.0.0/ release/servicecomb/servicecomb-java-chassis/2.0.1/ release/servicecomb/servicecomb-java-chassis/2.0.2/ release/servicecomb/servicecomb-java-chassis/2.1.0/ release/servicecomb/servicecomb-java-chassis/2.1.2/ release/servicecomb/servicecomb-java-chassis/2.1.3/ release/servicecomb/servicecomb-java-chassis/2.1.5/ release/servicecomb/servicecomb-java-chassis/2.2.0/ release/servicecomb/servicecomb-java-chassis/2.3.0/ release/servicecomb/servicecomb-java-chassis/2.5.0/ release/servicecomb/servicecomb-java-chassis/2.6.0/
[servicecomb-website] branch master updated: release service-center 2.1.0 (#289)
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-website.git
The following commit(s) were added to refs/heads/master by this push:
new f33ffbc release service-center 2.1.0 (#289)
f33ffbc is described below
commit f33ffbc3915bc72ffd9e71351d5850d96439eded
Author: robotljw <790504...@qq.com>
AuthorDate: Sat Mar 26 08:24:45 2022 +0800
release service-center 2.1.0 (#289)
---
_docs/cn/products/service-center/install.md | 8 ++---
_docs/products/service-center/install.md| 8 ++---
_pages/cn/home.md | 2 +-
_pages/home.md | 2 +-
_release/cn/service_center_downloads.md | 3 +-
_release/cn/service_center_releaseNotes.md | 54 -
_release/release.md | 9 +++--
_release/service_center_downloads.md| 7 ++--
_release/service_center_releaseNotes.md | 48 -
9 files changed, 106 insertions(+), 35 deletions(-)
diff --git a/_docs/cn/products/service-center/install.md
b/_docs/cn/products/service-center/install.md
index d7dad6d..74da2d7 100644
--- a/_docs/cn/products/service-center/install.md
+++ b/_docs/cn/products/service-center/install.md
@@ -10,17 +10,17 @@ last_modified_at: 2019-11-12T00:50:43-55:00
{% include toc %}
## 服务中心 ServiceCenter
ServiceCenter是一个服务注册中心。 服务提供者可以将自身的实例信息注册到 ServiceCenter，以供服务消费者发现并使用它。
-
+
## 版本发布包启动
1. 下载 [最新版本的Service-Center](/cn/release/service-center-downloads/)
- 此处使用了 apache-servicecomb-service-center-2.0.0-linux-amd64.tar.gz
包做介绍，实际操作时请根据系统环境从下载页面选取最新版本
+ 此处使用了 apache-servicecomb-service-center-2.1.0-linux-amd64.tar.gz
包做介绍，实际操作时请根据系统环境从下载页面选取最新版本
2. 启动服务
```bash
# 解压tar包
- $ tar -zxvf apache-servicecomb-service-center-2.0.0-linux-amd64.tar.gz
+ $ tar -zxvf apache-servicecomb-service-center-2.1.0-linux-amd64.tar.gz
# 启动servicecenter服务
- $ cd apache-servicecomb-service-center-2.0.0-linux-amd64/
+ $ cd apache-servicecomb-service-center-2.1.0-linux-amd64/
$ ./start-service-center.sh
```
3. 查看服务状态
diff --git a/_docs/products/service-center/install.md
b/_docs/products/service-center/install.md
index d542bec..d4f4991 100644
--- a/_docs/products/service-center/install.md
+++ b/_docs/products/service-center/install.md
@@ -10,17 +10,17 @@ last_modified_at: 2019-11-12T00:50:43-55:00
{% include toc %}
## Service-Center
ServiceCenter is a service registry. The service provider can register its own
instance information to the ServiceCenter for the service consumer to discover
and use.
-
+
## Run with release package
1. Download [the latest release package of
Service-Center](/release/service-center-downloads/)
- This example uses
apache-servicecomb-service-center-2.0.0-linux-amd64.tar.gz
+ This example uses
apache-servicecomb-service-center-2.1.0-linux-amd64.tar.gz
2. Start service-center
```bash
# Decompression the package
- $ tar -zxvf apache-servicecomb-service-center-2.0.0-linux-amd64.tar.gz
+ $ tar -zxvf apache-servicecomb-service-center-2.1.0-linux-amd64.tar.gz
# Start the service of servicecenter
- $ cd apache-servicecomb-service-center-2.0.0-linux-amd64/
+ $ cd apache-servicecomb-service-center-2.1.0-linux-amd64/
$ ./start-service-center.sh
```
3. View service status
diff --git a/_pages/cn/home.md b/_pages/cn/home.md
index 67d0f34..fc052d6 100755
--- a/_pages/cn/home.md
+++ b/_pages/cn/home.md
@@ -31,7 +31,7 @@ intro:
Apache ServiceComb
Java-Chassis 发布 2.6.0
-Apache ServiceComb
Service-Center 发布 2.0.0
+Apache ServiceComb
Service-Center 发布 2.1.0
Apache ServiceComb Toolkit
发布0.2.0
diff --git a/_pages/home.md b/_pages/home.md
index 22b0006..59252cb 100755
--- a/_pages/home.md
+++ b/_pages/home.md
@@ -31,7 +31,7 @@ intro:
Apache ServiceComb Java-Chassis
Release Version 2.6.0
-Apache ServiceComb
Service-Center Release Version 2.0.0
+Apache ServiceComb
Service-Center Release Version 2.1.0
Apache ServiceComb Toolkit 0.2.0 is
released
diff --git a/_release/cn/service_center_downloads.md
b/_release/cn/service_center_downloads.md
index 5e74618..88f10a7 100644
--- a/_release/cn/service_center_downloads.md
+++ b/_release/cn/service_center_downloads.md
@@ -11,7 +11,8 @@ last_modified_at: 2021-06-04T00:50:43-55:00
| 版本号 | 源码| Windows版本 |
Linux版本 | Darwin版本 |
与之兼容的Java-Chassis版本 |
| -- | - |
- | - |
- |- |
-| **Apache ServiceComb Service-Center 2.0.0 (LATEST)**
|[[src]](https://apache.org/dyn/closer.cgi/servicecomb/servicecomb-s
[servicecomb-pack] 10/10: SCB-2421 Fix test case for slow CI
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 58ab961be99bdf92d0c67e0567983678075553c3
Author: Lei Zhang
AuthorDate: Tue Mar 8 17:57:27 2022 +0800
SCB-2421 Fix test case for slow CI
---
.../pack/alpha/fsm/SagaIntegrationTest.java| 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git
a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java
b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java
index b642eb9..a94760b 100644
---
a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java
+++
b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java
@@ -94,7 +94,7 @@ public class SagaIntegrationTest {
SagaEventSender.successfulEvents(globalTxId, localTxId_1, localTxId_2,
localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
-await().atMost(10, SECONDS).until(() -> {
+await().atMost(60, SECONDS).until(() -> {
SagaData sagaData =
SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system)
.getLastSagaData();
return sagaData != null && sagaData.isTerminated()
@@ -122,7 +122,7 @@ public class SagaIntegrationTest {
memoryActorEventChannel.send(event);
});
-await().atMost(10, SECONDS).until(() -> {
+await().atMost(60, SECONDS).until(() -> {
SagaData sagaData =
SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() &&
sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -141,7 +141,7 @@ public class SagaIntegrationTest {
SagaEventSender.middleTxAbortedEvents(globalTxId, localTxId_1,
localTxId_2).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
-await().atMost(10, SECONDS).until(() -> {
+await().atMost(60, SECONDS).until(() -> {
SagaData sagaData =
SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() &&
sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -162,7 +162,7 @@ public class SagaIntegrationTest {
SagaEventSender.lastTxAbortedEvents(globalTxId, localTxId_1, localTxId_2,
localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
-await().atMost(10, SECONDS).until(() -> {
+await().atMost(60, SECONDS).until(() -> {
SagaData sagaData =
SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() &&
sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -184,7 +184,7 @@ public class SagaIntegrationTest {
SagaEventSender.sagaAbortedEventBeforeTxComponsitedEvents(globalTxId,
localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
-await().atMost(10, SECONDS).until(() -> {
+await().atMost(60, SECONDS).until(() -> {
SagaData sagaData =
SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() &&
sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -206,7 +206,7 @@ public class SagaIntegrationTest {
SagaEventSender.receivedRemainingEventAfterFirstTxAbortedEvents(globalTxId,
localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
-await().atMost(10, SECONDS).until(() -> {
+await().atMost(60, SECONDS).until(() -> {
SagaData sagaData =
SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() &&
sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -228,7 +228,7 @@ public class SagaIntegrationTest {
SagaEventSender.sagaAbortedEventAfterAllTxEndedsEvents(globalTxId,
localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
-await().atMost(10, SECONDS).until(() -> {
+await().atMost(60, SECONDS).until(() -> {
SagaData sagaData =
SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() &&
sagaData.getLastState()==SagaActorState.COMPENSATED;
});
@@ -250,7 +250,7 @@ public class SagaIntegrationTest {
SagaEventSender.omegaSendSagaTimeoutEvents(globalTxId, localTxId_1,
localTxId_2, localTxId_3).str
[servicecomb-pack] 07/10: SCB-2421 Compatible with Elasticsearch 7.X
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 f8635a103feee220138b00112bc423275095ec05
Author: Lei Zhang
AuthorDate: Tue Mar 8 13:51:56 2022 +0800
SCB-2421 Compatible with Elasticsearch 7.X
---
acceptance-tests/acceptance-pack-akka-spring-demo/pom.xml | 10 +-
.../elasticsearch/ElasticsearchTransactionRepository.java | 7 +++
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/acceptance-tests/acceptance-pack-akka-spring-demo/pom.xml
b/acceptance-tests/acceptance-pack-akka-spring-demo/pom.xml
index 5e3f7d5..8faed9a 100644
--- a/acceptance-tests/acceptance-pack-akka-spring-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-akka-spring-demo/pom.xml
@@ -75,21 +75,21 @@
- elasticsearch:6.6.2
+ elasticsearch:7.17.1
elasticsearch
single-node
- started
+ successfully reloaded
9200
9300
- 6
+ 12
elasticsearch.rest.port:9200
@@ -107,8 +107,7 @@
true
elasticsearch
-
docker-cluster
-
elasticsearch.servicecomb.io:9300
+
http://elasticsearch.servicecomb.io:9200
postgres:postgresql.servicecomb.io
@@ -130,6 +129,7 @@
postgres
+ elasticsearch
diff --git
a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java
b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java
index 0743f68..9e1f0c7 100644
---
a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java
+++
b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java
@@ -19,7 +19,6 @@ package
org.apache.servicecomb.pack.alpha.fsm.repository.elasticsearch;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
@@ -35,7 +34,7 @@ import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.aggregations.AggregationBuilders;
import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation;
-import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
+import org.elasticsearch.search.aggregations.bucket.terms.ParsedStringTerms;
import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortOrder;
import org.slf4j.Logger;
@@ -113,7 +112,7 @@ public class ElasticsearchTransactionRepository implements
TransactionRepository
try{
if (this.template.indexOps(IndexCoordinates.of(INDEX_NAME)).exists()) {
NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder();
-queryBuilder.withSearchType(SearchType.valueOf(INDEX_TYPE));
+//queryBuilder.withSearchType(SearchType.valueOf(INDEX_TYPE));
if (state != null && state.trim().length() > 0) {
queryBuilder.withQuery(QueryBuilders.termQuery("state.keyword",
state));
} else {
@@ -154,7 +153,7 @@ public class ElasticsearchTransactionRepository implements
TransactionRepository
.build();
SearchHits result =
this.template.search(query,Map.class,IndexCoordinates.of(INDEX_NAME));
if (result.getTotalHits() > 0) {
- final StringTerms groupState =
result.getAggregations().get("count_group_by_state");
+ final ParsedStringTerms groupState =
result.getAggregations().get("count_group_by_state");
statistics = groupState.getBuckets()
.stream()
.collect(Collectors.toMap(MultiBucketsAggregation.Bucket::getKeyAsString,
[servicecomb-pack] 05/10: SCB-2421 Spring Cloud Starter Alibaba Nacos Discovery 2.2.6.RELEASE is compatible with Nacos 1.4.2
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 0cea9281e8c041ff7c25b8a2123ab3dc4bb62c7a Author: Lei Zhang AuthorDate: Tue Mar 8 00:08:03 2022 +0800 SCB-2421 Spring Cloud Starter Alibaba Nacos Discovery 2.2.6.RELEASE is compatible with Nacos 1.4.2 --- pack-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml index db882c0..b10d7be 100644 --- a/pack-dependencies/pom.xml +++ b/pack-dependencies/pom.xml @@ -44,7 +44,7 @@ 2.2.10.RELEASE 2.2.8.RELEASE 2.2.5.RELEASE - 2.2.7.RELEASE + 2.2.6.RELEASE 3.0.13.RELEASE 3.0.14.RELEASE
[servicecomb-pack] 06/10: SCB-2421 Fix Nacos docker startup wait for log
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 7767e4351c0b3d897f349f0191a235810bce64c1 Author: Lei Zhang AuthorDate: Tue Mar 8 00:09:26 2022 +0800 SCB-2421 Fix Nacos docker startup wait for log --- acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml index 5313b59..4b03b15 100644 --- a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml +++ b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml @@ -60,13 +60,13 @@ standalone - Nacos started successfully + Completed initialization in 8848 - 6 + 30 nacos.port:8848
[servicecomb-pack] 08/10: SCB-2421 Management Alpha UI module dependencies
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 52cab3b01fa76fc0ffd6ecaf1c12e3df03d083c5
Author: Lei Zhang
AuthorDate: Tue Mar 8 13:54:58 2022 +0800
SCB-2421 Management Alpha UI module dependencies
---
alpha/alpha-ui/pom.xml| 13 +
pack-dependencies/pom.xml | 70 ++-
2 files changed, 70 insertions(+), 13 deletions(-)
diff --git a/alpha/alpha-ui/pom.xml b/alpha/alpha-ui/pom.xml
index 95d8096..9dc2f65 100644
--- a/alpha/alpha-ui/pom.xml
+++ b/alpha/alpha-ui/pom.xml
@@ -30,7 +30,6 @@
Pack::Alpha::UI
-
org.apache.servicecomb.pack
@@ -40,51 +39,41 @@
org.webjars
- webjars-locator
- 0.36
+ webjars-locator-core
org.webjars
bootstrap
- 4.3.1
org.webjars
jquery
- 3.4.1
org.webjars
jquery-easing
- 1.4.1
org.webjars
font-awesome
- 5.9.0
org.webjars
datatables
- 1.10.19
org.webjars
momentjs
- 2.24.0
org.webjars
sockjs-client
- 1.0.2
org.webjars
stomp-websocket
- 2.3.3
-
org.springframework.boot
diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml
index b10d7be..ba7e04a 100644
--- a/pack-dependencies/pom.xml
+++ b/pack-dependencies/pom.xml
@@ -52,7 +52,7 @@
2.5.32
1.0.5
1.8
-0.4.0
+0.4.2
1.44.1
@@ -87,6 +87,17 @@
3.6
3.19.2
+
+0.45
+4.3.1
+3.4.1
+
1.4.1
+5.9.0
+1.10.25
+2.24.0
+
1.0.2
+
2.3.3
+
4.0.1
2.23.4
@@ -308,6 +319,53 @@
${project.version}
+
+
+org.webjars
+webjars-locator-core
+${webjars-locator-core.version}
+
+
+org.webjars
+bootstrap
+${org.webjars.bootstrap.version}
+
+
+org.webjars
+jquery
+${org.webjars.jquery.version}
+
+
+org.webjars
+jquery-easing
+${org.webjars.jquery-easing.version}
+
+
+org.webjars
+font-awesome
+${org.webjars.font-awesome.version}
+
+
+org.webjars
+datatables
+${org.webjars.datatables.version}
+
+
+org.webjars
+momentjs
+${org.webjars.momentjs.version}
+
+
+org.webjars
+sockjs-client
+${org.webjars.sockjs-client.version}
+
+
+org.webjars
+stomp-websocket
+${org.webjars.stomp-websocket.version}
+
+
com.fasterxml.jackson.core
@@ -483,6 +541,16 @@
com.safety-data
akka-persistence-redis_2.12
${akka-persistence-redis.version}
+
+
+akka-persistence_2.12
+com.typesafe.akka
+
+
+akka-protobuf_2.12
+com.typesafe.akka
+
+
org.fusesource.leveldbjni
[servicecomb-pack] 03/10: SCB-2421 Fix test case timeout on CI
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 6f31e7e204f98dccea06d493a1eb258d10077d3a
Author: Lei Zhang
AuthorDate: Mon Mar 7 20:31:19 2022 +0800
SCB-2421 Fix test case timeout on CI
---
.../java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java
b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java
index 48753d7..b642eb9 100644
---
a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java
+++
b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java
@@ -317,7 +317,7 @@ public class SagaIntegrationTest {
SagaEventSender.successfulWithTxConcurrentCrossEvents(globalTxId,
localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> {
memoryActorEventChannel.send(event);
});
-await().atMost(10, SECONDS).until(() -> {
+await().atMost(60, SECONDS).until(() -> {
SagaData sagaData =
SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
return sagaData !=null && sagaData.isTerminated() &&
sagaData.getLastState()==SagaActorState.COMMITTED;
});
[servicecomb-pack] 02/10: Removed Unused code
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 afb75186b8e3c9450c7b6fd5af14c43078a5a4b5
Author: Lei Zhang
AuthorDate: Mon Mar 7 18:36:56 2022 +0800
Removed Unused code
---
pack-dependencies/pom.xml | 5 -
1 file changed, 5 deletions(-)
diff --git a/pack-dependencies/pom.xml b/pack-dependencies/pom.xml
index 9a0f9eb..db882c0 100644
--- a/pack-dependencies/pom.xml
+++ b/pack-dependencies/pom.xml
@@ -622,11 +622,6 @@
commons-lang3
${commons-lang3.version}
-
-
-
-
-
com.netflix.hystrix
hystrix-core
[servicecomb-pack] 09/10: SCB-2421 Update documents
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 d5419ce0cd1526a5b4e33f66ce6c5edc8147b040 Author: Lei Zhang AuthorDate: Tue Mar 8 14:10:50 2022 +0800 SCB-2421 Update documents --- docs/fsm/fsm_manual.md | 13 + docs/fsm/fsm_manual_zh.md | 13 + docs/fsm/persistence_zh.md | 15 +++ docs/user_guide.md | 32 ++-- docs/user_guide_zh.md | 28 5 files changed, 51 insertions(+), 50 deletions(-) diff --git a/docs/fsm/fsm_manual.md b/docs/fsm/fsm_manual.md index e3e0e68..da8327c 100755 --- a/docs/fsm/fsm_manual.md +++ b/docs/fsm/fsm_manual.md @@ -30,7 +30,7 @@ ServiceComb Pack 0.5.0 开始支持 Saga 状态机模式，你只需要在启动 * 启动 Elasticsearch ```bash - docker run --name elasticsearch -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" elasticsearch:6.6.2 + docker run --name elasticsearch -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" elasticsearch:7.17.1 ``` * 启动 Alpha @@ -42,8 +42,7 @@ ServiceComb Pack 0.5.0 开始支持 Saga 状态机模式，你只需要在启动 --spring.datasource.password=password \ --alpha.feature.akka.enabled=true \ --alpha.feature.akka.transaction.repository.type=elasticsearch \ ---spring.data.elasticsearch.cluster-name=docker-cluster \ ---spring.data.elasticsearch.cluster-nodes=localhost:9300 \ +--spring.elasticsearch.rest.uris=http://127.0.0.1:9200 \ --spring.profiles.active=prd ``` @@ -165,7 +164,7 @@ services: - POSTGRES_PASSWORD=password elasticsearch: -image: elasticsearch:6.6.2 +image: elasticsearch:7.17.1 hostname: elasticsearch container_name: elasticsearch environment: @@ -246,8 +245,7 @@ services: --spring.datasource.username=saga \ --spring.datasource.password=password \ --spring.kafka.bootstrap-servers=127.0.0.1:9092 \ ---spring.data.elasticsearch.cluster-name=docker-cluster \ ---spring.data.elasticsearch.cluster-nodes=127.0.0.1:9300 \ +--spring.elasticsearch.rest.uris=http://127.0.0.1:9200 \ --akkaConfig.akka.remote.artery.canonical.port=8070 \ --akkaConfig.akka.cluster.seed-nodes[0]="akka://alpha-cluster@127.0.0.1:8070" \ --akkaConfig.akka-persistence-redis.redis.host=127.0.0.1 \ @@ -267,8 +265,7 @@ services: --spring.datasource.username=saga \ --spring.datasource.password=password \ --spring.kafka.bootstrap-servers=127.0.0.1:9092 \ ---spring.data.elasticsearch.cluster-name=docker-cluster \ ---spring.data.elasticsearch.cluster-nodes=127.0.0.1:9300 \ +--spring.elasticsearch.rest.uris=http://127.0.0.1:9200 \ --akkaConfig.akka.remote.artery.canonical.port=8071 \ --akkaConfig.akka.cluster.seed-nodes[0]="akka://alpha-cluster@127.0.0.1:8070" \ --akkaConfig.akka-persistence-redis.redis.host=127.0.0.1 \ diff --git a/docs/fsm/fsm_manual_zh.md b/docs/fsm/fsm_manual_zh.md index 1acd53b..31a0367 100755 --- a/docs/fsm/fsm_manual_zh.md +++ b/docs/fsm/fsm_manual_zh.md @@ -30,7 +30,7 @@ ServiceComb Pack 0.5.0 开始支持 Saga 状态机模式，你只需要在启动 * 启动 Elasticsearch ```bash - docker run --name elasticsearch -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" elasticsearch:6.6.2 + docker run -d --name elasticsearch -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" elasticsearch:7.17.1 ``` * 启动 Alpha @@ -42,8 +42,7 @@ ServiceComb Pack 0.5.0 开始支持 Saga 状态机模式，你只需要在启动 --spring.datasource.password=password \ --alpha.feature.akka.enabled=true \ --alpha.feature.akka.transaction.repository.type=elasticsearch \ ---spring.data.elasticsearch.cluster-name=docker-cluster \ ---spring.data.elasticsearch.cluster-nodes=localhost:9300 \ +--spring.elasticsearch.rest.uris=http://127.0.0.1:9200 \ --spring.profiles.active=prd ``` @@ -165,7 +164,7 @@ services: - POSTGRES_PASSWORD=password elasticsearch: -image: elasticsearch:6.6.2 +image: elasticsearch:7.17.1 hostname: elasticsearch container_name: elasticsearch environment: @@ -246,8 +245,7 @@ services: --spring.datasource.username=saga \ --spring.datasource.password=password \ --spring.kafka.bootstrap-servers=127.0.0.1:9092 \ ---spring.data.elasticsearch.cluster-name=docker-cluster \ ---spring.data.elasticsearch.cluster-nodes=127.0.0.1:9300 \ +--spring.elasticsearch.rest.uris=http://127.0.0.1:9200 \ --akkaConfig.akka.remote.artery.canonical.port=8070 \ --akkaConfig.akka.cluster.seed-nodes[0]="akka://alpha-cluster@127.0.0.1:8070" \ --akkaConfig.akka-persistence-redis.redis.host=127.0.0.1 \ @@ -267,8 +265,7 @@ services: --spring.datasource.username=saga \ --spring.datasource.password=password \ --spring.kafka.bootstrap-servers=127.0.0
[servicecomb-pack] 01/10: SCB-2421 Upgrade Spring Boot and Spring Cloud
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 77de3313dd4308cfd249d78c0e650e51af9fa9ef
Author: Lei Zhang
AuthorDate: Mon Mar 7 18:33:09 2022 +0800
SCB-2421 Upgrade Spring Boot and Spring Cloud
* Upgrade spring-boot to 2.3.12.RELEASE
* Upgrade spring-cloud to Hoxton.SR12
---
.../acceptance-pack-spring-demo-with-nacos/pom.xml | 4 +-
.../pack/alpha/fsm/FsmAutoConfiguration.java | 4 +-
.../ElasticsearchTransactionRepository.java| 158 +++--
.../servicecomb/pack/alpha/fsm/SagaActorTest.java | 14 +-
.../pack/alpha/fsm/SagaIntegrationTest.java| 16 ++-
.../ElasticsearchTransactionRepositoryTest.java| 11 +-
.../alpha/server/AlphaEventControllerTest.java | 6 +-
.../alpha/server/AlphaIntegrationWithSSLTest.java | 5 +-
.../pack/alpha/server/api/APIv1ControllerTest.java | 14 +-
.../cluster/master/ClusterLockServiceTest.java | 5 +-
.../alpha/server/fsm/AlphaIntegrationFsmTest.java | 4 +-
.../server/tcc/AlphaTccEventControllerTest.java| 6 +-
.../alpha/server/tcc/MemoryAlphaTccServerTest.java | 5 +-
.../alpha/server/tcc/RdbAlphaTccServerTest.java| 5 +-
.../pack/alpha/server/tcc/TccApplication.java | 1 -
.../alpha/server/tcc/TccCallbackEngineTest.java| 5 +-
.../server/tcc/service/TccTxEventServiceTest.java | 13 +-
.../service/TccTxEventServiceTransactionTest.java | 14 +-
.../consul/AlphaConsulAutoConfiguration.java | 4 +-
alpha/alpha-spring-cloud-starter-nacos/pom.xml | 2 +-
.../nacos/GrpcStartableStartedEventListener.java | 5 +-
.../pack/demo/inventory/InventoryServiceTest.java | 8 +-
.../pack/demo/payment/PaymentServiceTest.java | 8 +-
omega/omega-spring-cloud-nacos-starter/pom.xml | 2 +-
.../omega/spring/cloud/OmegaSpringNacosConfig.java | 2 +-
.../spring/CompensableAnnotationCheckingTest.java | 9 ++
.../transaction/spring/TccInterceptorTest.java | 6 +-
.../spring/TransactionInterceptionTest.java| 6 +-
pack-dependencies/pom.xml | 49 +--
.../jpa/EclipseLinkJpaConfiguration.java | 7 +-
30 files changed, 198 insertions(+), 200 deletions(-)
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml
b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml
index 6b66a04..5313b59 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml
@@ -53,14 +53,14 @@
- nacos/nacos-server
+ nacos/nacos-server:1.4.2
nacos
standalone
- Completed initialization in
+ Nacos started successfully
8848
diff --git
a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/FsmAutoConfiguration.java
b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/FsmAutoConfiguration.java
index 6facf00..aeef923 100644
---
a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/FsmAutoConfiguration.java
+++
b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/FsmAutoConfiguration.java
@@ -46,7 +46,7 @@ import
org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
@Configuration
@ImportAutoConfiguration({
@@ -110,7 +110,7 @@ public class FsmAutoConfiguration {
@Bean
@ConditionalOnProperty(value =
"alpha.feature.akka.transaction.repository.type", havingValue = "elasticsearch")
public TransactionRepository transactionRepository(MetricsService
metricsService,
- ElasticsearchTemplate template) {
+ ElasticsearchRestTemplate template) {
return new ElasticsearchTransactionRepository(template, metricsService,
repositoryElasticsearchBatchSize, repositoryElasticsearchRefreshTime);
}
diff --git
a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java
b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java
index a92b27b..0743f68 100644
---
a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repo
[servicecomb-pack] branch master updated (1611fbe -> 58ab961)
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 1611fbe Merge pull request #744 from apache/SCB-2397 new 77de331 SCB-2421 Upgrade Spring Boot and Spring Cloud new afb7518 Removed Unused code new 6f31e7e SCB-2421 Fix test case timeout on CI new 20cda50 SCB-2421 Close RabbitMQ's health check new 0cea928 SCB-2421 Spring Cloud Starter Alibaba Nacos Discovery 2.2.6.RELEASE is compatible with Nacos 1.4.2 new 7767e43 SCB-2421 Fix Nacos docker startup wait for log new f8635a1 SCB-2421 Compatible with Elasticsearch 7.X new 52cab3b SCB-2421 Management Alpha UI module dependencies new d5419ce SCB-2421 Update documents new 58ab961 SCB-2421 Fix test case for slow CI The 10 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: .../acceptance-pack-akka-spring-demo/pom.xml | 10 +- .../acceptance-pack-spring-demo-with-nacos/pom.xml | 4 +- .../pack/alpha/fsm/FsmAutoConfiguration.java | 4 +- .../ElasticsearchTransactionRepository.java| 161 +++-- .../servicecomb/pack/alpha/fsm/SagaActorTest.java | 14 +- .../pack/alpha/fsm/SagaIntegrationTest.java| 40 +++-- .../ElasticsearchTransactionRepositoryTest.java| 11 +- .../src/main/resources/application.yaml| 2 + .../alpha/server/AlphaEventControllerTest.java | 6 +- .../alpha/server/AlphaIntegrationWithSSLTest.java | 5 +- .../pack/alpha/server/api/APIv1ControllerTest.java | 14 +- .../cluster/master/ClusterLockServiceTest.java | 5 +- .../alpha/server/fsm/AlphaIntegrationFsmTest.java | 4 +- .../server/tcc/AlphaTccEventControllerTest.java| 6 +- .../alpha/server/tcc/MemoryAlphaTccServerTest.java | 5 +- .../alpha/server/tcc/RdbAlphaTccServerTest.java| 5 +- .../pack/alpha/server/tcc/TccApplication.java | 1 - .../alpha/server/tcc/TccCallbackEngineTest.java| 5 +- .../server/tcc/service/TccTxEventServiceTest.java | 13 +- .../service/TccTxEventServiceTransactionTest.java | 14 +- .../consul/AlphaConsulAutoConfiguration.java | 4 +- alpha/alpha-spring-cloud-starter-nacos/pom.xml | 2 +- .../nacos/GrpcStartableStartedEventListener.java | 5 +- alpha/alpha-ui/pom.xml | 13 +- .../pack/demo/inventory/InventoryServiceTest.java | 8 +- .../pack/demo/payment/PaymentServiceTest.java | 8 +- docs/fsm/fsm_manual.md | 13 +- docs/fsm/fsm_manual_zh.md | 13 +- docs/fsm/persistence_zh.md | 15 +- docs/user_guide.md | 32 ++-- docs/user_guide_zh.md | 28 ++-- omega/omega-spring-cloud-nacos-starter/pom.xml | 2 +- .../omega/spring/cloud/OmegaSpringNacosConfig.java | 2 +- .../spring/CompensableAnnotationCheckingTest.java | 9 ++ .../transaction/spring/TccInterceptorTest.java | 6 +- .../spring/TransactionInterceptionTest.java| 6 +- pack-dependencies/pom.xml | 114 +-- .../jpa/EclipseLinkJpaConfiguration.java | 7 +- 38 files changed, 334 insertions(+), 282 deletions(-)
[servicecomb-pack] 04/10: SCB-2421 Close RabbitMQ's health check
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 20cda50631aa665970dfc45647aec82cd7a3e06c Author: Lei Zhang AuthorDate: Tue Mar 8 00:05:58 2022 +0800 SCB-2421 Close RabbitMQ's health check --- alpha/alpha-server/src/main/resources/application.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/alpha/alpha-server/src/main/resources/application.yaml b/alpha/alpha-server/src/main/resources/application.yaml index 14a8a5d..40b010b 100644 --- a/alpha/alpha-server/src/main/resources/application.yaml +++ b/alpha/alpha-server/src/main/resources/application.yaml @@ -105,6 +105,8 @@ management: enabled: false elasticsearch: enabled: false +rabbit: + enabled: false --- spring:
[servicecomb-pack] branch master updated (4bc4238 -> 1611fbe)
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 4bc4238 SCB-2399 try to address the zookeeper docker image loading issue add 2b69ac5 SCB-2397 Add pack-dependencies module management dependencies add 34bca73 SCB-2397 Add pack-dependencies module management dependencies add 7512a88 SCB-2397 Add pack-dependencies module management dependencies add f994c1d SCB-2397 Add pack-dependencies module management dependencies add dead8b4 Merge remote-tracking branch 'origin/SCB-2397' into SCB-2397 add 519c68a SCB-2397 Set the maximum parallel of jobs add 2266715 SCB-2397 Set allContainers to true when this goals stop add 263b4a1 SCB-2397 Add pack-dependencies module management dependencies add 27ada3b SCB-2368 Added the dependency check maven plugin add a4a4fed SCB-2368 Fixed the CVE issue with CVSS 10 add fd5679e SCB-2368 Fixed the CVE issues with CVSS 9 add 91622f9 SCB-2399 Upgarde the docker plugin version to 2399 add a003459 SCB-2399 try to address the zookeeper docker image loading issue add 1f02feb SCB-2397 Add pack-dependencies module management dependencies add 7e4e558 SCB-2397 Add pack-dependencies module management dependencies add 6005506 SCB-2397 Add pack-dependencies module management dependencies add b2e00f0 SCB-2397 Merged the branch with master add 3dc4c4a SCB-2397 Fixed the dubbo accept test error add 3486169 SCB-2397 Remove max-parallel of strategy add db6cdb0 SCB-2397 Remove duplicate definitions add b76229b SCB-2397 Fix typo new 1611fbe Merge pull request #744 from apache/SCB-2397 The 1 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: .../acceptance-pack-akka-spring-demo/pom.xml | 1 - .../acceptance-pack-dubbo-demo/pom.xml | 1 - .../acceptance-pack-spring-demo-with-nacos/pom.xml | 1 - acceptance-tests/pom.xml | 58 +- alpha/alpha-benchmark/pom.xml | 11 - alpha/alpha-core/pom.xml | 1 - alpha/alpha-fsm/pom.xml| 21 - alpha/alpha-server/pom.xml | 45 - alpha/alpha-spring-cloud-starter-consul/pom.xml| 24 - alpha/alpha-spring-cloud-starter-eureka/pom.xml| 29 - alpha/alpha-spring-cloud-starter-nacos/pom.xml | 29 - alpha/alpha-spring-cloud-starter-zookeeper/pom.xml | 34 - alpha/alpha-ui/pom.xml | 17 - alpha/pom.xml | 3 +- demo/pom.xml | 32 +- demo/saga-dubbo-demo/pom.xml | 17 - demo/saga-servicecomb-demo/pom.xml | 12 - .../explicit-transaction-context-tests/pom.xml | 26 - integration-tests/pack-tests/pom.xml | 27 - integration-tests/pom.xml | 3 +- omega/omega-spring-cloud-eureka-starter/pom.xml| 1 - .../omega-transport/omega-transport-dubbo/pom.xml | 1 - .../omega-transport-hystrix/pom.xml| 4 + .../hystrix/OmegaContextCallableWrapper.java | 2 +- omega/pom.xml | 37 +- pack-common/pom.xml| 3 +- pack-contracts/pack-contract-grpc/pom.xml | 6 +- pack-contracts/pom.xml | 3 +- pom.xml => pack-dependencies/pom.xml | 963 - persistence/persistence-jpa/pom.xml| 12 - persistence/pom.xml| 5 +- pom.xml| 661 ++ web/pom.xml| 3 +- 33 files changed, 450 insertions(+), 1643 deletions(-) copy pom.xml => pack-dependencies/pom.xml (52%)
[servicecomb-pack] 01/01: Merge pull request #744 from apache/SCB-2397
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 1611fbe7bccb146de861699db4afc1155c8a606a Merge: 4bc4238 b76229b Author: Willem Jiang AuthorDate: Thu Mar 3 15:36:44 2022 +0800 Merge pull request #744 from apache/SCB-2397 SCB-2397 Add pack-dependencies module management dependencies .../acceptance-pack-akka-spring-demo/pom.xml | 1 - .../acceptance-pack-dubbo-demo/pom.xml | 1 - .../acceptance-pack-spring-demo-with-nacos/pom.xml | 1 - acceptance-tests/pom.xml | 58 +- alpha/alpha-benchmark/pom.xml | 11 - alpha/alpha-core/pom.xml | 1 - alpha/alpha-fsm/pom.xml| 21 - alpha/alpha-server/pom.xml | 45 - alpha/alpha-spring-cloud-starter-consul/pom.xml| 24 - alpha/alpha-spring-cloud-starter-eureka/pom.xml| 29 - alpha/alpha-spring-cloud-starter-nacos/pom.xml | 29 - alpha/alpha-spring-cloud-starter-zookeeper/pom.xml | 34 - alpha/alpha-ui/pom.xml | 17 - alpha/pom.xml | 3 +- demo/pom.xml | 32 +- demo/saga-dubbo-demo/pom.xml | 17 - demo/saga-servicecomb-demo/pom.xml | 12 - .../explicit-transaction-context-tests/pom.xml | 26 - integration-tests/pack-tests/pom.xml | 27 - integration-tests/pom.xml | 3 +- omega/omega-spring-cloud-eureka-starter/pom.xml| 1 - .../omega-transport/omega-transport-dubbo/pom.xml | 1 - .../omega-transport-hystrix/pom.xml| 4 + .../hystrix/OmegaContextCallableWrapper.java | 2 +- omega/pom.xml | 37 +- pack-common/pom.xml| 3 +- pack-contracts/pack-contract-grpc/pom.xml | 6 +- pack-contracts/pom.xml | 3 +- pom.xml => pack-dependencies/pom.xml | 963 - persistence/persistence-jpa/pom.xml| 12 - persistence/pom.xml| 5 +- pom.xml| 661 ++ web/pom.xml| 3 +- 33 files changed, 450 insertions(+), 1643 deletions(-)
[servicecomb-pack] branch SCB-2397 updated (b2e00f0 -> 3dc4c4a)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2397 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. from b2e00f0 SCB-2397 Merged the branch with master add 3dc4c4a SCB-2397 Fixed the dubbo accept test error No new revisions were added by this update. Summary of changes: acceptance-tests/pom.xml | 4 1 file changed, 4 insertions(+)
[servicecomb-pack] branch SCB-2397 updated (6005506 -> b2e00f0)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2397 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. from 6005506 SCB-2397 Add pack-dependencies module management dependencies add 0fb536c SCB-2368 Added the dependency check maven plugin add 69712b2 SCB-2368 Fixed the CVE issue with CVSS 10 add f53e773 SCB-2368 Fixed the CVE issues with CVSS 9 add 2673a9b SCB-2399 Upgarde the docker plugin version to 2399 add 4bc4238 SCB-2399 try to address the zookeeper docker image loading issue add b2e00f0 SCB-2397 Merged the branch with master No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[servicecomb-pack] 02/02: SCB-2399 try to address the zookeeper docker image loading issue
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 4bc4238c75a27860dae021ef694a77f8c8cdbdf8
Author: Willem Jiang
AuthorDate: Mon Feb 28 21:00:51 2022 +0800
SCB-2399 try to address the zookeeper docker image loading issue
---
acceptance-tests/acceptance-pack-dubbo-demo/pom.xml | 2 +-
acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml | 2 +-
acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml | 2 +-
pom.xml | 3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
index e72340e..1caf6a7 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
@@ -52,7 +52,7 @@
- docker.io/zookeeper
+ zookeeper
zookeeper
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml
b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml
index 41f62e9..61cec35 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml
@@ -53,7 +53,7 @@
- nacos/nacos-server:1.1.0
+ nacos/nacos-server
nacos
diff --git
a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml
b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml
index 4751c1d..2e7c5d5 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml
@@ -53,7 +53,7 @@
- zookeeper:3.5.5
+ zookeeper
zookeeper
diff --git a/pom.xml b/pom.xml
index c597127..9fe2254 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
6.0.53
3.0.2
0.8.6
+0.39.1
2.0.48.Final
4.1.74.Final
3.6.2
@@ -692,7 +693,7 @@
io.fabric8
docker-maven-plugin
- 0.39.1
+ ${docker-maven-plugin.version}
com.github.odavid.maven.plugins
[servicecomb-pack] 01/02: SCB-2399 Upgarde the docker plugin version to 2399
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 2673a9bd9e36476128a76497845068a7d862befb Author: Willem Jiang AuthorDate: Mon Feb 28 17:49:13 2022 +0800 SCB-2399 Upgarde the docker plugin version to 2399 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71b9c2b..c597127 100644 --- a/pom.xml +++ b/pom.xml @@ -692,7 +692,7 @@ io.fabric8 docker-maven-plugin - 0.28.0 + 0.39.1 com.github.odavid.maven.plugins
[servicecomb-pack] branch master updated (f53e773 -> 4bc4238)
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 f53e773 SCB-2368 Fixed the CVE issues with CVSS 9 new 2673a9b SCB-2399 Upgarde the docker plugin version to 2399 new 4bc4238 SCB-2399 try to address the zookeeper docker image loading issue 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: acceptance-tests/acceptance-pack-dubbo-demo/pom.xml | 2 +- acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml | 2 +- acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml | 2 +- pom.xml | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-)
[servicecomb-pack] branch SCB-2399 updated (0ec5a67 -> ed5e7b2)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2399 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. from 0ec5a67 SCB-2399 Upgarde the docker plugin version to 2399 add ed5e7b2 SCB-2399 try to address the zookeeper docker image loading issue No new revisions were added by this update. Summary of changes: acceptance-tests/acceptance-pack-dubbo-demo/pom.xml | 2 +- acceptance-tests/acceptance-pack-spring-demo-with-nacos/pom.xml | 2 +- acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml | 2 +- pom.xml | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-)
[servicecomb-pack] 01/01: SCB-2399 Upgarde the docker plugin version to 2399
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch SCB-2399 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git commit 0ec5a6719221e374923ffb1cf09a81057d81a5a0 Author: Willem Jiang AuthorDate: Mon Feb 28 17:49:13 2022 +0800 SCB-2399 Upgarde the docker plugin version to 2399 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b64423c..b0fa401 100644 --- a/pom.xml +++ b/pom.xml @@ -691,7 +691,7 @@ io.fabric8 docker-maven-plugin - 0.28.0 + 0.39.1 com.github.odavid.maven.plugins
[servicecomb-pack] branch SCB-2399 created (now 0ec5a67)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2399 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. at 0ec5a67 SCB-2399 Upgarde the docker plugin version to 2399 This branch includes the following new commits: new 0ec5a67 SCB-2399 Upgarde the docker plugin version to 2399 The 1 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.
[servicecomb-pack] 03/03: SCB-2368 Fixed the CVE issues with CVSS 9
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 f53e77330929560cbd37e243fc15f151283d6471 Author: Willem Jiang AuthorDate: Fri Feb 25 18:09:32 2022 +0800 SCB-2368 Fixed the CVE issues with CVSS 9 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6b3b6cd..71b9c2b 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 1.8 2.17.1 3.3.7 -2.6.4 +2.6.12 2.1.6.RELEASE 2.1.1.RELEASE 2.1.1.RELEASE @@ -65,7 +65,7 @@ 4.0.1 1.2 2.7.1 -2.13.2 +2.13.1 4.0.1 2.3.0 1.1.1 @@ -886,7 +886,7 @@ notifier-dependency-check HTML - 10 + 9 false true true
[servicecomb-pack] branch master updated (03ac6c5 -> f53e773)
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 03ac6c5 Merge pull request #737 from apache/SCB-2391 new 0fb536c SCB-2368 Added the dependency check maven plugin new 69712b2 SCB-2368 Fixed the CVE issue with CVSS 10 new f53e773 SCB-2368 Fixed the CVE issues with CVSS 9 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: pom.xml | 35 +-- 1 file changed, 33 insertions(+), 2 deletions(-)
[servicecomb-pack] 01/03: SCB-2368 Added the dependency check maven plugin
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 0fb536c33c9abd47b39ead909087adf9be77af44
Author: Willem Jiang
AuthorDate: Fri Feb 25 17:36:29 2022 +0800
SCB-2368 Added the dependency check maven plugin
---
pom.xml | 31 +++
1 file changed, 31 insertions(+)
diff --git a/pom.xml b/pom.xml
index b64423c..f8ca805 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
1.5.12
9.5.1
2.23.4
+6.5.3
Apache ServiceComb Pack
@@ -875,6 +876,36 @@
+ dependency-check
+
+
+
+org.owasp
+dependency-check-maven
+${dependency-check.version}
+
+ notifier-dependency-check
+ HTML
+ 9
+ false
+ true
+ true
+ true
+ false
+ pom
+
+
+
+
+ aggregate
+
+
+
+
+
+
+
+
release
demo
[servicecomb-pack] 02/03: SCB-2368 Fixed the CVE issue with CVSS 10
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 69712b2baee6be9f5710a8b8585e6d6b0c7bbc29 Author: Willem Jiang AuthorDate: Fri Feb 25 17:57:39 2022 +0800 SCB-2368 Fixed the CVE issue with CVSS 10 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f8ca805..6b3b6cd 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 4.0.1 1.2 2.7.1 -2.9.0 +2.13.2 4.0.1 2.3.0 1.1.1 @@ -886,7 +886,7 @@ notifier-dependency-check HTML - 9 + 10 false true true
[servicecomb-pack] branch SCB-2368 updated (e6fd493 -> 22efa51)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2368 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. from e6fd493 SCB-2368 Fixed the CVE issue with CVSS 10 add 22efa51 SCB-2368 Fixed the CVE issues with CVSS 9 No new revisions were added by this update. Summary of changes: pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[servicecomb-pack] branch SCB-2368 updated (0c57ed4 -> e6fd493)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch SCB-2368
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git.
discard 0c57ed4 SCB-2368 Added the dependency check maven plugin
add 38a7284 SCB-2394 Try to fix the github action radmon test error
add f36e124 Merge pull request #736 from apache/SCB-2394
add fe4b5ad SCB-2395 Upgraded Log4j to 2.17.1
add 248efdf Merge pull request #739 from apache/SCB-2395
add ad34577 SCB-2391 (WIP) Added more scenarios in TCC accept tests
add 052d0f9 SCB-2391 try to fix the Accept test error
add 03ac6c5 Merge pull request #737 from apache/SCB-2391
new b6e1dcb SCB-2368 Added the dependency check maven plugin
new e6fd493 SCB-2368 Fixed the CVE issue with CVSS 10
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0c57ed4)
\
N -- N -- N refs/heads/SCB-2368 (e6fd493)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
.../resources/pack_tcc_cancel_scenario.feature | 2 +
feature => pack_tcc_cancel_scenario_b.feature} | 8 ++--
feature => pack_tcc_cancel_scenario_c.feature} | 7 +++-
.../server/AlphaIntegrationWithRandomPortTest.java | 45 --
pom.xml| 7 ++--
5 files changed, 37 insertions(+), 32 deletions(-)
copy
acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/{pack_tcc_cancel_scenario.feature
=> pack_tcc_cancel_scenario_b.feature} (85%)
copy
acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/{pack_tcc_cancel_scenario.feature
=> pack_tcc_cancel_scenario_c.feature} (85%)
[servicecomb-pack] 01/02: SCB-2368 Added the dependency check maven plugin
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-2368
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit b6e1dcbeb6c22363f2eb3310c781fe04b5e80610
Author: Willem Jiang
AuthorDate: Fri Feb 25 17:36:29 2022 +0800
SCB-2368 Added the dependency check maven plugin
---
pom.xml | 31 +++
1 file changed, 31 insertions(+)
diff --git a/pom.xml b/pom.xml
index b64423c..f8ca805 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
1.5.12
9.5.1
2.23.4
+6.5.3
Apache ServiceComb Pack
@@ -875,6 +876,36 @@
+ dependency-check
+
+
+
+org.owasp
+dependency-check-maven
+${dependency-check.version}
+
+ notifier-dependency-check
+ HTML
+ 9
+ false
+ true
+ true
+ true
+ false
+ pom
+
+
+
+
+ aggregate
+
+
+
+
+
+
+
+
release
demo
[servicecomb-pack] 02/02: SCB-2368 Fixed the CVE issue with CVSS 10
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch SCB-2368 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git commit e6fd493732728a3f1dc1db827dc1ad2eda05fa25 Author: Willem Jiang AuthorDate: Fri Feb 25 17:57:39 2022 +0800 SCB-2368 Fixed the CVE issue with CVSS 10 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f8ca805..6b3b6cd 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 4.0.1 1.2 2.7.1 -2.9.0 +2.13.2 4.0.1 2.3.0 1.1.1 @@ -886,7 +886,7 @@ notifier-dependency-check HTML - 9 + 10 false true true
[servicecomb-pack] 01/01: SCB-2368 Added the dependency check maven plugin
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-2368
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 0c57ed41032301309d0244e52195b732f96479eb
Author: Willem Jiang
AuthorDate: Fri Feb 25 17:36:29 2022 +0800
SCB-2368 Added the dependency check maven plugin
---
pom.xml | 31 +++
1 file changed, 31 insertions(+)
diff --git a/pom.xml b/pom.xml
index 61c62f6..9f7a1f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,7 @@
1.5.12
9.5.1
2.23.4
+6.5.3
Apache ServiceComb Pack
@@ -876,6 +877,36 @@
+ dependency-check
+
+
+
+org.owasp
+dependency-check-maven
+${dependency-check.version}
+
+ notifier-dependency-check
+ HTML
+ 9
+ false
+ true
+ true
+ true
+ false
+ pom
+
+
+
+
+ aggregate
+
+
+
+
+
+
+
+
release
demo
[servicecomb-pack] branch SCB-2368 created (now 0c57ed4)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2368 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. at 0c57ed4 SCB-2368 Added the dependency check maven plugin This branch includes the following new commits: new 0c57ed4 SCB-2368 Added the dependency check maven plugin The 1 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.
[servicecomb-pack] branch SCB-2395 created (now fe4b5ad)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2395 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. at fe4b5ad SCB-2395 Upgraded Log4j to 2.17.1 No new revisions were added by this update.
[servicecomb-pack] branch SCB-2391 updated (ad34577 -> 052d0f9)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2391 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. from ad34577 SCB-2391 (WIP) Added more scenarios in TCC accept tests add 052d0f9 SCB-2391 try to fix the Accept test error No new revisions were added by this update. Summary of changes: .../src/test/resources/pack_tcc_cancel_scenario_b.feature| 1 - 1 file changed, 1 deletion(-)
[servicecomb-pack] branch SCB-2391 created (now ad34577)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-2391 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. at ad34577 SCB-2391 (WIP) Added more scenarios in TCC accept tests This branch includes the following new commits: new ad34577 SCB-2391 (WIP) Added more scenarios in TCC accept tests The 1 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.
[servicecomb-pack] 01/01: SCB-2391 (WIP) Added more scenarios in TCC accept tests
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch SCB-2391 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git commit ad34577a74957f71006a1ef1fd45dead57cd85ce Author: Willem Jiang AuthorDate: Fri Feb 25 12:02:43 2022 +0800 SCB-2391 (WIP) Added more scenarios in TCC accept tests --- .../src/test/resources/pack_tcc_cancel_scenario.feature| 2 ++ ..._cancel_scenario.feature => pack_tcc_cancel_scenario_b.feature} | 7 +++ ..._cancel_scenario.feature => pack_tcc_cancel_scenario_c.feature} | 7 +-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario.feature b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario.feature index cca3188..38c6e75 100644 --- a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario.feature +++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario.feature @@ -22,6 +22,8 @@ Feature: Alpha records transaction events And Alpha is up and running When User UserC requests to order 2 units of ProductA with unit price 2 fail +# Call Inventory Service success +# Call Payment Serivce failed because of the balance reason Then Alpha records the following events | serviceName | txType | diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario.feature b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario_b.feature similarity index 88% copy from acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario.feature copy to acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario_b.feature index cca3188..3a77427 100644 --- a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario.feature +++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario_b.feature @@ -21,21 +21,20 @@ Feature: Alpha records transaction events And Ordering Service is up and running And Alpha is up and running -When User UserC requests to order 2 units of ProductA with unit price 2 fail +When User UserC requests to order 4 units of ProductC with unit price 2 fail +# Call Inventory Service failed +# Doesn't call the Payment service Then Alpha records the following events | serviceName | txType | | ordering | STARTED| | inventory| P_TX_STATED| | inventory| P_TX_ENDED | - | payment | P_TX_STATED| - | payment | P_TX_ENDED | | ordering | ENDED | | inventory| COORDINATED| Then Inventory Service contains the following booking orders | userName | productName | units | confirmed | cancelled | - | UserC| ProductA| 2| false | true | Then Payment Service contains the following booking orders | userName | amount | balance | confirmed | cancelled | diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario.feature b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario_c.feature similarity index 85% copy from acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario.feature copy to acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario_c.feature index cca3188..26bd801 100644 --- a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario.feature +++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/resources/pack_tcc_cancel_scenario_c.feature @@ -21,7 +21,10 @@ Feature: Alpha records transaction events And Ordering Service is up and running And Alpha is up and running -When User UserC requests to order 2 units of ProductA with unit price 2 fail +When User UserD requests to order 2 units of ProductA with unit price 2 fail +# Calling Inventory Service success +# Calling Payment Serivce failed because of the UserD doesn't exit +# Calling Payment prepare method failed Then Alpha records the following events | serviceName | txType | @@ -35,7 +38,7 @@ Feature: Alpha records transaction events Then Inventory Service contains the following booking orders | userName | productName | units | confirmed | cancelled | - | UserC| ProductA| 2| false | true | + | UserD| ProductA| 2| false | true | Then Payment Service contains the following booking
[servicecomb-pack] 01/01: SCB-2394 Try to fix the github action radmon test error
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-2394
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 38a7284b782ea93b17ad207ef86580b230ee8723
Author: Willem Jiang
AuthorDate: Fri Feb 25 10:06:19 2022 +0800
SCB-2394 Try to fix the github action radmon test error
---
.../server/AlphaIntegrationWithRandomPortTest.java | 45 --
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithRandomPortTest.java
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithRandomPortTest.java
index f6a026b..5e05e2d 100644
---
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithRandomPortTest.java
+++
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithRandomPortTest.java
@@ -117,6 +117,9 @@ public class AlphaIntegrationWithRandomPortTest {
@Autowired
private TxConsistentService consistentService;
+ // Setup the most wait time for checking the result,
+ // the number is used to fix random test errors in a slow box
+ private static final Integer waitTime = 4;
private static final AtomicInteger receivedCommandsCounter = new
AtomicInteger();
private static final Queue receivedCommands = new
ConcurrentLinkedQueue<>();
@@ -167,7 +170,7 @@ public class AlphaIntegrationWithRandomPortTest {
asyncStub.onConnected(compensateResponseObserver).onNext(serviceConfig);
blockingStub.onTxEvent(someGrpcEvent(TxStartedEvent));
// use the asynchronous stub need to wait for some time
-await().atMost(1, SECONDS).until(() ->
!eventRepo.findByGlobalTxId(globalTxId).isEmpty());
+await().atMost(waitTime, SECONDS).until(() ->
!eventRepo.findByGlobalTxId(globalTxId).isEmpty());
assertThat(receivedCommands.isEmpty(), is(true));
@@ -187,7 +190,7 @@ public class AlphaIntegrationWithRandomPortTest {
public void closeStreamOnDisconnected() {
asyncStub.onConnected(compensateResponseObserver).onNext(serviceConfig);
-await().atMost(1, SECONDS).until(() ->
omegaCallbacks.containsKey(serviceConfig.getServiceName()));
+await().atMost(waitTime, SECONDS).until(() ->
omegaCallbacks.containsKey(serviceConfig.getServiceName()));
assertThat(
omegaCallbacks.get(serviceConfig.getServiceName()).get(serviceConfig.getInstanceId()),
@@ -198,20 +201,20 @@ public class AlphaIntegrationWithRandomPortTest {
omegaCallbacks.get(serviceConfig.getServiceName()).containsKey(serviceConfig.getInstanceId()),
is(false));
-await().atMost(1, SECONDS).until(compensateResponseObserver::isCompleted);
+await().atMost(waitTime,
SECONDS).until(compensateResponseObserver::isCompleted);
}
@Test
public void closeStreamOfDisconnectedClientOnly() {
asyncStub.onConnected(compensateResponseObserver).onNext(serviceConfig);
-await().atMost(1, SECONDS).until(() ->
omegaCallbacks.containsKey(serviceConfig.getServiceName()));
+await().atMost(waitTime, SECONDS).until(() ->
omegaCallbacks.containsKey(serviceConfig.getServiceName()));
GrpcServiceConfig anotherServiceConfig = someServiceConfig();
CompensationStreamObserver anotherResponseObserver = new
CompensationStreamObserver();
TxEventServiceStub otherAsyncStub =
TxEventServiceGrpc.newStub(clientChannel);
otherAsyncStub.onConnected(anotherResponseObserver).onNext(anotherServiceConfig);
-await().atMost(1, SECONDS).until(() ->
omegaCallbacks.containsKey(anotherServiceConfig.getServiceName()));
+await().atMost(waitTime, SECONDS).until(() ->
omegaCallbacks.containsKey(anotherServiceConfig.getServiceName()));
blockingStub.onDisconnected(serviceConfig);
@@ -234,7 +237,7 @@ public class AlphaIntegrationWithRandomPortTest {
consistentService.handle(someTxAbortEvent(serviceName, instanceId));
-await().atMost(1, SECONDS).until(() ->
omegaCallbacks.get(serviceName).isEmpty());
+await().atMost(waitTime, SECONDS).until(() ->
omegaCallbacks.get(serviceName).isEmpty());
}
@Test
@@ -244,7 +247,7 @@ public class AlphaIntegrationWithRandomPortTest {
blockingStub.onTxEvent(someGrpcEvent(TxAbortedEvent));
blockingStub.onTxEvent(eventOf(TxEndedEvent, localTxId, parentTxId, new
byte[0], compensationMethod));
-await().atMost(1, SECONDS).until(() -> !receivedCommands.isEmpty());
+await().atMost(waitTime, SECONDS).until(() -> !receivedCommands.isEmpty());
GrpcCompensateCommand command = receivedCommands.poll();
assertThat(command.getGlobalTxId(), is(globalTxId));
@@ -268,7 +271,7 @@ public class AlphaIntegrationWithRandomPortTest {
blockingStub.onTxEvent(eventOf(TxEndedEvent, localTxId1, parentTxId1, new
byte[0], "method b&
