Skip to content

Commit fdb44c2

Browse files
author
Maksim Litvinov
committed
update deps
1 parent e700035 commit fdb44c2

File tree

8 files changed

+25
-52
lines changed

8 files changed

+25
-52
lines changed

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20.6.1 AS frontend
1+
FROM node:23 AS frontend
22

33
WORKDIR /frontend
44

@@ -25,12 +25,13 @@ RUN ./gradlew --no-daemon dependencies
2525

2626
COPY lombok.config .
2727
COPY src src
28+
COPY config config
2829

2930
COPY --from=frontend /frontend/dist /backend/src/main/resources/static
3031

3132
RUN ./gradlew --no-daemon build
3233

33-
ENV JAVA_OPTS "-Xmx512M -Xms512M"
34+
ENV JAVA_OPTS="-Xmx512M -Xms512M"
3435
EXPOSE 8080
3536

36-
CMD java -jar build/libs/HexletSpringBlog-1.0-SNAPSHOT.jar
37+
CMD ["java", "-jar", "build/libs/HexletSpringBlog-1.0-SNAPSHOT.jar"]

build.gradle.kts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
33

44
plugins {
55
application
6-
// "checkstyle"
7-
id("io.freefair.lombok") version "8.6"
8-
id("org.springframework.boot") version "3.2.4"
6+
checkstyle
7+
id("io.freefair.lombok") version "8.13.1"
8+
id("org.springframework.boot") version "3.4.4"
99
id("io.spring.dependency-management") version "1.1.4"
10-
id("com.github.ben-manes.versions") version "0.50.0"
10+
id("com.github.ben-manes.versions") version "0.52.0"
1111
}
1212

1313
group = "io.hexlet.blog"
@@ -27,23 +27,24 @@ dependencies {
2727
implementation("org.springframework.boot:spring-boot-starter-security")
2828
implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server")
2929

30-
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0")
30+
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.6")
3131

3232
implementation("org.openapitools:jackson-databind-nullable:0.2.6")
33-
implementation("org.mapstruct:mapstruct:1.6.0.Beta1")
34-
annotationProcessor("org.mapstruct:mapstruct-processor:1.6.0.Beta1")
33+
implementation("org.mapstruct:mapstruct:1.6.3")
34+
annotationProcessor("org.mapstruct:mapstruct-processor:1.6.3")
3535

3636
// implementation("io.github.wimdeblauwe:error-handling-spring-boot-starter:4.2.0")
3737

38-
implementation("org.instancio:instancio-junit:3.6.0")
39-
implementation("net.javacrumbs.json-unit:json-unit-assertj:3.2.2")
40-
implementation("net.datafaker:datafaker:2.0.2")
38+
implementation("org.instancio:instancio-junit:5.4.1")
39+
implementation("net.javacrumbs.json-unit:json-unit-assertj:4.1.0")
40+
implementation("net.datafaker:datafaker:2.4.3")
4141

42-
runtimeOnly("com.h2database:h2:2.2.224")
42+
runtimeOnly("com.h2database:h2:2.3.232")
4343
testImplementation("org.springframework.security:spring-security-test")
4444
testImplementation("org.springframework.boot:spring-boot-starter-test")
45-
testImplementation(platform("org.junit:junit-bom:5.10.1"))
46-
testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
45+
testImplementation(platform("org.junit:junit-bom:5.12.2"))
46+
testImplementation("org.junit.jupiter:junit-jupiter")
47+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
4748

4849
}
4950

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
package io.hexlet.blog.repository;
22

3-
import org.springframework.data.domain.Page;
4-
import org.springframework.data.domain.Pageable;
5-
import org.springframework.data.jpa.domain.Specification;
63
import org.springframework.data.jpa.repository.JpaRepository;
74
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
85
import org.springframework.stereotype.Repository;
96

10-
import io.hexlet.blog.model.Post;
117
import io.hexlet.blog.model.PostComment;
128

139
@Repository
14-
public interface PostCommentRepository extends JpaRepository<PostComment, Long>, JpaSpecificationExecutor<PostComment> {
15-
// Page<Post> findAll(Specification<Post> spec, Pageable pageable);
16-
}
10+
public interface PostCommentRepository
11+
extends JpaRepository<PostComment, Long>, JpaSpecificationExecutor<PostComment> { }
1712

src/test/java/io/hexlet/blog/controller/api/HelloControllerTest.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/test/java/io/hexlet/blog/controller/api/PostsCommentsControllerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ public void testIndex() throws Exception {
111111
.andReturn();
112112
var body = result.getResponse().getContentAsString();
113113

114-
Map<String, Object> content = om.readValue(body, new TypeReference<>() {});
114+
Map<String, Object> content = om.readValue(body, new TypeReference<>() { });
115115
var postComments = content.get("content");
116116

117-
List<PostCommentDTO> postCommentDTOS = om.convertValue(postComments, new TypeReference<>() {});
117+
List<PostCommentDTO> postCommentDTOS = om.convertValue(postComments, new TypeReference<>() { });
118118

119119
var actual = postCommentDTOS.stream().map(postCommentMapper::map).toList();
120120
var expected = postCommentRepository.findAll();

src/test/java/io/hexlet/blog/controller/api/PostsControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void testIndex() throws Exception {
105105
.getResponse();
106106
var body = response.getContentAsString();
107107

108-
List<PostDTO> postDTOS = om.readValue(body, new TypeReference<>() {});
108+
List<PostDTO> postDTOS = om.readValue(body, new TypeReference<>() { });
109109

110110
var actual = postDTOS.stream().map(postMapper::map).toList();
111111
var expected = postRepository.findAll();

src/test/java/io/hexlet/blog/controller/api/UsersControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void testIndex() throws Exception {
8888
.getResponse();
8989
var body = response.getContentAsString();
9090

91-
List<UserDTO> userDTOS = om.readValue(body, new TypeReference<>() {});
91+
List<UserDTO> userDTOS = om.readValue(body, new TypeReference<>() { });
9292

9393
var actual = userDTOS.stream().map(userMapper::map).toList();
9494
var expected = userRepository.findAll();

0 commit comments

Comments
 (0)