Skip to content

Commit 6482021

Browse files
author
Matt Raible
committed
Update Spring Boot + Cloud example after re-creating from start.spring.io
1 parent c3e18d5 commit 6482021

File tree

8 files changed

+51
-28
lines changed

8 files changed

+51
-28
lines changed

‎spring-boot+cloud/api-gateway/pom.xml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<description>Demo project for Spring Boot</description>
1616

1717
<properties>
18-
<java.version>1.8</java.version>
19-
<spring-cloud.version>Hoxton.SR3</spring-cloud.version>
18+
<java.version>11</java.version>
19+
<spring-cloud.version>Hoxton.SR10</spring-cloud.version>
2020
</properties>
2121

2222
<dependencies>
@@ -58,6 +58,12 @@
5858
<groupId>org.springframework.boot</groupId>
5959
<artifactId>spring-boot-starter-test</artifactId>
6060
<scope>test</scope>
61+
<exclusions>
62+
<exclusion>
63+
<groupId>org.junit.vintage</groupId>
64+
<artifactId>junit-vintage-engine</artifactId>
65+
</exclusion>
66+
</exclusions>
6167
</dependency>
6268
</dependencies>
6369

@@ -79,6 +85,14 @@
7985
<plugin>
8086
<groupId>org.springframework.boot</groupId>
8187
<artifactId>spring-boot-maven-plugin</artifactId>
88+
<configuration>
89+
<excludes>
90+
<exclude>
91+
<groupId>org.projectlombok</groupId>
92+
<artifactId>lombok</artifactId>
93+
</exclude>
94+
</excludes>
95+
</configuration>
8296
</plugin>
8397
</plugins>
8498
</build>

‎spring-boot+cloud/api-gateway/src/main/java/com/example/apigateway/AuthorizationHeaderFilter.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
1010
import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
1111
import org.springframework.security.oauth2.core.OAuth2AccessToken;
12-
import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
1312

1413
import java.util.Optional;
1514

‎spring-boot+cloud/api-gateway/src/test/java/com/example/apigateway/ApiGatewayApplicationTests.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.example.apigateway;
22

3-
import org.junit.Test;
4-
import org.junit.runner.RunWith;
3+
import org.junit.jupiter.api.Test;
54
import org.springframework.boot.test.context.SpringBootTest;
6-
import org.springframework.test.context.junit4.SpringRunner;
75

8-
@RunWith(SpringRunner.class)
96
@SpringBootTest
10-
public class ApiGatewayApplicationTests {
7+
class ApiGatewayApplicationTests {
118

129
@Test
13-
public void contextLoads() {
10+
void contextLoads() {
1411
}
1512

1613
}

‎spring-boot+cloud/car-service/pom.xml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<description>Demo project for Spring Boot</description>
1616

1717
<properties>
18-
<java.version>1.8</java.version>
19-
<spring-cloud.version>Hoxton.SR3</spring-cloud.version>
18+
<java.version>11</java.version>
19+
<spring-cloud.version>Hoxton.SR10</spring-cloud.version>
2020
</properties>
2121

2222
<dependencies>
@@ -49,6 +49,7 @@
4949
<groupId>org.springframework.boot</groupId>
5050
<artifactId>spring-boot-devtools</artifactId>
5151
<scope>runtime</scope>
52+
<optional>true</optional>
5253
</dependency>
5354
<dependency>
5455
<groupId>com.h2database</groupId>
@@ -64,6 +65,12 @@
6465
<groupId>org.springframework.boot</groupId>
6566
<artifactId>spring-boot-starter-test</artifactId>
6667
<scope>test</scope>
68+
<exclusions>
69+
<exclusion>
70+
<groupId>org.junit.vintage</groupId>
71+
<artifactId>junit-vintage-engine</artifactId>
72+
</exclusion>
73+
</exclusions>
6774
</dependency>
6875
</dependencies>
6976

@@ -85,6 +92,14 @@
8592
<plugin>
8693
<groupId>org.springframework.boot</groupId>
8794
<artifactId>spring-boot-maven-plugin</artifactId>
95+
<configuration>
96+
<excludes>
97+
<exclude>
98+
<groupId>org.projectlombok</groupId>
99+
<artifactId>lombok</artifactId>
100+
</exclude>
101+
</excludes>
102+
</configuration>
88103
</plugin>
89104
</plugins>
90105
</build>

‎spring-boot+cloud/car-service/src/main/java/com/example/carservice/CarServiceApplication.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ protected void configure(HttpSecurity http) throws Exception {
4545
ApplicationRunner init(CarRepository repository) {
4646
return args -> {
4747
Stream.of("Ferrari", "Jaguar", "Porsche", "Lamborghini", "Bugatti",
48-
"AMC Gremlin", "Triumph Stag", "Ford Pinto", "Yugo GV").forEach(name -> {
49-
Car car = new Car();
50-
car.setName(name);
51-
repository.save(car);
48+
"AMC Gremlin", "Triumph Stag", "Ford Pinto", "Yugo GV").forEach(name -> {
49+
repository.save(new Car(name));
5250
});
5351
repository.findAll().forEach(System.out::println);
5452
};

‎spring-boot+cloud/car-service/src/test/java/com/example/carservice/CarServiceApplicationTests.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.example.carservice;
22

3-
import org.junit.Test;
4-
import org.junit.runner.RunWith;
3+
import org.junit.jupiter.api.Test;
54
import org.springframework.boot.test.context.SpringBootTest;
6-
import org.springframework.test.context.junit4.SpringRunner;
75

8-
@RunWith(SpringRunner.class)
96
@SpringBootTest
10-
public class CarServiceApplicationTests {
7+
class CarServiceApplicationTests {
118

129
@Test
13-
public void contextLoads() {
10+
void contextLoads() {
1411
}
1512

1613
}

‎spring-boot+cloud/discovery-service/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<properties>
1818
<java.version>11</java.version>
19-
<spring-cloud.version>Hoxton.SR3</spring-cloud.version>
19+
<spring-cloud.version>Hoxton.SR10</spring-cloud.version>
2020
</properties>
2121

2222
<dependencies>
@@ -28,6 +28,12 @@
2828
<groupId>org.springframework.boot</groupId>
2929
<artifactId>spring-boot-starter-test</artifactId>
3030
<scope>test</scope>
31+
<exclusions>
32+
<exclusion>
33+
<groupId>org.junit.vintage</groupId>
34+
<artifactId>junit-vintage-engine</artifactId>
35+
</exclusion>
36+
</exclusions>
3137
</dependency>
3238
</dependencies>
3339

‎spring-boot+cloud/discovery-service/src/test/java/com/example/discoveryservice/EurekaServiceApplicationTests.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.example.discoveryservice;
22

3-
import org.junit.Test;
4-
import org.junit.runner.RunWith;
3+
import org.junit.jupiter.api.Test;
54
import org.springframework.boot.test.context.SpringBootTest;
6-
import org.springframework.test.context.junit4.SpringRunner;
75

8-
@RunWith(SpringRunner.class)
96
@SpringBootTest
10-
public class EurekaServiceApplicationTests {
7+
class EurekaServiceApplicationTests {
118

129
@Test
13-
public void contextLoads() {
10+
void contextLoads() {
1411
}
1512

1613
}

0 commit comments

Comments
 (0)