-
Merge branch 'master' into GracefullyShoutDownDubboAndSpringBott-0112masterinto · 60b52fbd
# Conflicts: # common-core/pom.xml # common-util/pom.xml # config-starter/pom.xml # logger-starter/pom.xml # matrix-bigdata/matrix-bigdata-hbase-starter/pom.xml # matrix-bigdata/matrix-bigdata-spark-starter/pom.xml # matrix-bigdata/pom.xml # matrix-bus/matrix-bus-canal-starter/pom.xml # matrix-bus/pom.xml # matrix-client/matrix-client-openfeign-starter/pom.xml # matrix-client/pom.xml # matrix-datahelper/matrix-datahelper-redis-core/pom.xml # matrix-datahelper/matrix-datahelper-redis-starter/pom.xml # matrix-datahelper/pom.xml # matrix-datasource/matrix-datasource-core/pom.xml # matrix-datasource/matrix-datasource-druid/pom.xml # matrix-datasource/pom.xml # matrix-job/matrix-job-core/pom.xml # matrix-job/matrix-job-xxl-core/pom.xml # matrix-job/matrix-job-xxl-starter/pom.xml # matrix-job/pom.xml # matrix-mq/matrix-mq-rocketmq-client/pom.xml # matrix-mq/matrix-mq-rocketmq-core/pom.xml # matrix-mq/matrix-mq-rocketmq-starter/pom.xml # matrix-mq/pom.xml # matrix-mybatis/matrix-mybatis-core/pom.xml # matrix-mybatis/matrix-mybatis-starter/pom.xml # matrix-mybatis/pom.xml # matrix-protocol/matrix-protocol-core/pom.xml # matrix-protocol/matrix-protocol-dubbo-core/pom.xml # matrix-protocol/matrix-protocol-dubbo-starter/pom.xml # matrix-protocol/matrix-protocol-web-core/pom.xml # matrix-protocol/matrix-protocol-web-starter/pom.xml # matrix-protocol/pom.xml # pom.xml
房斌 committed