Skip to content

Commit 0b21da0

Browse files
authored
Merge pull request Baeldung#266 from hkhan/JAVA-6456-update-oauth-rest-to-latest-spring
[JAVA-6456] Upgrade Spring Boot version
2 parents d28b204 + b53a685 commit 0b21da0

File tree

5 files changed

+37
-5
lines changed

5 files changed

+37
-5
lines changed

oauth-rest/oauth-authorization-server/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>2.2.6.RELEASE</version>
14+
<version>2.4.10</version>
1515
<relativePath />
1616
</parent>
1717

@@ -66,7 +66,7 @@
6666
</exclusion>
6767
</exclusions>
6868
</dependency>
69-
69+
7070
<!-- config properties processor -->
7171
<dependency>
7272
<groupId>org.springframework.boot</groupId>
@@ -87,6 +87,12 @@
8787
<artifactId>rest-assured</artifactId>
8888
<scope>test</scope>
8989
</dependency>
90+
91+
<dependency>
92+
<groupId>org.junit.vintage</groupId>
93+
<artifactId>junit-vintage-engine</artifactId>
94+
<scope>test</scope>
95+
</dependency>
9096
</dependencies>
9197

9298
<build>

oauth-rest/oauth-authorization-server/src/main/resources/application.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ server:
22
port: 8083
33

44
spring:
5+
jpa:
6+
defer-datasource-initialization: true
57
datasource:
68
username: sa
79
url: jdbc:h2:mem:customdb

oauth-rest/oauth-resource-server/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>2.2.6.RELEASE</version>
14+
<version>2.5.4</version>
1515
<relativePath /> <!-- lookup parent from repository -->
1616
</parent>
1717

@@ -60,6 +60,12 @@
6060
<scope>test</scope>
6161
</dependency>
6262

63+
<dependency>
64+
<groupId>org.junit.vintage</groupId>
65+
<artifactId>junit-vintage-engine</artifactId>
66+
<scope>test</scope>
67+
</dependency>
68+
6369
</dependencies>
6470

6571
<build>

oauth-rest/oauth-resource-server/src/main/resources/application.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
server:
1+
server:
22
port: 8081
3-
servlet:
3+
servlet:
44
context-path: /resource-server
55

66
####### resource server configuration properties
77
spring:
8+
jpa:
9+
defer-datasource-initialization: true
810
security:
911
oauth2:
1012
resourceserver:

oauth-rest/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@
88
<version>0.1.0-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

11+
<dependencyManagement>
12+
<dependencies>
13+
<dependency>
14+
<groupId>org.junit.vintage</groupId>
15+
<artifactId>junit-vintage-engine</artifactId>
16+
<scope>test</scope>
17+
<exclusions>
18+
<exclusion>
19+
<groupId>org.hamcrest</groupId>
20+
<artifactId>hamcrest-core</artifactId>
21+
</exclusion>
22+
</exclusions>
23+
</dependency>
24+
</dependencies>
25+
</dependencyManagement>
26+
1127
<modules>
1228
<module>oauth-authorization-server</module>
1329
<module>oauth-resource-server</module>

0 commit comments

Comments
 (0)