Skip to content
This repository was archived by the owner on Jun 29, 2018. It is now read-only.

Commit a084353

Browse files
author
Johannes Stelzer
committed
Update to Spring Cloud release-train Angel.SR3
1 parent 410a64d commit a084353

File tree

3 files changed

+9
-54
lines changed

3 files changed

+9
-54
lines changed

pom.xml

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<spring-boot.version>1.2.4.RELEASE</spring-boot.version>
2727
<hazelcast.version>3.3.3</hazelcast.version>
2828
<commons-lang3.version>3.3.2</commons-lang3.version>
29-
<spring-cloud.version>1.0.1.RELEASE</spring-cloud.version>
29+
<spring-cloud.version>Angel.SR3</spring-cloud.version>
3030

3131
<build-plugin.jacoco.version>0.7.3.201502191951</build-plugin.jacoco.version>
3232
<build-plugin.coveralls.version>3.0.1</build-plugin.coveralls.version>
@@ -216,6 +216,7 @@
216216
<artifactId>spring-boot-admin-example</artifactId>
217217
<version>${project.version}</version>
218218
</dependency>
219+
219220
<dependency>
220221
<groupId>org.springframework.boot</groupId>
221222
<artifactId>spring-boot-starter-web</artifactId>
@@ -224,35 +225,12 @@
224225

225226
<dependency>
226227
<groupId>org.springframework.cloud</groupId>
227-
<artifactId>spring-cloud-starter</artifactId>
228-
<version>${spring-cloud.version}</version>
229-
</dependency>
230-
<dependency>
231-
<groupId>org.springframework.cloud</groupId>
232-
<artifactId>spring-cloud-starter-zuul</artifactId>
233-
<version>${spring-cloud.version}</version>
234-
</dependency>
235-
<dependency>
236-
<groupId>org.springframework.cloud</groupId>
237-
<artifactId>spring-cloud-netflix-core</artifactId>
238-
<version>${spring-cloud.version}</version>
239-
</dependency>
240-
<dependency>
241-
<groupId>org.springframework.cloud</groupId>
242-
<artifactId>spring-cloud-commons</artifactId>
243-
<version>${spring-cloud.version}</version>
244-
</dependency>
245-
<dependency>
246-
<groupId>org.springframework.cloud</groupId>
247-
<artifactId>spring-cloud-starter-eureka</artifactId>
228+
<artifactId>spring-cloud-starter-parent</artifactId>
248229
<version>${spring-cloud.version}</version>
230+
<type>pom</type>
231+
<scope>import</scope>
249232
</dependency>
250233

251-
<dependency>
252-
<groupId>org.apache.commons</groupId>
253-
<artifactId>commons-lang3</artifactId>
254-
<version>${commons-lang3.version}</version>
255-
</dependency>
256234
<dependency>
257235
<groupId>com.hazelcast</groupId>
258236
<artifactId>hazelcast</artifactId>
@@ -263,6 +241,7 @@
263241
<artifactId>hazelcast-spring</artifactId>
264242
<version>${hazelcast.version}</version>
265243
</dependency>
244+
266245
<!-- Test -->
267246
<dependency>
268247
<groupId>org.springframework</groupId>

spring-boot-admin-server-ui/.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
8686
"no-with": 2,
8787
"no-wrap-func": 2,
88-
"yoda": "never",
88+
"yoda": [2, "never"],
8989

9090
"block-scoped-var": 0,
9191
"brace-style": [0, "1tbs"],

spring-boot-admin-server/pom.xml

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
<groupId>com.fasterxml.jackson.core</groupId>
2626
<artifactId>jackson-databind</artifactId>
2727
</dependency>
28-
<dependency>
29-
<groupId>org.apache.commons</groupId>
30-
<artifactId>commons-lang3</artifactId>
31-
</dependency>
3228
<dependency>
3329
<groupId>org.springframework.boot</groupId>
3430
<artifactId>spring-boot-configuration-processor</artifactId>
@@ -37,27 +33,8 @@
3733

3834
<!-- Use Zuul WITHOUT Hystrix/Ribbon/Config Client -->
3935
<dependency>
40-
<groupId>org.springframework.cloud</groupId>
41-
<artifactId>spring-cloud-starter-zuul</artifactId>
42-
<exclusions>
43-
<exclusion>
44-
<groupId>org.springframework.cloud</groupId>
45-
<artifactId>spring-cloud-starter</artifactId>
46-
</exclusion>
47-
<exclusion>
48-
<groupId>org.springframework.cloud</groupId>
49-
<artifactId>spring-cloud-starter-hystrix</artifactId>
50-
</exclusion>
51-
<exclusion>
52-
<groupId>org.springframework.cloud</groupId>
53-
<artifactId>spring-cloud-starter-ribbon</artifactId>
54-
</exclusion>
55-
<exclusion>
56-
<!-- ships old hamcrest matchers -->
57-
<groupId>org.mockito</groupId>
58-
<artifactId>mockito-all</artifactId>
59-
</exclusion>
60-
</exclusions>
36+
<groupId>com.netflix.zuul</groupId>
37+
<artifactId>zuul-core</artifactId>
6138
</dependency>
6239
<dependency>
6340
<groupId>org.springframework.cloud</groupId>
@@ -70,7 +47,6 @@
7047
<dependency>
7148
<groupId>org.apache.httpcomponents</groupId>
7249
<artifactId>httpclient</artifactId>
73-
<version>4.3.6</version>
7450
</dependency>
7551

7652
<!-- Optional Discovery Client -->

0 commit comments

Comments
 (0)