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 <zhang...@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>