You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2021/03/30 07:59:50 UTC
[servicecomb-pack] branch master updated (d038ed0 -> f3202e5)
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 d038ed0 SCB-2238 add docker compose file support rabbit
new d6ed6f2 [SCB-2239] Support JDK11 LTS
new f3202e5 SCB-2239 GitHub Action build on jdk 11 and 8
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/asf-snapshots-deploy.yml | 2 +-
.github/workflows/master-pr-build.yaml | 3 ++-
.github/workflows/master-push-build.yaml | 3 ++-
omega/omega-transport/omega-transport-hystrix/pom.xml | 7 ++++++-
pack-contracts/pack-contract-grpc/pom.xml | 5 +++++
pom.xml | 11 +++++++++--
6 files changed, 25 insertions(+), 6 deletions(-)
[servicecomb-pack] 01/02: [SCB-2239] Support JDK11 LTS
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit d6ed6f23638007520722f014c2c5ee879b10a324
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Thu Mar 25 10:54:01 2021 +0800
[SCB-2239] Support JDK11 LTS
Upgrade Akka version from 2.5.14 to 2.5.32
Upgrade Mockito version from 2.16.0 to 2.23.4
Add dependency tomcat-annotations-api that has been removed by Java 11
---
omega/omega-transport/omega-transport-hystrix/pom.xml | 7 ++++++-
pack-contracts/pack-contract-grpc/pom.xml | 5 +++++
pom.xml | 11 +++++++++--
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/omega/omega-transport/omega-transport-hystrix/pom.xml b/omega/omega-transport/omega-transport-hystrix/pom.xml
index e22c079..26f31b3 100644
--- a/omega/omega-transport/omega-transport-hystrix/pom.xml
+++ b/omega/omega-transport/omega-transport-hystrix/pom.xml
@@ -42,6 +42,11 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>annotations-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
@@ -53,4 +58,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/pack-contracts/pack-contract-grpc/pom.xml b/pack-contracts/pack-contract-grpc/pom.xml
index 8364c18..38236e1 100644
--- a/pack-contracts/pack-contract-grpc/pom.xml
+++ b/pack-contracts/pack-contract-grpc/pom.xml
@@ -41,6 +41,11 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>annotations-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 64a1fd8..0220bb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<spring.cloud.starter.alibaba.nacos.discovery.version>0.2.2.RELEASE</spring.cloud.starter.alibaba.nacos.discovery.version>
<spring-cloud-stream>2.2.1.RELEASE</spring-cloud-stream>
<java.chassis.version>1.2.1</java.chassis.version>
- <akka.version>2.5.14</akka.version>
+ <akka.version>2.5.32</akka.version>
<alpakka.version>1.0.5</alpakka.version>
<leveldbjni-all.version>1.8</leveldbjni-all.version>
<akka-persistence-redis.version>0.4.0</akka-persistence-redis.version>
@@ -70,6 +70,7 @@
<byteman.version>4.0.1</byteman.version>
<jaxb.version>2.3.0</jaxb.version>
<javax.activation.version>1.1.1</javax.activation.version>
+ <tomcat-annotations-api.version>6.0.53</tomcat-annotations-api.version>
<maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
<netty.boringssl.version>2.0.36.Final</netty.boringssl.version>
<netty.version>4.1.59.Final</netty.version>
@@ -77,6 +78,7 @@
<kafka.version>2.1.1</kafka.version>
<hystrix.version>1.5.12</hystrix.version>
<openfeign.version>9.5.1</openfeign.version>
+ <mockito.version>2.23.4</mockito.version>
</properties>
<name>Apache ServiceComb Pack</name>
@@ -539,6 +541,11 @@
<version>1.2</version>
</dependency>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>annotations-api</artifactId>
+ <version>${tomcat-annotations-api.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
<version>${eclipse.link.version}</version>
@@ -587,7 +594,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.16.0</version>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
[servicecomb-pack] 02/02: SCB-2239 GitHub Action build on jdk 11
and 8
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit f3202e5e565f6ec761ebc9ed80cc445d75e3da9d
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Thu Mar 25 16:09:23 2021 +0800
SCB-2239 GitHub Action build on jdk 11 and 8
---
.github/workflows/asf-snapshots-deploy.yml | 2 +-
.github/workflows/master-pr-build.yaml | 3 ++-
.github/workflows/master-push-build.yaml | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/asf-snapshots-deploy.yml b/.github/workflows/asf-snapshots-deploy.yml
index 97da134..16f450d 100644
--- a/.github/workflows/asf-snapshots-deploy.yml
+++ b/.github/workflows/asf-snapshots-deploy.yml
@@ -33,7 +33,7 @@ jobs:
if: github.repository == 'apache/servicecomb-pack'
strategy:
matrix:
- java: [ '1.8' ]
+ java: [ '8' ]
steps:
- uses: actions/checkout@v2
with:
diff --git a/.github/workflows/master-pr-build.yaml b/.github/workflows/master-pr-build.yaml
index ce9c3da..59453b2 100644
--- a/.github/workflows/master-pr-build.yaml
+++ b/.github/workflows/master-pr-build.yaml
@@ -32,7 +32,8 @@ jobs:
if: github.repository == 'apache/servicecomb-pack'
strategy:
matrix:
- java: [ '1.8' ]
+ java: [ '8', '11' ]
+ fail-fast: false
steps:
- uses: actions/checkout@v2
with:
diff --git a/.github/workflows/master-push-build.yaml b/.github/workflows/master-push-build.yaml
index 5dbda68..c454938 100644
--- a/.github/workflows/master-push-build.yaml
+++ b/.github/workflows/master-push-build.yaml
@@ -33,7 +33,8 @@ jobs:
if: github.repository == 'apache/servicecomb-pack'
strategy:
matrix:
- java: [ '1.8' ]
+ java: [ '8', '11' ]
+ fail-fast: false
steps:
- uses: actions/checkout@v2
with: