Merge branch 'master' into 2.0.x

This commit is contained in:
Dave Syer
2017-06-30 15:28:05 +01:00
6 changed files with 59 additions and 164 deletions

View File

@@ -5,7 +5,6 @@
<groupId>org.springframework.cloud.gateway</groupId>
<artifactId>spring-cloud-gateway-sample</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Spring Cloud Gateway Sample</name>
@@ -18,9 +17,6 @@
<relativePath>..</relativePath> <!-- lookup parent from repository -->
</parent>
<properties>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -39,6 +35,11 @@
<artifactId>token-bucket</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>org.isomorphism</groupId>
<artifactId>token-bucket</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>