Skip to content

Commit 87ffb8e

Browse files
committed
Merge remote-tracking branch 'origin/controllers-films-users' into controllers-films-users
2 parents 6d8a6ed + 5f1d738 commit 87ffb8e

1 file changed

Lines changed: 19 additions & 15 deletions

File tree

pom.xml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
45
<modelVersion>4.0.0</modelVersion>
56
<parent>
67
<groupId>org.springframework.boot</groupId>
78
<artifactId>spring-boot-starter-parent</artifactId>
89
<version>3.3.3</version>
9-
<relativePath/> <!-- lookup parent from repository -->
10+
<relativePath/>
1011
</parent>
1112
<groupId>ru.yandex.practicum</groupId>
1213
<artifactId>filmorate</artifactId>
13-
<version>0.0.1-SNAPSHOT</version>
14-
<name>filmorate</name>
15-
<description>filmorate</description>
14+
<version>1.0-SNAPSHOT</version>
15+
1616
<properties>
17-
<java.version>21</java.version>
17+
<maven.compiler.source>21</maven.compiler.source>
18+
<maven.compiler.target>21</maven.compiler.target>
19+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1820
</properties>
21+
1922
<dependencies>
2023
<dependency>
2124
<groupId>org.springframework.boot</groupId>
@@ -27,11 +30,6 @@
2730
<version>1.18.34</version>
2831
<scope>provided</scope>
2932
</dependency>
30-
<dependency>
31-
<groupId>org.springframework.boot</groupId>
32-
<artifactId>spring-boot-starter-test</artifactId>
33-
<scope>test</scope>
34-
</dependency>
3533
<dependency>
3634
<groupId>com.google.code.gson</groupId>
3735
<artifactId>gson</artifactId>
@@ -40,7 +38,7 @@
4038
<dependency>
4139
<groupId>org.springframework.boot</groupId>
4240
<artifactId>spring-boot-starter-validation</artifactId>
43-
41+
<version>3.3.4</version>
4442
</dependency>
4543
<dependency>
4644
<groupId>org.slf4j</groupId>
@@ -53,12 +51,19 @@
5351
<version>5.11.1</version>
5452
<scope>test</scope>
5553
</dependency>
54+
5655
<dependency>
5756
<groupId>org.assertj</groupId>
5857
<artifactId>assertj-core</artifactId>
5958
<version>3.26.3</version>
6059
<scope>test</scope>
6160
</dependency>
61+
<dependency>
62+
<groupId>org.springframework.boot</groupId>
63+
<artifactId>spring-boot-test</artifactId>
64+
<version>3.3.3</version>
65+
<scope>test</scope>
66+
</dependency>
6267
</dependencies>
6368

6469
<build>
@@ -81,9 +86,8 @@
8186
<plugin>
8287
<groupId>org.springframework.boot</groupId>
8388
<artifactId>spring-boot-maven-plugin</artifactId>
84-
<version>3.3.1</version>
8589
</plugin>
8690
</plugins>
8791
</build>
8892

89-
</project>
93+
</project>

0 commit comments

Comments
 (0)