From 5b260a9f759af9f3dd83a5e55c77e11a9e24bde7 Mon Sep 17 00:00:00 2001 From: Eric Zhao Date: Thu, 21 Feb 2019 19:41:50 +0800 Subject: [PATCH] Bump version to 1.5.0-SNAPSHOT Signed-off-by: Eric Zhao --- README.md | 2 +- pom.xml | 2 +- sentinel-adapter/pom.xml | 2 +- sentinel-adapter/sentinel-dubbo-adapter/pom.xml | 2 +- sentinel-adapter/sentinel-grpc-adapter/pom.xml | 2 +- sentinel-adapter/sentinel-web-servlet/pom.xml | 2 +- sentinel-adapter/sentinel-zuul-adapter/pom.xml | 2 +- sentinel-benchmark/pom.xml | 2 +- sentinel-cluster/pom.xml | 2 +- sentinel-cluster/sentinel-cluster-client-default/pom.xml | 2 +- sentinel-cluster/sentinel-cluster-common-default/pom.xml | 2 +- sentinel-cluster/sentinel-cluster-server-default/pom.xml | 2 +- sentinel-core/pom.xml | 2 +- .../src/main/java/com/alibaba/csp/sentinel/Constants.java | 2 +- sentinel-dashboard/pom.xml | 2 +- sentinel-demo/pom.xml | 2 +- sentinel-demo/sentinel-demo-annotation-spring-aop/pom.xml | 2 +- sentinel-demo/sentinel-demo-apollo-datasource/pom.xml | 2 +- sentinel-demo/sentinel-demo-basic/pom.xml | 2 +- sentinel-demo/sentinel-demo-cluster/pom.xml | 2 +- .../sentinel-demo-cluster-embedded/pom.xml | 2 +- .../sentinel-demo-cluster-server-alone/pom.xml | 2 +- sentinel-demo/sentinel-demo-dubbo/pom.xml | 2 +- sentinel-demo/sentinel-demo-dynamic-file-rule/pom.xml | 2 +- sentinel-demo/sentinel-demo-nacos-datasource/pom.xml | 2 +- sentinel-demo/sentinel-demo-parameter-flow-control/pom.xml | 2 +- sentinel-demo/sentinel-demo-rocketmq/pom.xml | 2 +- sentinel-demo/sentinel-demo-slot-chain-spi/pom.xml | 2 +- sentinel-demo/sentinel-demo-zookeeper-datasource/pom.xml | 2 +- sentinel-extension/pom.xml | 2 +- sentinel-extension/sentinel-annotation-aspectj/pom.xml | 2 +- sentinel-extension/sentinel-datasource-apollo/pom.xml | 2 +- sentinel-extension/sentinel-datasource-extension/pom.xml | 2 +- sentinel-extension/sentinel-datasource-nacos/pom.xml | 2 +- sentinel-extension/sentinel-datasource-redis/pom.xml | 2 +- sentinel-extension/sentinel-datasource-zookeeper/pom.xml | 2 +- sentinel-extension/sentinel-parameter-flow-control/pom.xml | 2 +- sentinel-transport/pom.xml | 2 +- sentinel-transport/sentinel-transport-common/pom.xml | 2 +- sentinel-transport/sentinel-transport-netty-http/pom.xml | 2 +- sentinel-transport/sentinel-transport-simple-http/pom.xml | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 2dd06ac9..d48e3f5d 100755 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Below is a simple demo that guides new users to use Sentinel in just 3 steps. It ### 1. Add Dependency -**Note:** Sentinel requires Java 6 or later. +**Note:** Sentinel requires Java 7 or later. If your application is build in maven, just add the following code in pom.xml. diff --git a/pom.xml b/pom.xml index 7ed5ee40..bf508135 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.alibaba.csp sentinel-parent - 1.4.2 + 1.5.0-SNAPSHOT pom ${project.artifactId} diff --git a/sentinel-adapter/pom.xml b/sentinel-adapter/pom.xml index 80d7e98f..a665969b 100755 --- a/sentinel-adapter/pom.xml +++ b/sentinel-adapter/pom.xml @@ -7,7 +7,7 @@ com.alibaba.csp sentinel-parent - 1.4.2 + 1.5.0-SNAPSHOT sentinel-adapter pom diff --git a/sentinel-adapter/sentinel-dubbo-adapter/pom.xml b/sentinel-adapter/sentinel-dubbo-adapter/pom.xml index 85de74d7..1e82b525 100755 --- a/sentinel-adapter/sentinel-dubbo-adapter/pom.xml +++ b/sentinel-adapter/sentinel-dubbo-adapter/pom.xml @@ -6,7 +6,7 @@ com.alibaba.csp sentinel-adapter - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 sentinel-dubbo-adapter diff --git a/sentinel-adapter/sentinel-grpc-adapter/pom.xml b/sentinel-adapter/sentinel-grpc-adapter/pom.xml index 2b3118b1..119fd482 100755 --- a/sentinel-adapter/sentinel-grpc-adapter/pom.xml +++ b/sentinel-adapter/sentinel-grpc-adapter/pom.xml @@ -5,7 +5,7 @@ sentinel-adapter com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 sentinel-grpc-adapter diff --git a/sentinel-adapter/sentinel-web-servlet/pom.xml b/sentinel-adapter/sentinel-web-servlet/pom.xml index a70d2234..8638b862 100755 --- a/sentinel-adapter/sentinel-web-servlet/pom.xml +++ b/sentinel-adapter/sentinel-web-servlet/pom.xml @@ -6,7 +6,7 @@ com.alibaba.csp sentinel-adapter - 1.4.2 + 1.5.0-SNAPSHOT sentinel-web-servlet diff --git a/sentinel-adapter/sentinel-zuul-adapter/pom.xml b/sentinel-adapter/sentinel-zuul-adapter/pom.xml index f45307c6..56f469d1 100755 --- a/sentinel-adapter/sentinel-zuul-adapter/pom.xml +++ b/sentinel-adapter/sentinel-zuul-adapter/pom.xml @@ -5,7 +5,7 @@ sentinel-adapter com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 sentinel-zuul-adapter diff --git a/sentinel-benchmark/pom.xml b/sentinel-benchmark/pom.xml index 605ca54d..5588afa8 100644 --- a/sentinel-benchmark/pom.xml +++ b/sentinel-benchmark/pom.xml @@ -5,7 +5,7 @@ sentinel-parent com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-cluster/pom.xml b/sentinel-cluster/pom.xml index 3364813e..a7cefbfb 100644 --- a/sentinel-cluster/pom.xml +++ b/sentinel-cluster/pom.xml @@ -5,7 +5,7 @@ sentinel-parent com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 pom diff --git a/sentinel-cluster/sentinel-cluster-client-default/pom.xml b/sentinel-cluster/sentinel-cluster-client-default/pom.xml index 2dd087ea..b0bbfa61 100644 --- a/sentinel-cluster/sentinel-cluster-client-default/pom.xml +++ b/sentinel-cluster/sentinel-cluster-client-default/pom.xml @@ -5,7 +5,7 @@ sentinel-cluster com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-cluster/sentinel-cluster-common-default/pom.xml b/sentinel-cluster/sentinel-cluster-common-default/pom.xml index 43b444f3..81a78221 100644 --- a/sentinel-cluster/sentinel-cluster-common-default/pom.xml +++ b/sentinel-cluster/sentinel-cluster-common-default/pom.xml @@ -5,7 +5,7 @@ sentinel-cluster com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-cluster/sentinel-cluster-server-default/pom.xml b/sentinel-cluster/sentinel-cluster-server-default/pom.xml index 436d9514..70a95f1c 100644 --- a/sentinel-cluster/sentinel-cluster-server-default/pom.xml +++ b/sentinel-cluster/sentinel-cluster-server-default/pom.xml @@ -5,7 +5,7 @@ sentinel-cluster com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-core/pom.xml b/sentinel-core/pom.xml index 932aed83..186bab62 100755 --- a/sentinel-core/pom.xml +++ b/sentinel-core/pom.xml @@ -6,7 +6,7 @@ com.alibaba.csp sentinel-parent - 1.4.2 + 1.5.0-SNAPSHOT sentinel-core jar diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/Constants.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/Constants.java index 611fca81..45d46852 100755 --- a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/Constants.java +++ b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/Constants.java @@ -30,7 +30,7 @@ import com.alibaba.csp.sentinel.util.VersionUtil; */ public final class Constants { - public static final String SENTINEL_VERSION = VersionUtil.getVersion("1.4.2"); + public static final String SENTINEL_VERSION = VersionUtil.getVersion("1.5.0"); public final static int MAX_CONTEXT_NAME_SIZE = 2000; public final static int MAX_SLOT_CHAIN_SIZE = 6000; diff --git a/sentinel-dashboard/pom.xml b/sentinel-dashboard/pom.xml index 792a0894..c66f77c3 100755 --- a/sentinel-dashboard/pom.xml +++ b/sentinel-dashboard/pom.xml @@ -6,7 +6,7 @@ com.alibaba.csp sentinel-parent - 1.4.2 + 1.5.0-SNAPSHOT sentinel-dashboard diff --git a/sentinel-demo/pom.xml b/sentinel-demo/pom.xml index fe920d3f..e519e045 100755 --- a/sentinel-demo/pom.xml +++ b/sentinel-demo/pom.xml @@ -6,7 +6,7 @@ com.alibaba.csp sentinel-parent - 1.4.2 + 1.5.0-SNAPSHOT sentinel-demo pom diff --git a/sentinel-demo/sentinel-demo-annotation-spring-aop/pom.xml b/sentinel-demo/sentinel-demo-annotation-spring-aop/pom.xml index 9ccef081..60a68f20 100644 --- a/sentinel-demo/sentinel-demo-annotation-spring-aop/pom.xml +++ b/sentinel-demo/sentinel-demo-annotation-spring-aop/pom.xml @@ -5,7 +5,7 @@ sentinel-demo com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-demo/sentinel-demo-apollo-datasource/pom.xml b/sentinel-demo/sentinel-demo-apollo-datasource/pom.xml index 9caba9a6..81a963c5 100644 --- a/sentinel-demo/sentinel-demo-apollo-datasource/pom.xml +++ b/sentinel-demo/sentinel-demo-apollo-datasource/pom.xml @@ -5,7 +5,7 @@ sentinel-demo com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-demo/sentinel-demo-basic/pom.xml b/sentinel-demo/sentinel-demo-basic/pom.xml index 6294934e..da1a7d3d 100755 --- a/sentinel-demo/sentinel-demo-basic/pom.xml +++ b/sentinel-demo/sentinel-demo-basic/pom.xml @@ -6,7 +6,7 @@ com.alibaba.csp sentinel-demo - 1.4.2 + 1.5.0-SNAPSHOT sentinel-demo-basic diff --git a/sentinel-demo/sentinel-demo-cluster/pom.xml b/sentinel-demo/sentinel-demo-cluster/pom.xml index 41f735c3..aa59f3fd 100644 --- a/sentinel-demo/sentinel-demo-cluster/pom.xml +++ b/sentinel-demo/sentinel-demo-cluster/pom.xml @@ -5,7 +5,7 @@ sentinel-demo com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-demo/sentinel-demo-cluster/sentinel-demo-cluster-embedded/pom.xml b/sentinel-demo/sentinel-demo-cluster/sentinel-demo-cluster-embedded/pom.xml index 2b682580..9b8844cb 100644 --- a/sentinel-demo/sentinel-demo-cluster/sentinel-demo-cluster-embedded/pom.xml +++ b/sentinel-demo/sentinel-demo-cluster/sentinel-demo-cluster-embedded/pom.xml @@ -5,7 +5,7 @@ sentinel-demo-cluster com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-demo/sentinel-demo-cluster/sentinel-demo-cluster-server-alone/pom.xml b/sentinel-demo/sentinel-demo-cluster/sentinel-demo-cluster-server-alone/pom.xml index 32b47a48..fbc0ff31 100644 --- a/sentinel-demo/sentinel-demo-cluster/sentinel-demo-cluster-server-alone/pom.xml +++ b/sentinel-demo/sentinel-demo-cluster/sentinel-demo-cluster-server-alone/pom.xml @@ -5,7 +5,7 @@ sentinel-demo-cluster com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-demo/sentinel-demo-dubbo/pom.xml b/sentinel-demo/sentinel-demo-dubbo/pom.xml index fc717435..3cb299c3 100644 --- a/sentinel-demo/sentinel-demo-dubbo/pom.xml +++ b/sentinel-demo/sentinel-demo-dubbo/pom.xml @@ -5,7 +5,7 @@ sentinel-demo com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-demo/sentinel-demo-dynamic-file-rule/pom.xml b/sentinel-demo/sentinel-demo-dynamic-file-rule/pom.xml index b8496397..b8993f8a 100755 --- a/sentinel-demo/sentinel-demo-dynamic-file-rule/pom.xml +++ b/sentinel-demo/sentinel-demo-dynamic-file-rule/pom.xml @@ -6,7 +6,7 @@ com.alibaba.csp sentinel-demo - 1.4.2 + 1.5.0-SNAPSHOT sentinel-demo-dynamic-file-rule diff --git a/sentinel-demo/sentinel-demo-nacos-datasource/pom.xml b/sentinel-demo/sentinel-demo-nacos-datasource/pom.xml index c7ec3c35..009aa306 100644 --- a/sentinel-demo/sentinel-demo-nacos-datasource/pom.xml +++ b/sentinel-demo/sentinel-demo-nacos-datasource/pom.xml @@ -5,7 +5,7 @@ sentinel-demo com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-demo/sentinel-demo-parameter-flow-control/pom.xml b/sentinel-demo/sentinel-demo-parameter-flow-control/pom.xml index 166d3d96..ced039b8 100644 --- a/sentinel-demo/sentinel-demo-parameter-flow-control/pom.xml +++ b/sentinel-demo/sentinel-demo-parameter-flow-control/pom.xml @@ -5,7 +5,7 @@ sentinel-demo com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-demo/sentinel-demo-rocketmq/pom.xml b/sentinel-demo/sentinel-demo-rocketmq/pom.xml index 9c5bf3d3..7d3c3945 100755 --- a/sentinel-demo/sentinel-demo-rocketmq/pom.xml +++ b/sentinel-demo/sentinel-demo-rocketmq/pom.xml @@ -5,7 +5,7 @@ com.alibaba.csp sentinel-demo - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-demo/sentinel-demo-slot-chain-spi/pom.xml b/sentinel-demo/sentinel-demo-slot-chain-spi/pom.xml index 6f31ec22..9cfeb042 100644 --- a/sentinel-demo/sentinel-demo-slot-chain-spi/pom.xml +++ b/sentinel-demo/sentinel-demo-slot-chain-spi/pom.xml @@ -5,7 +5,7 @@ sentinel-demo com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-demo/sentinel-demo-zookeeper-datasource/pom.xml b/sentinel-demo/sentinel-demo-zookeeper-datasource/pom.xml index 15c612c3..3cb2c93a 100644 --- a/sentinel-demo/sentinel-demo-zookeeper-datasource/pom.xml +++ b/sentinel-demo/sentinel-demo-zookeeper-datasource/pom.xml @@ -5,7 +5,7 @@ sentinel-demo com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-extension/pom.xml b/sentinel-extension/pom.xml index 25d48ef6..c1cdb9cf 100755 --- a/sentinel-extension/pom.xml +++ b/sentinel-extension/pom.xml @@ -6,7 +6,7 @@ com.alibaba.csp sentinel-parent - 1.4.2 + 1.5.0-SNAPSHOT sentinel-extension pom diff --git a/sentinel-extension/sentinel-annotation-aspectj/pom.xml b/sentinel-extension/sentinel-annotation-aspectj/pom.xml index 1eddfc63..8463f067 100644 --- a/sentinel-extension/sentinel-annotation-aspectj/pom.xml +++ b/sentinel-extension/sentinel-annotation-aspectj/pom.xml @@ -5,7 +5,7 @@ sentinel-extension com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-extension/sentinel-datasource-apollo/pom.xml b/sentinel-extension/sentinel-datasource-apollo/pom.xml index 5d026418..e01adc37 100644 --- a/sentinel-extension/sentinel-datasource-apollo/pom.xml +++ b/sentinel-extension/sentinel-datasource-apollo/pom.xml @@ -5,7 +5,7 @@ sentinel-extension com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-extension/sentinel-datasource-extension/pom.xml b/sentinel-extension/sentinel-datasource-extension/pom.xml index 7f9b3487..6e028372 100755 --- a/sentinel-extension/sentinel-datasource-extension/pom.xml +++ b/sentinel-extension/sentinel-datasource-extension/pom.xml @@ -6,7 +6,7 @@ com.alibaba.csp sentinel-extension - 1.4.2 + 1.5.0-SNAPSHOT sentinel-datasource-extension diff --git a/sentinel-extension/sentinel-datasource-nacos/pom.xml b/sentinel-extension/sentinel-datasource-nacos/pom.xml index 1e797b15..51275166 100644 --- a/sentinel-extension/sentinel-datasource-nacos/pom.xml +++ b/sentinel-extension/sentinel-datasource-nacos/pom.xml @@ -5,7 +5,7 @@ sentinel-extension com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-extension/sentinel-datasource-redis/pom.xml b/sentinel-extension/sentinel-datasource-redis/pom.xml index e141828d..6dd9a9b6 100644 --- a/sentinel-extension/sentinel-datasource-redis/pom.xml +++ b/sentinel-extension/sentinel-datasource-redis/pom.xml @@ -5,7 +5,7 @@ sentinel-extension com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-extension/sentinel-datasource-zookeeper/pom.xml b/sentinel-extension/sentinel-datasource-zookeeper/pom.xml index 7906d0ca..72714872 100644 --- a/sentinel-extension/sentinel-datasource-zookeeper/pom.xml +++ b/sentinel-extension/sentinel-datasource-zookeeper/pom.xml @@ -5,7 +5,7 @@ sentinel-extension com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-extension/sentinel-parameter-flow-control/pom.xml b/sentinel-extension/sentinel-parameter-flow-control/pom.xml index 8b435ed8..613bb92e 100644 --- a/sentinel-extension/sentinel-parameter-flow-control/pom.xml +++ b/sentinel-extension/sentinel-parameter-flow-control/pom.xml @@ -5,7 +5,7 @@ sentinel-extension com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 diff --git a/sentinel-transport/pom.xml b/sentinel-transport/pom.xml index b85d7577..c2639a38 100755 --- a/sentinel-transport/pom.xml +++ b/sentinel-transport/pom.xml @@ -6,7 +6,7 @@ com.alibaba.csp sentinel-parent - 1.4.2 + 1.5.0-SNAPSHOT sentinel-transport The transport module of Sentinel diff --git a/sentinel-transport/sentinel-transport-common/pom.xml b/sentinel-transport/sentinel-transport-common/pom.xml index dc56d227..0a5af007 100755 --- a/sentinel-transport/sentinel-transport-common/pom.xml +++ b/sentinel-transport/sentinel-transport-common/pom.xml @@ -5,7 +5,7 @@ com.alibaba.csp sentinel-transport - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 jar diff --git a/sentinel-transport/sentinel-transport-netty-http/pom.xml b/sentinel-transport/sentinel-transport-netty-http/pom.xml index e2f2bcd3..33dd2cfe 100755 --- a/sentinel-transport/sentinel-transport-netty-http/pom.xml +++ b/sentinel-transport/sentinel-transport-netty-http/pom.xml @@ -5,7 +5,7 @@ com.alibaba.csp sentinel-transport - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0 sentinel-transport-netty-http diff --git a/sentinel-transport/sentinel-transport-simple-http/pom.xml b/sentinel-transport/sentinel-transport-simple-http/pom.xml index d2ed1781..cf193315 100755 --- a/sentinel-transport/sentinel-transport-simple-http/pom.xml +++ b/sentinel-transport/sentinel-transport-simple-http/pom.xml @@ -5,7 +5,7 @@ sentinel-transport com.alibaba.csp - 1.4.2 + 1.5.0-SNAPSHOT 4.0.0