Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,40 @@
- Document supported Java types for Tarantool data mapping in `tuple_pojo_mapping` docs (RU/EN), including Tarantool extension types (`decimal`, `uuid`, `datetime`, `interval`, `tuple`) and related mapping notes.
- Document Jackson MsgPack deserialization: integers, `bin`/`str` vs `byte[]`/`String`, floating-point vs `decimal`; reference `jackson-dataformat-msgpack` for defaults and type coercion.

### Dependencies
- Updated dependencies:

Compile:
* Bump jackson version from 2.18.4 to 2.21.2
* Bump msgpack version from 0.9.10 to 0.9.11
* Bump netty version from 4.2.7.Final to 4.2.12.Final
* Bump httpclient5 version from 5.5 to 5.5.2
* Bump httpcore5 version from 5.3.4 to 5.3.6
* Bump spring-boot version from 3.5.8 to 3.5.10 in tarantool-spring-data-35
* Pin spring-data-keyvalue version to 3.5.10 for tarantool-spring-data-35 and 4.0.4 for tarantool-spring-data-40

Tests:
* Bump testcontainers version from 2.0.1 to 2.0.4
* Bump junit-jupiter version from 5.13.4 to 5.14.3
* Bump logback version from 1.5.21 to 1.5.32 in spring-data module
* Bump grpc version from 1.76.0 to 1.77.0
* Bump protobuf version from 3.25.8 to 3.25.9
* Bump commons-io version from 2.20.0 to 2.21.0
* Bump commons-codec version from 1.19.0 to 1.21.0
* Bump opentelemetry version from 1.48.0 to 1.61.0

Maven:
* Bump maven-enforcer-plugin from 3.6.1 to 3.6.2
* Bump maven-release-plugin from 3.1.1 to 3.3.1
* Bump maven-compiler-plugin from 3.14.0 to 3.15.0
* Bump maven-surefire-plugin from 3.5.4 to 3.5.5
* Bump maven-pmd-plugin from 3.27.0 to 3.28.0
* Bump spotbugs-maven-plugin from 4.9.8.1 to 4.9.8.3
* Bump maven-resources-plugin from 3.3.1 to 3.5.0
* Bump jacoco-maven-plugin from 0.8.13 to 0.8.14
* Bump maven-antrun-plugin from 3.1.0 to 3.2.0
* Bump central-publishing-maven-plugin from 0.9.0 to 0.10.0

## [1.6.0] - 2026-04-01

### BOM Module
Expand Down
2 changes: 1 addition & 1 deletion documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<properties>
<cartridge-java.version>0.13.0</cartridge-java.version>
<junit.version>5.14.0</junit.version>
<junit.version>5.14.3</junit.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<license.header.file>${project.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
Expand Down
39 changes: 21 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,25 @@
</scm>

<properties>
<jackson.version>2.18.4</jackson.version>
<msgpack.version>0.9.10</msgpack.version>
<jackson.version>2.21.2</jackson.version>
<msgpack.version>0.9.11</msgpack.version>
<javadoc.plugin.version>3.12.0</javadoc.plugin.version>
<logging.config>${project.basedir}/src/test/resources/logback-test.xml</logging.config>
<logging.logLevel>debug</logging.logLevel>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<netty.version>4.2.7.Final</netty.version>
<netty.version>4.2.12.Final</netty.version>
<slf4j.api.version>2.0.17</slf4j.api.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<testcontainers.version>2.0.1</testcontainers.version>
<testcontainers.version>2.0.4</testcontainers.version>
<grpc.version>1.77.0</grpc.version>
<protobuf.version>3.25.9</protobuf.version>
<jetcd.version>0.8.6</jetcd.version>
<!--suppress UnresolvedMavenProperty -->
<shared.dir>${project.parent.basedir}/tarantool-shared-resources/</shared.dir>
<license.header.file>${project.basedir}/LICENSE_HEADER.txt</license.header.file>
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.5.5</maven-surefire-plugin.version>
<jsonschema2pojo.version>1.2.2</jsonschema2pojo.version>
</properties>

Expand Down Expand Up @@ -128,7 +131,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.6.1</version>
<version>3.6.2</version>
<executions>
<execution>
<id>enforce-versions</id>
Expand Down Expand Up @@ -159,7 +162,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.1.1</version>
<version>3.3.1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<releaseProfiles>release</releaseProfiles>
Expand All @@ -179,7 +182,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
<configuration>
<fork>true</fork>
<debug>true</debug>
Expand All @@ -206,24 +209,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.27.0</version>
<version>3.28.0</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.9.8.1</version>
<version>4.9.8.3</version>
<dependencies>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
<version>4.9.8.1</version>
<version>4.9.8.3</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>
<executions>
<execution>
<id>copy-test-resources</id>
Expand Down Expand Up @@ -260,7 +263,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.13</version>
<version>0.8.14</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -302,7 +305,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.21.2</version>
<version>3.28.0</version>
</plugin>
</plugins>
</reporting>
Expand Down Expand Up @@ -338,7 +341,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>process-test-classes</id>
Expand Down Expand Up @@ -375,7 +378,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>process-test-classes</id>
Expand Down Expand Up @@ -409,7 +412,7 @@
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central-portal-snapshots</publishingServerId>
Expand All @@ -427,7 +430,7 @@
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
Expand Down
1 change: 0 additions & 1 deletion tarantool-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.20.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonTokenId;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.deser.std.UntypedObjectDeserializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
import org.msgpack.jackson.dataformat.MessagePackExtensionType;
Expand Down Expand Up @@ -41,7 +42,7 @@ public static class ObjectDeserializer extends UntypedObjectDeserializer {
private final HashMap<Byte, TarantoolDeserializer<?>> deserializers = new HashMap<>();

public ObjectDeserializer() {
super(null, null);
super(null, (JavaType) null);
deserializers.put(
IPROTO_EXT_DECIMAL, new DecimalExtensionModule.BigDecimalDeserializer(BigDecimal.class));
deserializers.put(IPROTO_EXT_UUID, new UUIDExtensionModule.UUIDDeserializer(UUID.class));
Expand Down
36 changes: 18 additions & 18 deletions tarantool-java-sdk-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@
<version>2.0.0-SNAPSHOT</version>

<properties>
<jackson.version>2.18.4</jackson.version>
<msgpack.version>0.9.10</msgpack.version>
<netty.version>4.2.7.Final</netty.version>
<jackson.version>2.21.2</jackson.version>
<msgpack.version>0.9.11</msgpack.version>
<netty.version>4.2.12.Final</netty.version>
<slf4j.api.version>2.0.17</slf4j.api.version>
<testcontainers.version>2.0.1</testcontainers.version>
<testcontainers.version>2.0.4</testcontainers.version>
<logback.version>1.3.16</logback.version>
<junit-jupiter.version>5.13.4</junit-jupiter.version>
<commons-lang3.version>3.18.0</commons-lang3.version>
<lombok.version>1.18.38</lombok.version>
<guava.version>33.4.8-jre</guava.version>
<micrometer.version>1.14.12</micrometer.version>
<httpclient5.version>5.5</httpclient5.version>
<httpcore5.version>5.3.4</httpcore5.version>
<junit-jupiter.version>5.14.3</junit-jupiter.version>
<commons-lang3.version>3.19.0</commons-lang3.version>
<lombok.version>1.18.44</lombok.version>
<guava.version>33.5.0-jre</guava.version>
<micrometer.version>1.16.4</micrometer.version>
<httpclient5.version>5.5.2</httpclient5.version>
<httpcore5.version>5.3.6</httpcore5.version>
<jetcd.version>0.8.6</jetcd.version>
<grpc.version>1.76.0</grpc.version>
<protobuf.version>3.25.8</protobuf.version>
<grpc.version>1.77.0</grpc.version>
<protobuf.version>3.25.9</protobuf.version>
<commons-compress.version>1.28.0</commons-compress.version>
<commons-codec.version>1.19.0</commons-codec.version>
<commons-io.version>2.20.0</commons-io.version>
<commons-codec.version>1.21.0</commons-codec.version>
<commons-io.version>2.21.0</commons-io.version>
<instancio.version>5.5.1</instancio.version>
<jsonschema2pojo.version>1.2.2</jsonschema2pojo.version>
<opentelemetry.version>1.48.0</opentelemetry.version>
<opentelemetry.version>1.61.0</opentelemetry.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -345,7 +345,7 @@
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central-portal-snapshots</publishingServerId>
Expand All @@ -363,7 +363,7 @@
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
Expand Down
4 changes: 2 additions & 2 deletions tarantool-spring-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<properties>
<!--require Java 8+-->
<slf4j.version>2.0.17</slf4j.version>
<logback.version>1.5.21</logback.version>
<junit.version>5.13.3</junit.version>
<logback.version>1.5.32</logback.version>
<junit.version>5.14.3</junit.version>
<!--set minimum version for parent property value-->
<spring.boot.version>2.7.18</spring.boot.version>
<license.header.file>${project.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
Expand Down
2 changes: 1 addition & 1 deletion tarantool-spring-data/tarantool-spring-data-35/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<spring.boot.version>3.5.8</spring.boot.version>
<spring.boot.version>3.5.10</spring.boot.version>
<shared.dir>${project.parent.parent.basedir}/tarantool-shared-resources/</shared.dir>
<license.header.file>${project.parent.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
</properties>
Expand Down
7 changes: 0 additions & 7 deletions testcontainers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
<properties>
<license.header.file>${project.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
<maven.compiler.release>17</maven.compiler.release>
<jetcd.version>0.8.6</jetcd.version>
<httpclient5.version>5.5</httpclient5.version>
<instancio.version>5.5.1</instancio.version>
<grpc.version>1.76.0</grpc.version>
<protobuf.version>3.25.8</protobuf.version>
<protobuf-plugin.version>0.6.1</protobuf-plugin.version>
</properties>

Expand Down Expand Up @@ -71,7 +66,6 @@
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>${httpclient5.version}</version>
</dependency>

<!-- Test -->
Expand All @@ -95,7 +89,6 @@
<dependency>
<groupId>org.instancio</groupId>
<artifactId>instancio-core</artifactId>
<version>${instancio.version}</version>
<scope>test</scope>
</dependency>

Expand Down