Skip to content

Commit fc55a3b

Browse files
committed
Package updates
Updated most non-breaking library packages. - Spring 3.2 -> 3.4.5 - Postgres - TestContainers
1 parent ec9c17c commit fc55a3b

File tree

4 files changed

+29
-26
lines changed

4 files changed

+29
-26
lines changed

server/build.gradle

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ buildscript {
55

66
plugins {
77
id 'application'
8-
id 'org.springframework.boot' version '3.3.2'
9-
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
8+
id 'org.springframework.boot' version '3.4.0'
9+
id 'io.spring.dependency-management' version '1.1.7'
1010
id "org.sonarqube" version "5.1.0.4882"
1111
id "com.diffplug.spotless" version "6.19.0"
1212
id "org.flywaydb.flyway" version "10.1.0"
@@ -21,7 +21,7 @@ version = '1.0.0'
2121
// Apply a specific Java toolchain to ease working on different environments.
2222
java {
2323
toolchain {
24-
languageVersion = JavaLanguageVersion.of(17)
24+
languageVersion = JavaLanguageVersion.of(21)
2525
}
2626
}
2727

@@ -79,41 +79,44 @@ repositories {
7979
dependencies {
8080
compileOnly 'org.projectlombok:lombok'
8181

82-
implementation 'org.springframework.boot:spring-boot-starter-data-rest:3.2.0'
82+
implementation 'org.springframework.boot:spring-boot-starter-data-rest'
83+
implementation 'org.springframework.boot:spring-boot-starter-validation'
84+
implementation 'org.springframework.boot:spring-boot-starter-web'
85+
implementation 'org.springframework.boot:spring-boot-starter-webflux'
86+
implementation 'org.springframework.boot:spring-boot-starter-security'
87+
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
88+
implementation 'org.springframework.boot:spring-boot-starter-mail'
8389

84-
implementation 'org.springframework.boot:spring-boot-starter-validation:3.2.0'
85-
implementation 'org.springframework.boot:spring-boot-starter-web:3.2.0'
86-
implementation 'org.springframework.boot:spring-boot-starter-webflux:3.2.0'
87-
implementation 'org.springframework.boot:spring-boot-starter-security:3.2.0'
88-
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server:3.1.6'
89-
implementation 'org.springframework.boot:spring-boot-starter-mail:3.2.0'
90-
implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
9190
implementation 'org.jsoup:jsoup:1.17.2'
9291
implementation 'org.flywaydb:flyway-core:10.17.1'
9392
// https://mvnrepository.com/artifact/org.springframework.data/spring-data-jdbc
94-
implementation 'org.springframework.boot:spring-boot-starter-data-jdbc:3.3.5'
93+
implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
9594
implementation group: 'com.github.crawler-commons', name: 'crawler-commons', version: '1.4'
96-
implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1'
97-
implementation 'org.typesense:typesense-java:1.1.0'
95+
implementation 'org.apache.httpcomponents.client5:httpclient5:5.5-alpha1'
96+
implementation 'org.typesense:typesense-java:1.3.0'
9897

99-
runtimeOnly "org.flywaydb:flyway-database-postgresql:10.1.0"
100-
runtimeOnly 'org.postgresql:postgresql:42.7.3'
98+
runtimeOnly 'org.flywaydb:flyway-database-postgresql:11.8.1'
99+
runtimeOnly 'org.postgresql:postgresql:42.7.5'
101100
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'
102-
runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5'
101+
//implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
102+
//runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6'
103+
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
104+
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
103105

104106
annotationProcessor 'org.projectlombok:lombok'
107+
105108
testAnnotationProcessor 'org.projectlombok:lombok'
106109

107110
testCompileOnly 'org.projectlombok:lombok'
108111

109-
testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.0'
110-
testImplementation 'org.springframework.security:spring-security-test:6.2.0'
112+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
113+
testImplementation 'org.springframework.security:spring-security-test'
111114
testImplementation 'org.testcontainers:postgresql'
112115
testImplementation 'org.springframework.boot:spring-boot-testcontainers'
113-
testImplementation "org.testcontainers:junit-jupiter:1.19.3"
114-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3'
116+
testImplementation "org.testcontainers:junit-jupiter"
117+
testImplementation 'org.junit.jupiter:junit-jupiter-api'
115118

116-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3'
119+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
117120

118121
}
119122

server/src/main/java/dev/findfirst/users/controller/UserController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ public ResponseEntity<String> refreshToken(
175175
public ResponseEntity<String> uploadProfilePicture(
176176
@Valid @RequestParam("file") @FileSize MultipartFile file) throws NoUserFoundException {
177177
log.debug("Attempting to add user profile picture");
178-
User user = userService.getUserById(uContext.getUserId()).orElseThrow(NoUserFoundException::new);
178+
User user =
179+
userService.getUserById(uContext.getUserId()).orElseThrow(NoUserFoundException::new);
179180

180181
// File type validation
181182
String contentType = file.getContentType();

server/src/test/java/dev/findfirst/core/DatabaseTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.mockito.Mockito;
2424
import org.springframework.beans.factory.annotation.Autowired;
2525
import org.springframework.boot.test.context.SpringBootTest;
26-
import org.springframework.boot.test.mock.mockito.MockBean;
2726
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
27+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
2828
import org.testcontainers.containers.PostgreSQLContainer;
2929
import org.testcontainers.junit.jupiter.Container;
3030
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -35,7 +35,7 @@
3535
@TestMethodOrder(OrderAnnotation.class)
3636
class DatabaseTest {
3737

38-
@MockBean
38+
@MockitoBean
3939
private UserContext userContext;
4040

4141
@Container

server/src/test/java/dev/findfirst/users/controller/UserControllerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import dev.findfirst.users.model.user.TokenPassword;
2020

2121
import com.fasterxml.jackson.databind.ObjectMapper;
22-
import org.junit.jupiter.api.Disabled;
2322
import org.junit.jupiter.api.Order;
2423
import org.junit.jupiter.api.Test;
2524
import org.mockito.InjectMocks;

0 commit comments

Comments
 (0)