This is an automated email from the ASF dual-hosted git repository. yaohaishi 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 be73f2e [SCB-1431] set all dependency versions as properties be73f2e is described below commit be73f2ea603b254244912f8944ffe2d3f70e549d Author: AngLi2 <liang951...@qq.com> AuthorDate: Mon Aug 12 17:08:19 2019 +0800 [SCB-1431] set all dependency versions as properties --- java-chassis-dependencies/default/pom.xml | 1212 ++++++++++++++----------- java-chassis-dependencies/spring4/pom.xml | 1 + java-chassis-dependencies/spring5/pom.xml | 37 +- java-chassis-dependencies/springboot1/pom.xml | 19 +- java-chassis-dependencies/springboot2/pom.xml | 10 +- 5 files changed, 699 insertions(+), 580 deletions(-) diff --git a/java-chassis-dependencies/default/pom.xml b/java-chassis-dependencies/default/pom.xml index 3bccb80..15d79a0 100644 --- a/java-chassis-dependencies/default/pom.xml +++ b/java-chassis-dependencies/default/pom.xml @@ -31,70 +31,94 @@ <packaging>pom</packaging> <properties> + <!-- Dependency versions --> + <apache-commons.version>3.7</apache-commons.version> + <archaius.version>0.7.6</archaius.version> + <asciidoctorj.version>1.6.2</asciidoctorj.version> + <aspectjweaver.version>1.8.13</aspectjweaver.version> + <awaitility.version>3.0.0</awaitility.version> + <brave.version>5.6.0</brave.version> + <commons-beanutils.version>1.9.3</commons-beanutils.version> + <commons-configuration.version>1.10</commons-configuration.version> + <commons-io.version>2.6</commons-io.version> + <commons-lang.version>2.6</commons-lang.version> + <commons-logging.version>1.2</commons-logging.version> + <cxf.version>3.1.6</cxf.version> + <dyuproject-protostuff.version>1.0.7.fixed.3500</dyuproject-protostuff.version> + <embed.version>8.5.32</embed.version> + <embed-logging-juli.version>8.5.2</embed-logging-juli.version> + <esotericsoftware.version>4.0.2</esotericsoftware.version> + <findbugs-annotations.version>2.0.0</findbugs-annotations.version> + <findbugs-jsr305.version>3.0.1</findbugs-jsr305.version> + <governator-annotations.version>1.14.2</governator-annotations.version> + <governator-api.version>1.12.10</governator-api.version> + <guava.version>26.0-jre</guava.version> + <guice.version>4.2.0</guice.version> + <hamcrest.version>1.3</hamcrest.version> + <hibernate.version>6.0.2.Final</hibernate.version> + <hibernate-validator.version>6.0.14.Final</hibernate-validator.version> + <httpcomponents.version>4.5.7</httpcomponents.version> + <hystrix.version>1.5.12</hystrix.version> <jackson.version>2.9.8</jackson.version> - <vertx.version>3.6.3</vertx.version> - <tec.zkclient.version>0.10</tec.zkclient.version> - <spring.version>4.3.20.RELEASE</spring.version> - <slf4j.version>1.7.26</slf4j.version> + <javassist.version>3.24.0-GA</javassist.version> + <javakaffee.version>0.26</javakaffee.version> + <javax-annotation.version>1.2</javax-annotation.version> + <javax-inject.version>1</javax-inject.version> + <javax-resource.version>1.5</javax-resource.version> + <javax-servlet.version>4.0.1</javax-servlet.version> + <javax-transaction.version>1.2</javax-transaction.version> + <javax-validation.version>2.0.1.Final</javax-validation.version> + <javax-ws-rs.version>2.0.1</javax-ws-rs.version> + <jedis.version>2.9.0</jedis.version> + <jersey.version>2.22.2</jersey.version> + <jettison.version>1.3.8</jettison.version> + <jmockit.version>1.30</jmockit.version> + <json-lib.version>2.4</json-lib.version> + <junit.version>4.12</junit.version> <log4j.version>1.2.17</log4j.version> <log4j2.version>2.11.2</log4j2.version> - <commons.io.version>2.6</commons.io.version> - <javassist.version>3.24.0-GA</javassist.version> - <javax.ws.rs.version>2.0.1</javax.ws.rs.version> - <javax.servlet.version>4.0.1</javax.servlet.version> - <apache.httpclient>4.5.7</apache.httpclient> + <logback.version>1.2.3</logback.version> + <mockito.version>1.10.19</mockito.version> + <mock-server.version>3.10.4</mock-server.version> + <narayana.version>5.3.2.Final</narayana.version> + <netflix-commons.version>0.3.0</netflix-commons.version> + <netty.version>4.1.28.Final</netty.version> + <okhttp3.version>3.11.0</okhttp3.version> + <powermock.version>1.6.2</powermock.version> + <protobuf.version>3.6.1</protobuf.version> <protostuff.version>1.5.9</protostuff.version> + <protostuff-parser.version>2.2.25</protostuff-parser.version> + <ribbon.version>2.2.5</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> + <simpleclient.version>0.3.0</simpleclient.version> + <simpleclient-httpserver.version>0.1.0</simpleclient-httpserver.version> + <slf4j.version>1.7.26</slf4j.version> + <snakeyaml.version>1.23</snakeyaml.version> + <spectator.version>0.83.0</spectator.version> + <spring.version>4.3.20.RELEASE</spring.version> + <spring-boot.version>1.5.12.RELEASE</spring-boot.version> + <spring-cloud.version>Edgware.SR3</spring-cloud.version> <!-- Spring Zuul handling of gzip response has bug in version Dalston.SR1 --> <swagger.version>1.5.22</swagger.version> - <netty.version>4.1.28.Final</netty.version> + <swagger2markup.version>1.3.3</swagger2markup.version> <tcnetty.version>2.0.14.Final</tcnetty.version> - <main.basedir>${basedir}/../..</main.basedir> - <narayana.version>5.3.2.Final</narayana.version> - <cxf.version>3.1.6</cxf.version> - <logback.version>1.2.3</logback.version> - <brave.version>5.6.0</brave.version> + <tec-zkclient.version>0.10</tec-zkclient.version> + <tomakehurst.version>2.6.0</tomakehurst.version> + <vertx.version>3.6.3</vertx.version> + <woodstox.version>4.4.1</woodstox.version> + <xstream.version>1.4.9</xstream.version> <zipkin.version>2.9.3</zipkin.version> <zipkin-reporter.version>2.7.13</zipkin-reporter.version> + <zookeeper.version>3.4.13</zookeeper.version> + <!-- Base dir of main --> + <main.basedir>${basedir}/../..</main.basedir> </properties> <dependencyManagement> <dependencies> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> - <dependency> - <groupId>com.netflix.ribbon</groupId> - <artifactId>ribbon</artifactId> - <version>2.2.5</version> - </dependency> - <dependency> - <groupId>com.netflix.ribbon</groupId> - <artifactId>ribbon-core</artifactId> - <version>2.2.5</version> - <exclusions> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.netflix.ribbon</groupId> - <artifactId>ribbon-loadbalancer</artifactId> - <version>2.2.5</version> - <exclusions> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.netflix.hystrix</groupId> - <artifactId>hystrix-core</artifactId> - <version>1.5.12</version> - </dependency> + <!-- Third Party --> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> @@ -105,311 +129,352 @@ <artifactId>logback-core</artifactId> <version>${logback.version}</version> </dependency> + <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> + <groupId>com.101tec</groupId> + <artifactId>zkclient</artifactId> + <version>${tec-zkclient.version}</version> </dependency> + <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - <version>3.0.0</version> - <scope>test</scope> + <groupId>com.dyuproject.protostuff</groupId> + <artifactId>protostuff-api</artifactId> + <version>${dyuproject-protostuff.version}</version> </dependency> <dependency> - <groupId>com.github.seanyinx</groupId> - <artifactId>unit-scaffolding</artifactId> - <version>1.0.0</version> - <scope>test</scope> + <groupId>com.dyuproject.protostuff</groupId> + <artifactId>protostuff-collectionschema</artifactId> + <version>${dyuproject-protostuff.version}</version> </dependency> <dependency> - <groupId>com.github.tomakehurst</groupId> - <artifactId>wiremock-standalone</artifactId> - <version>2.6.0</version> - <scope>test</scope> + <groupId>com.dyuproject.protostuff</groupId> + <artifactId>protostuff-core</artifactId> + <version>${dyuproject-protostuff.version}</version> </dependency> <dependency> - <groupId>io.reactivex</groupId> - <artifactId>rxjava</artifactId> - <version>1.1.6</version> + <groupId>com.dyuproject.protostuff</groupId> + <artifactId>protostuff-runtime</artifactId> + <version>${dyuproject-protostuff.version}</version> </dependency> + <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.10.19</version> - <scope>test</scope> + <groupId>com.esotericsoftware</groupId> + <artifactId>kryo-shaded</artifactId> + <version>${esotericsoftware.version}</version> </dependency> + <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> - <scope>test</scope> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${jackson.version}</version> </dependency> <dependency> - <groupId>org.jmockit</groupId> - <artifactId>jmockit</artifactId> - <version>1.30</version> - <scope>test</scope> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <version>1.3</version> - <scope>test</scope> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> </dependency> + <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>1.3</version> - <scope>test</scope> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-protobuf</artifactId> + <version>${jackson.version}</version> </dependency> <dependency> - <groupId>com.dyuproject.protostuff</groupId> - <artifactId>protostuff-api</artifactId> - <version>1.0.7.fixed.3500</version> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + <version>${jackson.version}</version> </dependency> <dependency> - <groupId>com.dyuproject.protostuff</groupId> - <artifactId>protostuff-collectionschema</artifactId> - <version>1.0.7.fixed.3500</version> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + <version>${jackson.version}</version> </dependency> + <dependency> - <groupId>com.dyuproject.protostuff</groupId> - <artifactId>protostuff-core</artifactId> - <version>1.0.7.fixed.3500</version> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-joda</artifactId> + <version>${jackson.version}</version> </dependency> + <dependency> - <groupId>com.dyuproject.protostuff</groupId> - <artifactId>protostuff-runtime</artifactId> - <version>1.0.7.fixed.3500</version> + <groupId>com.github.seanyinx</groupId> + <artifactId>unit-scaffolding</artifactId> + <version>${seanyinx.version}</version> + <scope>test</scope> </dependency> + <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>2.0.1.Final</version> + <groupId>com.github.tomakehurst</groupId> + <artifactId>wiremock-standalone</artifactId> + <version>${tomakehurst.version}</version> + <scope>test</scope> </dependency> + <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>6.0.2.Final</version> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + <version>${findbugs-annotations.version}</version> </dependency> <dependency> - <groupId>org.hibernate.validator</groupId> - <artifactId>hibernate-validator</artifactId> - <version>6.0.14.Final</version> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>${findbugs-jsr305.version}</version> </dependency> <dependency> - <groupId>org.aspectj</groupId> - <artifactId>aspectjweaver</artifactId> - <version>1.8.13</version> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>26.0-jre</version> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec</artifactId> - <version>${netty.version}</version> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>${guice.version}</version> </dependency> + <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec-http</artifactId> - <version>${netty.version}</version> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf.version}</version> </dependency> + <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec-http2</artifactId> - <version>${netty.version}</version> + <groupId>com.netflix.archaius</groupId> + <artifactId>archaius-core</artifactId> + <version>${archaius.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-common</artifactId> - <version>${netty.version}</version> + <groupId>com.netflix.governator</groupId> + <artifactId>governator-annotations</artifactId> + <version>${governator-annotations.version}</version> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - <version>${netty.version}</version> + <groupId>com.netflix.governator</groupId> + <artifactId>governator-api</artifactId> + <version>${governator-api.version}</version> </dependency> + <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-buffer</artifactId> - <version>${netty.version}</version> + <groupId>com.netflix.hystrix</groupId> + <artifactId>hystrix-core</artifactId> + <version>${hystrix.version}</version> </dependency> + <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec-dns</artifactId> - <version>${netty.version}</version> + <groupId>com.netflix.netflix-commons</groupId> + <artifactId>netflix-eventbus</artifactId> + <version>${netflix-commons.version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec-socks</artifactId> - <version>${netty.version}</version> + <groupId>com.netflix.netflix-commons</groupId> + <artifactId>netflix-eventbus-rx</artifactId> + <version>${netflix-commons.version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.netflix.rxjava</groupId> + <artifactId>rxjava-core</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-handler-proxy</artifactId> - <version>${netty.version}</version> + <groupId>com.netflix.ribbon</groupId> + <artifactId>ribbon</artifactId> + <version>${ribbon.version}</version> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-resolver</artifactId> - <version>${netty.version}</version> + <groupId>com.netflix.ribbon</groupId> + <artifactId>ribbon-core</artifactId> + <version>${ribbon.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-resolver-dns</artifactId> - <version>${netty.version}</version> + <groupId>com.netflix.ribbon</groupId> + <artifactId>ribbon-loadbalancer</artifactId> + <version>${ribbon.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-transport</artifactId> - <version>${netty.version}</version> + <groupId>com.netflix.servo</groupId> + <artifactId>servo-core</artifactId> + <version>${servo.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-tcnative-boringssl-static</artifactId> - <version>${tcnetty.version}</version> + <groupId>com.netflix.spectator</groupId> + <artifactId>spectator-reg-servo</artifactId> + <version>${spectator.version}</version> </dependency> + <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.6.2</version> - <scope>test</scope> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp</artifactId> + <version>${okhttp3.version}</version> </dependency> + <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.6.2</version> - <scope>test</scope> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>${xstream.version}</version> </dependency> <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-core</artifactId> - <version>8.5.32</version> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>${commons-beanutils.version}</version> </dependency> + <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-el</artifactId> - <version>8.5.32</version> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + <version>${commons-configuration.version}</version> </dependency> + <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-logging-juli</artifactId> - <version>8.5.2</version> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> </dependency> + <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-websocket</artifactId> - <version>8.5.32</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang.version}</version> </dependency> <dependency> - <groupId>com.squareup.okhttp3</groupId> - <artifactId>okhttp</artifactId> - <version>3.11.0</version> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${slf4j.version}</version> + <groupId>de.javakaffee</groupId> + <artifactId>kryo-serializers</artifactId> + <version>${javakaffee.version}</version> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> + <groupId>io.github.swagger2markup</groupId> + <artifactId>swagger2markup</artifactId> + <version>${swagger2markup.version}</version> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.2</version> + <groupId>io.netty</groupId> + <artifactId>netty-buffer</artifactId> + <version>${netty.version}</version> </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <version>1.5</version> + <groupId>io.netty</groupId> + <artifactId>netty-codec</artifactId> + <version>${netty.version}</version> </dependency> <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.23</version> + <groupId>io.netty</groupId> + <artifactId>netty-codec-dns</artifactId> + <version>${netty.version}</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator-annotation-processor</artifactId> - <version>6.0.2.Final</version> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + <version>${netty.version}</version> </dependency> <dependency> - <groupId>org.hibernate.validator</groupId> - <artifactId>hibernate-validator-annotation-processor</artifactId> - <version>6.0.2.Final</version> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http2</artifactId> + <version>${netty.version}</version> </dependency> <dependency> - <groupId>javax.transaction</groupId> - <artifactId>javax.transaction-api</artifactId> - <version>1.2</version> + <groupId>io.netty</groupId> + <artifactId>netty-codec-socks</artifactId> + <version>${netty.version}</version> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.7</version> + <groupId>io.netty</groupId> + <artifactId>netty-common</artifactId> + <version>${netty.version}</version> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.9.3</version> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + <version>${netty.version}</version> </dependency> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>${cxf.version}</version> + <groupId>io.netty</groupId> + <artifactId>netty-handler-proxy</artifactId> + <version>${netty.version}</version> </dependency> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - <version>${cxf.version}</version> + <groupId>io.netty</groupId> + <artifactId>netty-resolver</artifactId> + <version>${netty.version}</version> </dependency> <dependency> - <groupId>com.netflix.servo</groupId> - <artifactId>servo-core</artifactId> - <version>0.12.25</version> - <exclusions> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> - </exclusion> - </exclusions> + <groupId>io.netty</groupId> + <artifactId>netty-resolver-dns</artifactId> + <version>${netty.version}</version> </dependency> <dependency> - <groupId>com.netflix.spectator</groupId> - <artifactId>spectator-reg-servo</artifactId> - <version>0.83.0</version> + <groupId>io.netty</groupId> + <artifactId>netty-tcnative-boringssl-static</artifactId> + <version>${tcnetty.version}</version> </dependency> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>4.2.0</version> + <groupId>io.netty</groupId> + <artifactId>netty-transport</artifactId> + <version>${netty.version}</version> </dependency> + <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-common</artifactId> - <version>2.22.2</version> + <groupId>io.reactivex</groupId> + <artifactId>rxjava</artifactId> + <version>${rxjava.version}</version> </dependency> <dependency> <groupId>io.reactivex</groupId> <artifactId>rxnetty</artifactId> - <version>0.4.9</version> + <version>${rxnetty.version}</version> <exclusions> <!-- alreadly in io.netty-all --> <exclusion> @@ -428,442 +493,470 @@ </dependency> <dependency> - <groupId>com.esotericsoftware</groupId> - <artifactId>kryo-shaded</artifactId> - <version>4.0.2</version> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient</artifactId> + <version>${simpleclient.version}</version> </dependency> <dependency> - <groupId>de.javakaffee</groupId> - <artifactId>kryo-serializers</artifactId> - <version>0.26</version> + <groupId>io.prometheus</groupId> + <artifactId>simpleclient_httpserver</artifactId> + <version>${simpleclient-httpserver.version}</version> </dependency> + <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>2.4</version> - <classifier>jdk15</classifier> + <groupId>io.protostuff</groupId> + <artifactId>protostuff-core</artifactId> + <version>${protostuff.version}</version> </dependency> <dependency> - <groupId>com.netflix.governator</groupId> - <artifactId>governator-api</artifactId> - <version>1.12.10</version> + <groupId>io.protostuff</groupId> + <artifactId>protostuff-parser</artifactId> + <version>${protostuff-parser.version}</version> </dependency> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>woodstox-core-asl</artifactId> - <version>4.4.1</version> - <scope>provided</scope> + <groupId>io.protostuff</groupId> + <artifactId>protostuff-runtime</artifactId> + <version>${protostuff.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <version>1.3.8</version> - <scope>runtime</scope> + <groupId>io.swagger</groupId> + <artifactId>swagger-core</artifactId> + <version>${swagger.version}</version> </dependency> + <dependency> - <groupId>com.netflix.archaius</groupId> - <artifactId>archaius-core</artifactId> - <version>0.7.6</version> - <exclusions> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> - </exclusion> - </exclusions> + <groupId>io.vertx</groupId> + <artifactId>vertx-codegen</artifactId> + <version>${vertx.version}</version> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - <version>3.0.1</version> + <groupId>io.vertx</groupId> + <artifactId>vertx-core</artifactId> + <version>${vertx.version}</version> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>annotations</artifactId> - <version>2.0.0</version> + <groupId>io.vertx</groupId> + <artifactId>vertx-web</artifactId> + <version>${vertx.version}</version> </dependency> + <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - <version>1.10</version> + <groupId>io.zipkin.brave</groupId> + <artifactId>brave</artifactId> + <version>${brave.version}</version> </dependency> - <dependency> - <groupId>com.netflix.netflix-commons</groupId> - <artifactId>netflix-eventbus</artifactId> - <version>0.3.0</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> + <groupId>io.zipkin.brave</groupId> + <artifactId>brave-context-log4j12</artifactId> + <version>${brave.version}</version> + </dependency> + <dependency> + <groupId>io.zipkin.brave</groupId> + <artifactId>brave-instrumentation-jaxrs2</artifactId> + <version>${brave.version}</version> + </dependency> + <dependency> + <groupId>io.zipkin.brave</groupId> + <artifactId>brave-instrumentation-servlet</artifactId> + <version>${brave.version}</version> + </dependency> + <dependency> + <groupId>io.zipkin.brave</groupId> + <artifactId>brave-instrumentation-spring-web</artifactId> + <version>${brave.version}</version> </dependency> <dependency> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.4.9</version> + <groupId>io.zipkin.brave</groupId> + <artifactId>brave-instrumentation-spring-webmvc</artifactId> + <version>${brave.version}</version> </dependency> <dependency> - <groupId>com.netflix.governator</groupId> - <artifactId>governator-annotations</artifactId> - <version>1.14.2</version> + <groupId>io.zipkin.brave</groupId> + <artifactId>brave-spring-beans</artifactId> + <version>${brave.version}</version> </dependency> <dependency> - <groupId>com.netflix.netflix-commons</groupId> - <artifactId>netflix-eventbus-rx</artifactId> - <version>0.3.0</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.netflix.rxjava</groupId> - <artifactId>rxjava-core</artifactId> - </exclusion> - </exclusions> + <groupId>io.zipkin.reporter2</groupId> + <artifactId>zipkin-sender-okhttp3</artifactId> + <version>${zipkin-reporter.version}</version> </dependency> <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>3.4.13</version> - <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>redis.clients</groupId> - <artifactId>jedis</artifactId> - <version>2.9.0</version> - <scope>provided</scope> - <optional>true</optional> + <groupId>io.zipkin.zipkin2</groupId> + <artifactId>zipkin</artifactId> + <version>${zipkin.version}</version> </dependency> <dependency> - <groupId>org.mock-server</groupId> - <artifactId>mockserver-netty</artifactId> - <version>3.10.4</version> + <groupId>io.zipkin.zipkin2</groupId> + <artifactId>zipkin-junit</artifactId> + <version>${zipkin.version}</version> <scope>test</scope> </dependency> + <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-test-mockito-junit4-delegate</artifactId> - <version>1.6.2</version> - <scope>test</scope> + <version>${javax-annotation.version}</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${apache.httpclient}</version> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>${javax-inject.version}</version> </dependency> + <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>${javax-resource.version}</version> </dependency> + <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-ext</artifactId> - <version>${slf4j.version}</version> - <exclusions> - <exclusion> - <groupId>ch.qos.cal10n</groupId> - <artifactId>cal10n-api</artifactId> - </exclusion> - </exclusions> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${javax-servlet.version}</version> </dependency> + <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <version>${javax-transaction.version}</version> </dependency> + <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>${javax-validation.version}</version> </dependency> + <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${log4j2.version}</version> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>${javax-ws-rs.version}</version> </dependency> + <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> </dependency> + <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> </dependency> + <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> + <groupId>net.sf.json-lib</groupId> + <artifactId>json-lib</artifactId> + <version>${json-lib.version}</version> + <classifier>jdk15</classifier> </dependency> + <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>${javax.ws.rs.version}</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${apache-commons.version}</version> </dependency> + <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${javax.servlet.version}</version> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>${cxf.version}</version> </dependency> <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>${javassist.version}</version> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>${cxf.version}</version> </dependency> + <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${httpcomponents.version}</version> </dependency> + <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring.version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j2.version}</version> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - <version>${spring.version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j2.version}</version> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <version>${spring.version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j2.version}</version> </dependency> + <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aspects</artifactId> - <version>${spring.version}</version> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>${embed.version}</version> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-el</artifactId> + <version>${embed.version}</version> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring.version}</version> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-logging-juli</artifactId> + <version>${embed-logging-juli.version}</version> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - <version>${spring.version}</version> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-websocket</artifactId> + <version>${embed.version}</version> </dependency> + <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${zookeeper.version}</version> <scope>provided</scope> <optional>true</optional> - <version>${spring.version}</version> </dependency> + <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson.version}</version> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj</artifactId> + <version>${asciidoctorj.version}</version> </dependency> + <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <version>${aspectjweaver.version}</version> + </dependency> + + <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <version>${awaitility.version}</version> + <scope>test</scope> </dependency> + <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${jackson.version}</version> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>${jettison.version}</version> + <scope>runtime</scope> </dependency> + <dependency> - <groupId>io.vertx</groupId> - <artifactId>vertx-codegen</artifactId> - <version>${vertx.version}</version> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + <version>${woodstox.version}</version> + <scope>provided</scope> </dependency> + <dependency> - <groupId>io.vertx</groupId> - <artifactId>vertx-core</artifactId> - <version>${vertx.version}</version> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-common</artifactId> + <version>${jersey.version}</version> </dependency> + <dependency> - <groupId>io.vertx</groupId> - <artifactId>vertx-web</artifactId> - <version>${vertx.version}</version> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>${hamcrest.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>com.101tec</groupId> - <artifactId>zkclient</artifactId> - <version>${tec.zkclient.version}</version> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>${hamcrest.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>1.5.12.RELEASE</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>${hibernate.version}</version> </dependency> - <!-- Spring Zuul handling of gzip response has bug in version Dalston.SR1 --> <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-dependencies</artifactId> - <version>Edgware.SR3</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator-annotation-processor</artifactId> + <version>${hibernate.version}</version> </dependency> - <!-- zipkin dependencies --> <dependency> - <groupId>io.zipkin.zipkin2</groupId> - <artifactId>zipkin</artifactId> - <version>${zipkin.version}</version> + <groupId>org.hibernate.validator</groupId> + <artifactId>hibernate-validator</artifactId> + <version>${hibernate-validator.version}</version> </dependency> <dependency> - <groupId>io.zipkin.zipkin2</groupId> - <artifactId>zipkin-junit</artifactId> - <version>${zipkin.version}</version> - <scope>test</scope> + <groupId>org.hibernate.validator</groupId> + <artifactId>hibernate-validator-annotation-processor</artifactId> + <version>${hibernate.version}</version> </dependency> + <dependency> - <groupId>io.zipkin.brave</groupId> - <artifactId>brave</artifactId> - <version>${brave.version}</version> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist.version}</version> </dependency> + <dependency> - <groupId>io.zipkin.brave</groupId> - <artifactId>brave-spring-beans</artifactId> - <version>${brave.version}</version> + <groupId>org.jmockit</groupId> + <artifactId>jmockit</artifactId> + <version>${jmockit.version}</version> + <scope>test</scope> </dependency> + <dependency> - <groupId>io.zipkin.reporter2</groupId> - <artifactId>zipkin-sender-okhttp3</artifactId> - <version>${zipkin-reporter.version}</version> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>io.zipkin.brave</groupId> - <artifactId>brave-context-log4j12</artifactId> - <version>${brave.version}</version> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> </dependency> + <dependency> - <groupId>io.zipkin.brave</groupId> - <artifactId>brave-instrumentation-servlet</artifactId> - <version>${brave.version}</version> + <groupId>org.mock-server</groupId> + <artifactId>mockserver-netty</artifactId> + <version>${mock-server.version}</version> + <scope>test</scope> </dependency> + <dependency> - <groupId>io.zipkin.brave</groupId> - <artifactId>brave-instrumentation-jaxrs2</artifactId> - <version>${brave.version}</version> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>io.zipkin.brave</groupId> - <artifactId>brave-instrumentation-spring-webmvc</artifactId> - <version>${brave.version}</version> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>io.zipkin.brave</groupId> - <artifactId>brave-instrumentation-spring-web</artifactId> - <version>${brave.version}</version> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-test-mockito-junit4-delegate</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient</artifactId> - <version>0.3.0</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> </dependency> <dependency> - <groupId>io.prometheus</groupId> - <artifactId>simpleclient_httpserver</artifactId> - <version>0.1.0</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-ext</artifactId> + <version>${slf4j.version}</version> + <exclusions> + <exclusion> + <groupId>ch.qos.cal10n</groupId> + <artifactId>cal10n-api</artifactId> + </exclusion> + </exclusions> </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-yaml</artifactId> - <version>${jackson.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j.version}</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-protobuf</artifactId> - <version>${jackson.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>${slf4j.version}</version> </dependency> + <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-xml</artifactId> - <version>${jackson.version}</version> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-joda</artifactId> - <version>${jackson.version}</version> + <groupId>org.springframework</groupId> + <artifactId>spring-aspects</artifactId> + <version>${spring.version}</version> </dependency> <dependency> - <groupId>io.protostuff</groupId> - <artifactId>protostuff-core</artifactId> - <version>${protostuff.version}</version> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> </dependency> <dependency> - <groupId>io.protostuff</groupId> - <artifactId>protostuff-runtime</artifactId> - <version>${protostuff.version}</version> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> </dependency> <dependency> - <groupId>io.protostuff</groupId> - <artifactId>protostuff-parser</artifactId> - <version>2.2.25</version> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> </dependency> <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-core</artifactId> - <version>${swagger.version}</version> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> </dependency> <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>3.6.1</version> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <scope>provided</scope> + <optional>true</optional> + <version>${spring.version}</version> </dependency> <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctorj</artifactId> - <version>1.6.2</version> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> </dependency> <dependency> - <groupId>io.github.swagger2markup</groupId> - <artifactId>swagger2markup</artifactId> - <version>1.3.3</version> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring.version}</version> </dependency> - <!-- This project modules --> <dependency> - <groupId>org.apache.servicecomb.archetypes</groupId> - <artifactId>business-service-jaxrs-archetype</artifactId> - <version>${project.version}</version> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-dependencies</artifactId> + <version>${spring-boot.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> + <dependency> - <groupId>org.apache.servicecomb.archetypes</groupId> - <artifactId>business-service-pojo-archetype</artifactId> - <version>${project.version}</version> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-dependencies</artifactId> + <version>${spring-cloud.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> + <dependency> - <groupId>org.apache.servicecomb.archetypes</groupId> - <artifactId>business-service-spring-boot-starter-archetype</artifactId> - <version>${project.version}</version> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>${snakeyaml.version}</version> </dependency> + <dependency> - <groupId>org.apache.servicecomb.archetypes</groupId> - <artifactId>business-service-springmvc-archetype</artifactId> - <version>${project.version}</version> + <groupId>redis.clients</groupId> + <artifactId>jedis</artifactId> + <version>${jedis.version}</version> + <scope>provided</scope> + <optional>true</optional> </dependency> + + <!-- Service Comb --> <dependency> <groupId>org.apache.servicecomb</groupId> <artifactId>common-javassist</artifactId> @@ -881,22 +974,17 @@ </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>java-chassis-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.servicecomb</groupId> - <artifactId>deployment</artifactId> + <artifactId>config-apollo</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>config-apollo</artifactId> + <artifactId>config-cc</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>config-cc</artifactId> + <artifactId>deployment</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -972,107 +1060,122 @@ </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot2-starter</artifactId> + <artifactId>inspector</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot2-starter-discovery</artifactId> + <artifactId>java-chassis-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot2-starter-gateway</artifactId> + <artifactId>metrics-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot2-starter-servlet</artifactId> + <artifactId>metrics-prometheus</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot2-starter-standalone</artifactId> + <artifactId>provider-jaxrs</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot-common</artifactId> + <artifactId>provider-pojo</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot-starter-configuration</artifactId> + <artifactId>provider-rest-common</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot-starter-discovery</artifactId> + <artifactId>provider-springmvc</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot-starter-provider</artifactId> + <artifactId>service-registry</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot-starter-registry</artifactId> + <artifactId>solution-basic</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot-starter-servicecomb</artifactId> + <artifactId>spring-boot2-starter</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-boot-starter-transport</artifactId> + <artifactId>spring-boot2-starter-discovery</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-cloud-zuul</artifactId> + <artifactId>spring-boot2-starter-gateway</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>spring-cloud-zuul-zipkin</artifactId> + <artifactId>spring-boot2-starter-servlet</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>metrics-core</artifactId> + <artifactId>spring-boot2-starter-standalone</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>metrics-prometheus</artifactId> + <artifactId>spring-boot-common</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>provider-jaxrs</artifactId> + <artifactId>spring-boot-starter-configuration</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>provider-pojo</artifactId> + <artifactId>spring-boot-starter-discovery</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>provider-rest-common</artifactId> + <artifactId>spring-boot-starter-provider</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>provider-springmvc</artifactId> + <artifactId>spring-boot-starter-registry</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>service-registry</artifactId> + <artifactId>spring-boot-starter-servicecomb</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.servicecomb</groupId> + <artifactId>spring-boot-starter-transport</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.servicecomb</groupId> + <artifactId>spring-cloud-zuul</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.servicecomb</groupId> + <artifactId>spring-cloud-zuul-zipkin</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -1112,11 +1215,6 @@ </dependency> <dependency> <groupId>org.apache.servicecomb</groupId> - <artifactId>inspector</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.servicecomb</groupId> <artifactId>tracing-common</artifactId> <version>${project.version}</version> </dependency> @@ -1150,13 +1248,27 @@ <artifactId>transport-rest-vertx</artifactId> <version>${project.version}</version> </dependency> + <dependency> - <groupId>org.apache.servicecomb</groupId> - <artifactId>solution-basic</artifactId> + <groupId>org.apache.servicecomb.archetypes</groupId> + <artifactId>business-service-jaxrs-archetype</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.servicecomb.archetypes</groupId> + <artifactId>business-service-pojo-archetype</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.servicecomb.archetypes</groupId> + <artifactId>business-service-spring-boot-starter-archetype</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.servicecomb.archetypes</groupId> + <artifactId>business-service-springmvc-archetype</artifactId> <version>${project.version}</version> </dependency> </dependencies> </dependencyManagement> - - </project> diff --git a/java-chassis-dependencies/spring4/pom.xml b/java-chassis-dependencies/spring4/pom.xml index 8080346..2f77c4e 100644 --- a/java-chassis-dependencies/spring4/pom.xml +++ b/java-chassis-dependencies/spring4/pom.xml @@ -32,6 +32,7 @@ <dependencyManagement> <dependencies> + <!-- parent --> <dependency> <groupId>org.apache.servicecomb</groupId> <artifactId>java-chassis-dependencies</artifactId> diff --git a/java-chassis-dependencies/spring5/pom.xml b/java-chassis-dependencies/spring5/pom.xml index 3aea822..bab93ba 100644 --- a/java-chassis-dependencies/spring5/pom.xml +++ b/java-chassis-dependencies/spring5/pom.xml @@ -36,45 +36,49 @@ <dependencyManagement> <dependencies> - <!-- spring framework --> + <!-- parent --> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> + <groupId>org.apache.servicecomb</groupId> + <artifactId>java-chassis-dependencies</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> + + <!-- spring framework --> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> + <artifactId>spring-aop</artifactId> <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> + <artifactId>spring-aspects</artifactId> <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> + <artifactId>spring-beans</artifactId> <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-aspects</artifactId> + <artifactId>spring-context</artifactId> <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> + <artifactId>spring-core</artifactId> <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> + <artifactId>spring-expression</artifactId> <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> + <artifactId>spring-jcl</artifactId> <version>${spring.version}</version> </dependency> <dependency> @@ -99,16 +103,13 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-jcl</artifactId> + <artifactId>spring-web</artifactId> <version>${spring.version}</version> </dependency> - <!-- parent --> <dependency> - <groupId>org.apache.servicecomb</groupId> - <artifactId>java-chassis-dependencies</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${spring.version}</version> </dependency> </dependencies> </dependencyManagement> diff --git a/java-chassis-dependencies/springboot1/pom.xml b/java-chassis-dependencies/springboot1/pom.xml index 71c4d54..fe3f8a6 100644 --- a/java-chassis-dependencies/springboot1/pom.xml +++ b/java-chassis-dependencies/springboot1/pom.xml @@ -31,15 +31,23 @@ <packaging>pom</packaging> <properties> - <spring.boot.version>1.5.14.RELEASE</spring.boot.version> + <spring-boot.version>1.5.14.RELEASE</spring-boot.version> </properties> <dependencyManagement> <dependencies> <dependency> + <groupId>org.apache.servicecomb</groupId> + <artifactId>java-chassis-parent-spring4</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring.boot.version}</version> + <version>${spring-boot.version}</version> <exclusions> <exclusion> <groupId>com.fasterxml.jackson.core</groupId> @@ -49,13 +57,6 @@ <type>pom</type> <scope>import</scope> </dependency> - <dependency> - <groupId>org.apache.servicecomb</groupId> - <artifactId>java-chassis-parent-spring4</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> </dependencies> </dependencyManagement> </project> diff --git a/java-chassis-dependencies/springboot2/pom.xml b/java-chassis-dependencies/springboot2/pom.xml index 15dddbe..d1e3407 100644 --- a/java-chassis-dependencies/springboot2/pom.xml +++ b/java-chassis-dependencies/springboot2/pom.xml @@ -31,12 +31,16 @@ <packaging>pom</packaging> <properties> - <spring.boot.version>2.1.2.RELEASE</spring.boot.version> + <!-- Dependency versions --> + <spring-boot.version>2.1.2.RELEASE</spring-boot.version> <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version> + <!-- Plugin versions --> + <m2e-plugin.version>1.0.0</m2e-plugin.version> </properties> <dependencyManagement> <dependencies> + <!-- Error occur when changing the sequence of dependencies --> <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-dependencies</artifactId> @@ -67,7 +71,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>${spring.boot.version}</version> + <version>${spring-boot.version}</version> <exclusions> <exclusion> <groupId>com.fasterxml.jackson.core</groupId> @@ -94,7 +98,7 @@ <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> + <version>${m2e-plugin.version}</version> <configuration> <lifecycleMappingMetadata> <pluginExecutions>