Skip to content

Commit f32d985

Browse files
Alex-pvlAlex-pvl
authored
build: add bom module (#53)
* build: add bom module * build: edit poms
1 parent ce0dd30 commit f32d985

File tree

7 files changed

+289
-131
lines changed

7 files changed

+289
-131
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ workbench.xmi
2424
documentation/venv
2525
documentation/site
2626
documentation/target
27+
release.properties
28+
*.releaseBackup
29+
*.tag

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [Unreleased]
44

5+
### BOM Module
6+
7+
- Add `tarantool-java-sdk-bom` module providing centralized dependency management for all Tarantool Java SDK modules and their dependencies
8+
59
### Testcontainers
610

711
- Remove dependency on `testcontainers-java-tarantool` library

‎pom.xml‎

Lines changed: 8 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@
166166
<goals>deploy</goals>
167167
<indentSize>4</indentSize>
168168
<tagNameFormat>@{project.version}</tagNameFormat>
169+
<!-- install (not verify) needed so testcontainers-autogen is in local repo
170+
before testcontainers loads it as a jsonschema2pojo plugin dependency -->
171+
<preparationGoals>clean install</preparationGoals>
169172
</configuration>
170173
</plugin>
171174
<plugin>
@@ -286,115 +289,11 @@
286289
<dependencies>
287290
<dependency>
288291
<groupId>io.tarantool</groupId>
289-
<artifactId>tarantool-client</artifactId>
290-
<version>2.0.0-SNAPSHOT</version>
292+
<artifactId>tarantool-java-sdk-bom</artifactId>
293+
<version>${project.version}</version>
294+
<type>pom</type>
295+
<scope>import</scope>
291296
</dependency>
292-
<dependency>
293-
<groupId>io.tarantool</groupId>
294-
<artifactId>tarantool-core</artifactId>
295-
<version>2.0.0-SNAPSHOT</version>
296-
</dependency>
297-
<dependency>
298-
<groupId>io.tarantool</groupId>
299-
<artifactId>tarantool-pooling</artifactId>
300-
<version>2.0.0-SNAPSHOT</version>
301-
</dependency>
302-
<dependency>
303-
<groupId>io.tarantool</groupId>
304-
<artifactId>tarantool-jackson-mapping</artifactId>
305-
<version>2.0.0-SNAPSHOT</version>
306-
</dependency>
307-
<dependency>
308-
<groupId>io.tarantool</groupId>
309-
<artifactId>tarantool-schema</artifactId>
310-
<version>2.0.0-SNAPSHOT</version>
311-
</dependency>
312-
<dependency>
313-
<groupId>io.tarantool</groupId>
314-
<artifactId>tarantool-balancer</artifactId>
315-
<version>2.0.0-SNAPSHOT</version>
316-
</dependency>
317-
<dependency>
318-
<groupId>io.tarantool</groupId>
319-
<artifactId>tarantool-spring-data</artifactId>
320-
<version>2.0.0-SNAPSHOT</version>
321-
</dependency>
322-
<dependency>
323-
<groupId>io.tarantool</groupId>
324-
<artifactId>tarantool-spring-data-core</artifactId>
325-
<version>2.0.0-SNAPSHOT</version>
326-
</dependency>
327-
<dependency>
328-
<groupId>io.tarantool</groupId>
329-
<artifactId>testcontainers</artifactId>
330-
<version>2.0.0-SNAPSHOT</version>
331-
<scope>test</scope>
332-
</dependency>
333-
<dependency>
334-
<groupId>org.msgpack</groupId>
335-
<artifactId>jackson-dataformat-msgpack</artifactId>
336-
<version>${msgpack.version}</version>
337-
</dependency>
338-
<dependency>
339-
<groupId>org.msgpack</groupId>
340-
<artifactId>msgpack-core</artifactId>
341-
<version>${msgpack.version}</version>
342-
</dependency>
343-
<dependency>
344-
<groupId>com.fasterxml.jackson.core</groupId>
345-
<artifactId>jackson-databind</artifactId>
346-
<version>${jackson.version}</version>
347-
</dependency>
348-
<dependency>
349-
<groupId>com.fasterxml.jackson.core</groupId>
350-
<artifactId>jackson-annotations</artifactId>
351-
<version>${jackson.version}</version>
352-
</dependency>
353-
<dependency>
354-
<groupId>org.slf4j</groupId>
355-
<artifactId>slf4j-api</artifactId>
356-
<version>${slf4j.api.version}</version>
357-
</dependency>
358-
359-
<!-- Test dependencies -->
360-
<dependency>
361-
<groupId>ch.qos.logback</groupId>
362-
<artifactId>logback-classic</artifactId>
363-
<!-- 1.4.x only for jdk > 11 -->
364-
<version>1.3.16</version> <!-- 1.4.x only for jdk > 11 -->
365-
<!-- 1.4.x only for jdk > 11 -->
366-
<scope>test</scope>
367-
</dependency>
368-
<dependency>
369-
<groupId>org.junit.jupiter</groupId>
370-
<artifactId>junit-jupiter</artifactId>
371-
<version>5.13.4</version>
372-
<scope>test</scope>
373-
</dependency>
374-
<dependency>
375-
<groupId>org.testcontainers</groupId>
376-
<artifactId>testcontainers-junit-jupiter</artifactId>
377-
<version>${testcontainers.version}</version>
378-
<scope>test</scope>
379-
</dependency>
380-
<dependency>
381-
<groupId>org.apache.commons</groupId>
382-
<artifactId>commons-lang3</artifactId>
383-
<version>3.18.0</version>
384-
</dependency>
385-
<dependency>
386-
<groupId>org.projectlombok</groupId>
387-
<artifactId>lombok</artifactId>
388-
<version>1.18.38</version>
389-
<scope>test</scope>
390-
</dependency>
391-
<dependency>
392-
<groupId>com.google.guava</groupId>
393-
<artifactId>guava</artifactId>
394-
<version>33.4.8-jre</version>
395-
<scope>test</scope>
396-
</dependency>
397-
<!-- End of test dependencies -->
398297
</dependencies>
399298
</dependencyManagement>
400299

@@ -634,5 +533,6 @@
634533
<module>jacoco-coverage-aggregate-report</module>
635534
<module>testcontainers-autogen</module>
636535
<module>documentation</module>
536+
<module>tarantool-java-sdk-bom</module>
637537
</modules>
638538
</project>

‎tarantool-core/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
<properties>
1010
<license.header.file>${project.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
11-
<micrometer.version>1.14.12</micrometer.version>
1211
</properties>
1312

1413
<parent>
@@ -25,22 +24,18 @@
2524
<dependency>
2625
<groupId>io.netty</groupId>
2726
<artifactId>netty-transport</artifactId>
28-
<version>${netty.version}</version>
2927
</dependency>
3028
<dependency>
3129
<groupId>io.netty</groupId>
3230
<artifactId>netty-handler</artifactId>
33-
<version>${netty.version}</version>
3431
</dependency>
3532
<dependency>
3633
<groupId>io.netty</groupId>
3734
<artifactId>netty-codec</artifactId>
38-
<version>${netty.version}</version>
3935
</dependency>
4036
<dependency>
4137
<groupId>io.netty</groupId>
4238
<artifactId>netty-codec-http</artifactId>
43-
<version>${netty.version}</version>
4439
</dependency>
4540
<dependency>
4641
<groupId>org.msgpack</groupId>
@@ -49,12 +44,10 @@
4944
<dependency>
5045
<groupId>io.micrometer</groupId>
5146
<artifactId>micrometer-core</artifactId>
52-
<version>${micrometer.version}</version>
5347
</dependency>
5448
<dependency>
5549
<groupId>io.micrometer</groupId>
5650
<artifactId>micrometer-registry-jmx</artifactId>
57-
<version>${micrometer.version}</version>
5851
</dependency>
5952
<dependency>
6053
<groupId>org.slf4j</groupId>

0 commit comments

Comments
 (0)