diff --git a/CHANGELOG.md b/CHANGELOG.md index 40f974dd7..90bfc00d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,19 @@ ## [Unreleased] +## [0.9.2] - 2022-11-15 + - Adding default mapper for long arrays ([#290](https://github.com/tarantool/cartridge-java/pull/290)) +- Add dependency management ([#296](https://github.com/tarantool/cartridge-java/pull/296)) +- Bump testcontainers-java-tarantool to 0.5.3 ([#296](https://github.com/tarantool/cartridge-java/pull/296)) +- Bump slf4j-api to 2.0.3 ([#296](https://github.com/tarantool/cartridge-java/pull/296)) +- Bump jackson-databind to 2.14.0 ([#296](https://github.com/tarantool/cartridge-java/pull/296)) +- Bump jackson-annotations to 2.14.0 ([#296](https://github.com/tarantool/cartridge-java/pull/296)) +- Bump org.testcontainers:junit-jupiter to 1.17.4 ([#296](https://github.com/tarantool/cartridge-java/pull/296)) +- Add junit class ordering according the order before junit-jupiter 5.8.0 ([#296](https://github.com/tarantool/cartridge-java/pull/296)) +- Bump logback-classic to 1.3.4 ([#296](https://github.com/tarantool/cartridge-java/pull/296)) +- Remove org.junit.jupiter:junit-jupiter ([#296](https://github.com/tarantool/cartridge-java/pull/296)) +- Remove jmh-generator-annprocess ([#296](https://github.com/tarantool/cartridge-java/pull/296)) ## [0.9.1] - 2022-10-13 diff --git a/README.md b/README.md index 90602f7d6..d6e5165af 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ library for starting it automatically in tests. io.tarantool cartridge-driver - 0.9.1 + 0.9.2 ``` diff --git a/pom.xml b/pom.xml index 6d183b0b0..e14520b06 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,7 @@ + 2.14.0 ${project.basedir}/src/test/resources/io/tarantool/driver/checkstyle.xml ${project.basedir}/src/test/resources/io/tarantool/driver/suppressions.xml ${project.basedir}/src/test/resources/logback-test.xml @@ -192,6 +193,26 @@ + + + + org.slf4j + slf4j-api + 2.0.3 + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + io.netty @@ -206,48 +227,34 @@ org.slf4j slf4j-api - 1.7.30 com.fasterxml.jackson.core jackson-databind - 2.14.0-rc1 - - org.junit.jupiter - junit-jupiter - 5.7.2 - test - - - org.openjdk.jmh - jmh-core - 1.35 - test - - - org.openjdk.jmh - jmh-generator-annprocess - 1.35 - test - ch.qos.logback logback-classic - 1.2.3 + 1.3.4 test org.testcontainers junit-jupiter - 1.16.2 + 1.17.4 test io.tarantool testcontainers-java-tarantool - 0.5.0 + 0.5.3 + test + + + org.openjdk.jmh + jmh-core + 1.35 test diff --git a/src/test/java/io/tarantool/driver/TarantoolUtils.java b/src/test/java/io/tarantool/driver/TarantoolUtils.java index 8e24d579d..37634acd9 100644 --- a/src/test/java/io/tarantool/driver/TarantoolUtils.java +++ b/src/test/java/io/tarantool/driver/TarantoolUtils.java @@ -1,7 +1,7 @@ package io.tarantool.driver; import io.tarantool.driver.utils.Assert; -import org.testcontainers.shaded.org.apache.commons.lang.StringUtils; +import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; import java.util.Arrays; import java.util.Collections; diff --git a/src/test/java/io/tarantool/driver/integration/ConvertersWithClusterClientIT.java b/src/test/java/io/tarantool/driver/integration/ConvertersWithClusterClientIT.java index aeceb66e6..a79f43d2b 100644 --- a/src/test/java/io/tarantool/driver/integration/ConvertersWithClusterClientIT.java +++ b/src/test/java/io/tarantool/driver/integration/ConvertersWithClusterClientIT.java @@ -16,7 +16,7 @@ import org.junit.jupiter.api.condition.EnabledIf; import java.util.UUID; -import org.testcontainers.shaded.org.apache.commons.lang.ArrayUtils; +import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/src/test/java/io/tarantool/driver/integration/ConvertersWithProxyClientIT.java b/src/test/java/io/tarantool/driver/integration/ConvertersWithProxyClientIT.java index 348de77f0..34f7894a9 100644 --- a/src/test/java/io/tarantool/driver/integration/ConvertersWithProxyClientIT.java +++ b/src/test/java/io/tarantool/driver/integration/ConvertersWithProxyClientIT.java @@ -15,7 +15,7 @@ import java.util.UUID; import org.junit.jupiter.api.Disabled; -import org.testcontainers.shaded.org.apache.commons.lang.ArrayUtils; +import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/src/test/java/io/tarantool/driver/mappers/DefaultCharacterConverterTest.java b/src/test/java/io/tarantool/driver/mappers/DefaultCharacterConverterTest.java index a1c52bea1..e16e7d9cf 100644 --- a/src/test/java/io/tarantool/driver/mappers/DefaultCharacterConverterTest.java +++ b/src/test/java/io/tarantool/driver/mappers/DefaultCharacterConverterTest.java @@ -3,6 +3,8 @@ import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory; import io.tarantool.driver.api.tuple.TarantoolTupleFactory; import io.tarantool.driver.api.tuple.TarantoolTuple; +import io.tarantool.driver.mappers.converters.object.DefaultCharacterToStringValueConverter; +import io.tarantool.driver.mappers.converters.value.DefaultStringValueToCharacterConverter; import org.junit.jupiter.api.Test; import org.msgpack.value.StringValue; import org.msgpack.value.ValueFactory; @@ -15,21 +17,21 @@ class DefaultCharacterConverterTest { @Test void test_toValue_shouldReturnStringValue_s() { - DefaultCharacterConverter converter = new DefaultCharacterConverter(); + DefaultCharacterToStringValueConverter converter = new DefaultCharacterToStringValueConverter(); StringValue result = converter.toValue('s'); assertEquals(ValueFactory.newString("s"), result); } @Test void test_fromValue_shouldReturnCharacter_s() { - DefaultCharacterConverter converter = new DefaultCharacterConverter(); + DefaultStringValueToCharacterConverter converter = new DefaultStringValueToCharacterConverter(); Character result = converter.fromValue(ValueFactory.newString("s")); assertEquals('s', result); } @Test void test_canConvertValue_shouldReturnTrue_ifStringConsistsOfOneSymbol() { - DefaultCharacterConverter converter = new DefaultCharacterConverter(); + DefaultStringValueToCharacterConverter converter = new DefaultStringValueToCharacterConverter(); assertTrue(converter.canConvertValue(ValueFactory.newString("s"))); assertFalse(converter.canConvertValue(ValueFactory.newString("string"))); assertFalse(converter.canConvertValue(ValueFactory.newString(""))); diff --git a/src/test/resources/junit-platform.properties b/src/test/resources/junit-platform.properties new file mode 100644 index 000000000..8eb9e3d54 --- /dev/null +++ b/src/test/resources/junit-platform.properties @@ -0,0 +1 @@ +junit.jupiter.testclass.order.default = org.junit.jupiter.api.ClassOrderer$ClassName