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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ workbench.xmi
documentation/venv
documentation/site
documentation/target
release.properties
*.releaseBackup
*.tag
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### BOM Module

- Add `tarantool-java-sdk-bom` module providing centralized dependency management for all Tarantool Java SDK modules and their dependencies

### Testcontainers

- Remove dependency on `testcontainers-java-tarantool` library
Expand Down
116 changes: 8 additions & 108 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@
<goals>deploy</goals>
<indentSize>4</indentSize>
<tagNameFormat>@{project.version}</tagNameFormat>
<!-- install (not verify) needed so testcontainers-autogen is in local repo
before testcontainers loads it as a jsonschema2pojo plugin dependency -->
<preparationGoals>clean install</preparationGoals>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -286,115 +289,11 @@
<dependencies>
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>tarantool-client</artifactId>
<version>2.0.0-SNAPSHOT</version>
<artifactId>tarantool-java-sdk-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>tarantool-core</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>tarantool-pooling</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>tarantool-jackson-mapping</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>tarantool-schema</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>tarantool-balancer</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>tarantool-spring-data</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>tarantool-spring-data-core</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>testcontainers</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.msgpack</groupId>
<artifactId>jackson-dataformat-msgpack</artifactId>
<version>${msgpack.version}</version>
</dependency>
<dependency>
<groupId>org.msgpack</groupId>
<artifactId>msgpack-core</artifactId>
<version>${msgpack.version}</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>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.api.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<!-- 1.4.x only for jdk > 11 -->
<version>1.3.16</version> <!-- 1.4.x only for jdk > 11 -->
<!-- 1.4.x only for jdk > 11 -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.13.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-junit-jupiter</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.18.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.38</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.4.8-jre</version>
<scope>test</scope>
</dependency>
<!-- End of test dependencies -->
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -634,5 +533,6 @@
<module>jacoco-coverage-aggregate-report</module>
<module>testcontainers-autogen</module>
<module>documentation</module>
<module>tarantool-java-sdk-bom</module>
</modules>
</project>
7 changes: 0 additions & 7 deletions tarantool-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

<properties>
<license.header.file>${project.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
<micrometer.version>1.14.12</micrometer.version>
</properties>

<parent>
Expand All @@ -25,22 +24,18 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>org.msgpack</groupId>
Expand All @@ -49,12 +44,10 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>${micrometer.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-jmx</artifactId>
<version>${micrometer.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
Loading