Skip to content

Commit adb8641

Browse files
am.klyuevArtDu
am.klyuev
authored and
ArtDu
committed
Fix dependencies
Closes #297
1 parent 2534eea commit adb8641

File tree

8 files changed

+52
-30
lines changed

8 files changed

+52
-30
lines changed

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,19 @@
22

33
## [Unreleased]
44

5+
## [0.9.2] - 2022-11-15
6+
57
- Adding default mapper for long arrays ([#290](https://github.com/tarantool/cartridge-java/pull/290))
8+
- Add dependency management ([#296](https://github.com/tarantool/cartridge-java/pull/296))
9+
- Bump testcontainers-java-tarantool to 0.5.3 ([#296](https://github.com/tarantool/cartridge-java/pull/296))
10+
- Bump slf4j-api to 2.0.3 ([#296](https://github.com/tarantool/cartridge-java/pull/296))
11+
- Bump jackson-databind to 2.14.0 ([#296](https://github.com/tarantool/cartridge-java/pull/296))
12+
- Bump jackson-annotations to 2.14.0 ([#296](https://github.com/tarantool/cartridge-java/pull/296))
13+
- Bump org.testcontainers:junit-jupiter to 1.17.4 ([#296](https://github.com/tarantool/cartridge-java/pull/296))
14+
- Add junit class ordering according the order before junit-jupiter 5.8.0 ([#296](https://github.com/tarantool/cartridge-java/pull/296))
15+
- Bump logback-classic to 1.3.4 ([#296](https://github.com/tarantool/cartridge-java/pull/296))
16+
- Remove org.junit.jupiter:junit-jupiter ([#296](https://github.com/tarantool/cartridge-java/pull/296))
17+
- Remove jmh-generator-annprocess ([#296](https://github.com/tarantool/cartridge-java/pull/296))
618

719
## [0.9.1] - 2022-10-13
820

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ library for starting it automatically in tests.
8181
<dependency>
8282
<groupId>io.tarantool</groupId>
8383
<artifactId>cartridge-driver</artifactId>
84-
<version>0.9.1</version>
84+
<version>0.9.2</version>
8585
</dependency>
8686
```
8787

‎pom.xml

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
</scm>
5454

5555
<properties>
56+
<jackson.version>2.14.0</jackson.version>
5657
<checkstyle.config>${project.basedir}/src/test/resources/io/tarantool/driver/checkstyle.xml</checkstyle.config>
5758
<checkstyle.suppressions>${project.basedir}/src/test/resources/io/tarantool/driver/suppressions.xml</checkstyle.suppressions>
5859
<logging.config>${project.basedir}/src/test/resources/logback-test.xml</logging.config>
@@ -192,6 +193,26 @@
192193
</plugins>
193194
</build>
194195

196+
<dependencyManagement>
197+
<dependencies>
198+
<dependency>
199+
<groupId>org.slf4j</groupId>
200+
<artifactId>slf4j-api</artifactId>
201+
<version>2.0.3</version>
202+
</dependency>
203+
<dependency>
204+
<groupId>com.fasterxml.jackson.core</groupId>
205+
<artifactId>jackson-databind</artifactId>
206+
<version>${jackson.version}</version>
207+
</dependency>
208+
<dependency>
209+
<groupId>com.fasterxml.jackson.core</groupId>
210+
<artifactId>jackson-annotations</artifactId>
211+
<version>${jackson.version}</version>
212+
</dependency>
213+
</dependencies>
214+
</dependencyManagement>
215+
195216
<dependencies>
196217
<dependency>
197218
<groupId>io.netty</groupId>
@@ -206,48 +227,34 @@
206227
<dependency>
207228
<groupId>org.slf4j</groupId>
208229
<artifactId>slf4j-api</artifactId>
209-
<version>1.7.30</version>
210230
</dependency>
211231
<dependency>
212232
<groupId>com.fasterxml.jackson.core</groupId>
213233
<artifactId>jackson-databind</artifactId>
214-
<version>2.14.0-rc1</version>
215234
</dependency>
216235
<!-- Test dependencies -->
217-
<dependency>
218-
<groupId>org.junit.jupiter</groupId>
219-
<artifactId>junit-jupiter</artifactId>
220-
<version>5.7.2</version>
221-
<scope>test</scope>
222-
</dependency>
223-
<dependency>
224-
<groupId>org.openjdk.jmh</groupId>
225-
<artifactId>jmh-core</artifactId>
226-
<version>1.35</version>
227-
<scope>test</scope>
228-
</dependency>
229-
<dependency>
230-
<groupId>org.openjdk.jmh</groupId>
231-
<artifactId>jmh-generator-annprocess</artifactId>
232-
<version>1.35</version>
233-
<scope>test</scope>
234-
</dependency>
235236
<dependency>
236237
<groupId>ch.qos.logback</groupId>
237238
<artifactId>logback-classic</artifactId>
238-
<version>1.2.3</version>
239+
<version>1.3.4</version>
239240
<scope>test</scope>
240241
</dependency>
241242
<dependency>
242243
<groupId>org.testcontainers</groupId>
243244
<artifactId>junit-jupiter</artifactId>
244-
<version>1.16.2</version>
245+
<version>1.17.4</version>
245246
<scope>test</scope>
246247
</dependency>
247248
<dependency>
248249
<groupId>io.tarantool</groupId>
249250
<artifactId>testcontainers-java-tarantool</artifactId>
250-
<version>0.5.0</version>
251+
<version>0.5.3</version>
252+
<scope>test</scope>
253+
</dependency>
254+
<dependency>
255+
<groupId>org.openjdk.jmh</groupId>
256+
<artifactId>jmh-core</artifactId>
257+
<version>1.35</version>
251258
<scope>test</scope>
252259
</dependency>
253260
</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("")));

‎src/test/resources/junit-platform.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
junit.jupiter.testclass.order.default = org.junit.jupiter.api.ClassOrderer$ClassName

0 commit comments

Comments
 (0)