Skip to content

Fix debendency conflicts #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtDu merged 1 commit into from
Nov 15, 2022
Merged

Fix debendency conflicts #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ library for starting it automatically in tests.
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>cartridge-driver</artifactId>
<version>0.9.1</version>
<version>0.9.2</version>
</dependency>
```

Expand Down
53 changes: 30 additions & 23 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
</scm>

<properties>
<jackson.version>2.14.0</jackson.version>
<checkstyle.config>${project.basedir}/src/test/resources/io/tarantool/driver/checkstyle.xml</checkstyle.config>
<checkstyle.suppressions>${project.basedir}/src/test/resources/io/tarantool/driver/suppressions.xml</checkstyle.suppressions>
<logging.config>${project.basedir}/src/test/resources/logback-test.xml</logging.config>
Expand Down Expand Up @@ -192,6 +193,26 @@
</plugins>
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.netty</groupId>
Expand All @@ -206,48 +227,34 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.0-rc1</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.7.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>1.35</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>1.35</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.3.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>1.16.2</version>
<version>1.17.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>testcontainers-java-tarantool</artifactId>
<version>0.5.0</version>
<version>0.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>1.35</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/tarantool/driver/TarantoolUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/tarantool/driver/integration/ConvertersWithClusterClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/tarantool/driver/integration/ConvertersWithProxyClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 5 additions & 3 deletions src/test/java/io/tarantool/driver/mappers/DefaultCharacterConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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("")));
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/junit-platform.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
junit.jupiter.testclass.order.default = org.junit.jupiter.api.ClassOrderer$ClassName