This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 744ffc287 [SCB-2473]Add jaxb-api dependency allow demo run on jdk17
(#2812)
744ffc287 is described below
commit 744ffc2876eb105f7f8a6eb6f51da16b17c409f9
Author: ZhangJian He <[email protected]>
AuthorDate: Wed May 4 09:48:29 2022 +0800
[SCB-2473]Add jaxb-api dependency allow demo run on jdk17 (#2812)
---
demo/demo-schema/pom.xml | 4 ++++
dependencies/default/pom.xml | 15 +++++++++++----
integration-tests/it-consumer/pom.xml | 6 +++++-
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/demo/demo-schema/pom.xml b/demo/demo-schema/pom.xml
index 8117a2641..2d70c9d91 100644
--- a/demo/demo-schema/pom.xml
+++ b/demo/demo-schema/pom.xml
@@ -70,6 +70,10 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>inspector</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index 8b6cd9ba2..35f34597e 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -31,6 +31,7 @@
<properties>
<!-- Dependency versions -->
+ <activation.version>1.2.1</activation.version>
<archaius.version>0.7.7</archaius.version>
<asciidoctorj.version>1.6.2</asciidoctorj.version>
<aspectj.version>1.9.3</aspectj.version>
@@ -61,6 +62,7 @@
<httpcomponents.version>4.5.13</httpcomponents.version>
<hystrix.version>1.5.18</hystrix.version>
<jackson.version>2.13.2.20220328</jackson.version>
+ <java-websocket.version>1.5.1</java-websocket.version>
<javakaffee.version>0.26</javakaffee.version>
<javax-annotation.version>1.3.2</javax-annotation.version>
<javax-inject.version>1</javax-inject.version>
@@ -83,18 +85,20 @@
<netty.version>4.1.72.Final</netty.version>
<okhttp3.version>3.14.2</okhttp3.version>
<powermock.version>1.6.2</powermock.version>
+ <maven-model.version>3.8.5</maven-model.version>
<micrometer.version>1.8.5</micrometer.version>
+ <nacos-client.version>1.1.4</nacos-client.version>
<prometheus.version>0.12.0</prometheus.version>
<protobuf.version>3.7.1</protobuf.version>
<protostuff.version>1.5.9</protostuff.version>
<protostuff-parser.version>2.2.25</protostuff-parser.version>
+ <resilience4j.versioin>1.7.0</resilience4j.versioin>
<ribbon.version>2.3.0</ribbon.version>
<rxjava.version>1.1.6</rxjava.version>
<rxnetty.version>0.4.9</rxnetty.version>
<seanyinx.version>1.0.0</seanyinx.version>
<servo.version>0.12.25</servo.version>
<servlet-api.version>4.0.3</servlet-api.version>
- <activation.version>1.2.1</activation.version>
<slf4j.version>1.7.32</slf4j.version>
<snakeyaml.version>1.27</snakeyaml.version>
<spectator.version>0.83.0</spectator.version>
@@ -111,9 +115,6 @@
<zipkin.version>2.19.1</zipkin.version>
<zipkin-reporter.version>2.7.13</zipkin-reporter.version>
<zookeeper.version>3.4.14</zookeeper.version>
- <nacos-client.version>1.1.4</nacos-client.version>
- <resilience4j.versioin>1.7.0</resilience4j.versioin>
- <java-websocket.version>1.5.1</java-websocket.version>
<!-- Base dir of main -->
<main.basedir>${basedir}/../..</main.basedir>
</properties>
@@ -446,6 +447,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>${maven-model.version}</version>
+ </dependency>
+
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-bom</artifactId>
diff --git a/integration-tests/it-consumer/pom.xml
b/integration-tests/it-consumer/pom.xml
index b99295e85..3e5c460c0 100644
--- a/integration-tests/it-consumer/pom.xml
+++ b/integration-tests/it-consumer/pom.xml
@@ -41,7 +41,11 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.3.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
</dependency>
</dependencies>
