Skip to content

Commit 3aad183

Browse files
am.klyuevArtDu
authored andcommitted
Fix dependency conflicts
Closes #60 Closes #58
1 parent 88e217c commit 3aad183

File tree

2 files changed

+30
-3
lines changed

2 files changed

+30
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## [0.5.2] - 2022-10-28
4+
- Add dependency management
5+
36
## [0.5.1] - 2022-10-28
47
- Bump cartridge-java to 0.9.1
58
- Bump testcontainers to 1.17.4

pom.xml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,39 @@
4848
<properties>
4949
<driver.version>0.9.1</driver.version>
5050
<testcontainers.version>1.17.4</testcontainers.version>
51-
<snakeyaml.version>1.26</snakeyaml.version>
51+
<snakeyaml.version>1.33</snakeyaml.version>
5252
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5353
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5454
<logging.config>${project.basedir}/src/test/resources/logback-test.xml</logging.config>
5555
<logging.logLevel>debug</logging.logLevel>
5656
</properties>
5757

58+
<dependencyManagement>
59+
<dependencies>
60+
<dependency>
61+
<groupId>com.fasterxml.jackson.core</groupId>
62+
<artifactId>jackson-annotations</artifactId>
63+
<version>2.14.0</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.slf4j</groupId>
67+
<artifactId>slf4j-api</artifactId>
68+
<version>2.0.0</version>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.junit.jupiter</groupId>
72+
<artifactId>junit-jupiter</artifactId>
73+
<version>5.9.0</version>
74+
<scope>test</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.yaml</groupId>
78+
<artifactId>snakeyaml</artifactId>
79+
<version>${snakeyaml.version}</version>
80+
</dependency>
81+
</dependencies>
82+
</dependencyManagement>
83+
5884
<dependencies>
5985
<dependency>
6086
<groupId>org.testcontainers</groupId>
@@ -69,14 +95,12 @@
6995
<dependency>
7096
<groupId>org.yaml</groupId>
7197
<artifactId>snakeyaml</artifactId>
72-
<version>${snakeyaml.version}</version>
7398
</dependency>
7499

75100
<!-- Test dependencies -->
76101
<dependency>
77102
<groupId>org.junit.jupiter</groupId>
78103
<artifactId>junit-jupiter</artifactId>
79-
<version>5.7.0</version>
80104
<scope>test</scope>
81105
</dependency>
82106
<dependency>

0 commit comments

Comments
 (0)