Skip to content

Commit 1cf6dbb

Browse files
author
am.klyuev
committed
Fix dependency conflicts
1 parent 26d2d8a commit 1cf6dbb

File tree

6 files changed

+49
-14
lines changed

6 files changed

+49
-14
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
## [Unreleased]
44

55
- Adding default mapper for long arrays ([#290](https://github.com/tarantool/cartridge-java/pull/290))
6+
- Add dependency management ([#296](https://github.com/tarantool/cartridge-java/pull/296))
7+
- Bump testcontainers-java-tarantool to 0.5.2 ([#296](https://github.com/tarantool/cartridge-java/pull/296))
68

79
## [0.9.1] - 2022-10-13
810

pom.xml

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,47 @@
192192
</plugins>
193193
</build>
194194

195+
<dependencyManagement>
196+
<dependencies>
197+
<dependency>
198+
<groupId>org.slf4j</groupId>
199+
<artifactId>slf4j-api</artifactId>
200+
<version>2.0.0</version>
201+
</dependency>
202+
<dependency>
203+
<groupId>io.netty</groupId>
204+
<artifactId>netty-all</artifactId>
205+
<version>4.1.78.Final</version>
206+
</dependency>
207+
<dependency>
208+
<groupId>org.junit.jupiter</groupId>
209+
<artifactId>junit-jupiter</artifactId>
210+
<version>5.9.0</version>
211+
<scope>test</scope>
212+
</dependency>
213+
<dependency>
214+
<groupId>com.fasterxml.jackson.core</groupId>
215+
<artifactId>jackson-databind</artifactId>
216+
<version>2.14.0</version>
217+
</dependency>
218+
<dependency>
219+
<groupId>com.fasterxml.jackson.core</groupId>
220+
<artifactId>jackson-annotations</artifactId>
221+
<version>2.14.0</version>
222+
</dependency>
223+
<dependency>
224+
<groupId>org.testcontainers</groupId>
225+
<artifactId>junit-jupiter</artifactId>
226+
<version>1.17.4</version>
227+
<scope>test</scope>
228+
</dependency>
229+
</dependencies>
230+
</dependencyManagement>
231+
195232
<dependencies>
196233
<dependency>
197234
<groupId>io.netty</groupId>
198235
<artifactId>netty-all</artifactId>
199-
<version>4.1.78.Final</version>
200236
</dependency>
201237
<dependency>
202238
<groupId>org.msgpack</groupId>
@@ -206,18 +242,15 @@
206242
<dependency>
207243
<groupId>org.slf4j</groupId>
208244
<artifactId>slf4j-api</artifactId>
209-
<version>1.7.30</version>
210245
</dependency>
211246
<dependency>
212247
<groupId>com.fasterxml.jackson.core</groupId>
213248
<artifactId>jackson-databind</artifactId>
214-
<version>2.14.0-rc1</version>
215249
</dependency>
216250
<!-- Test dependencies -->
217251
<dependency>
218252
<groupId>org.junit.jupiter</groupId>
219253
<artifactId>junit-jupiter</artifactId>
220-
<version>5.7.2</version>
221254
<scope>test</scope>
222255
</dependency>
223256
<dependency>
@@ -235,19 +268,17 @@
235268
<dependency>
236269
<groupId>ch.qos.logback</groupId>
237270
<artifactId>logback-classic</artifactId>
238-
<version>1.2.3</version>
239-
<scope>test</scope>
271+
<version>1.2.11</version>
240272
</dependency>
241273
<dependency>
242274
<groupId>org.testcontainers</groupId>
243275
<artifactId>junit-jupiter</artifactId>
244-
<version>1.16.2</version>
245276
<scope>test</scope>
246277
</dependency>
247278
<dependency>
248279
<groupId>io.tarantool</groupId>
249280
<artifactId>testcontainers-java-tarantool</artifactId>
250-
<version>0.5.0</version>
281+
<version>0.5.2</version>
251282
<scope>test</scope>
252283
</dependency>
253284
</dependencies>

src/test/java/io/tarantool/driver/TarantoolUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.tarantool.driver;
22

33
import io.tarantool.driver.utils.Assert;
4-
import org.testcontainers.shaded.org.apache.commons.lang.StringUtils;
4+
import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
55

66
import java.util.Arrays;
77
import java.util.Collections;

src/test/java/io/tarantool/driver/integration/ConvertersWithClusterClientIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.junit.jupiter.api.condition.EnabledIf;
1717

1818
import java.util.UUID;
19-
import org.testcontainers.shaded.org.apache.commons.lang.ArrayUtils;
19+
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
2020

2121
import java.nio.charset.StandardCharsets;
2222
import java.util.Arrays;

src/test/java/io/tarantool/driver/integration/ConvertersWithProxyClientIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import java.util.UUID;
1717
import org.junit.jupiter.api.Disabled;
18-
import org.testcontainers.shaded.org.apache.commons.lang.ArrayUtils;
18+
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
1919

2020
import java.nio.charset.StandardCharsets;
2121
import java.util.Arrays;

src/test/java/io/tarantool/driver/mappers/DefaultCharacterConverterTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory;
44
import io.tarantool.driver.api.tuple.TarantoolTupleFactory;
55
import io.tarantool.driver.api.tuple.TarantoolTuple;
6+
import io.tarantool.driver.mappers.converters.object.DefaultCharacterToStringValueConverter;
7+
import io.tarantool.driver.mappers.converters.value.DefaultStringValueToCharacterConverter;
68
import org.junit.jupiter.api.Test;
79
import org.msgpack.value.StringValue;
810
import org.msgpack.value.ValueFactory;
@@ -15,21 +17,21 @@ class DefaultCharacterConverterTest {
1517

1618
@Test
1719
void test_toValue_shouldReturnStringValue_s() {
18-
DefaultCharacterConverter converter = new DefaultCharacterConverter();
20+
DefaultCharacterToStringValueConverter converter = new DefaultCharacterToStringValueConverter();
1921
StringValue result = converter.toValue('s');
2022
assertEquals(ValueFactory.newString("s"), result);
2123
}
2224

2325
@Test
2426
void test_fromValue_shouldReturnCharacter_s() {
25-
DefaultCharacterConverter converter = new DefaultCharacterConverter();
27+
DefaultStringValueToCharacterConverter converter = new DefaultStringValueToCharacterConverter();
2628
Character result = converter.fromValue(ValueFactory.newString("s"));
2729
assertEquals('s', result);
2830
}
2931

3032
@Test
3133
void test_canConvertValue_shouldReturnTrue_ifStringConsistsOfOneSymbol() {
32-
DefaultCharacterConverter converter = new DefaultCharacterConverter();
34+
DefaultStringValueToCharacterConverter converter = new DefaultStringValueToCharacterConverter();
3335
assertTrue(converter.canConvertValue(ValueFactory.newString("s")));
3436
assertFalse(converter.canConvertValue(ValueFactory.newString("string")));
3537
assertFalse(converter.canConvertValue(ValueFactory.newString("")));

0 commit comments

Comments
 (0)