Skip to content

Commit 91a2b6d

Browse files
Alex-pvlAlex-pvl
committed
build: edit poms
1 parent e8ccb96 commit 91a2b6d

File tree

6 files changed

+152
-51
lines changed

6 files changed

+152
-51
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

‎pom.xml‎

Lines changed: 3 additions & 0 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>

‎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>

‎tarantool-java-sdk-bom/pom.xml‎

Lines changed: 125 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<version>2.0.0-SNAPSHOT</version>
1313

1414
<properties>
15-
<tarantool-java-sdk.version>2.0.0-SNAPSHOT</tarantool-java-sdk.version>
1615
<jackson.version>2.18.4</jackson.version>
1716
<msgpack.version>0.9.10</msgpack.version>
1817
<netty.version>4.2.7.Final</netty.version>
@@ -23,59 +22,107 @@
2322
<commons-lang3.version>3.18.0</commons-lang3.version>
2423
<lombok.version>1.18.38</lombok.version>
2524
<guava.version>33.4.8-jre</guava.version>
25+
<micrometer.version>1.14.12</micrometer.version>
26+
<httpclient5.version>5.5</httpclient5.version>
27+
<httpcore5.version>5.3.4</httpcore5.version>
28+
<jetcd.version>0.8.6</jetcd.version>
29+
<grpc.version>1.76.0</grpc.version>
30+
<protobuf.version>3.25.8</protobuf.version>
31+
<commons-compress.version>1.28.0</commons-compress.version>
32+
<commons-codec.version>1.19.0</commons-codec.version>
33+
<commons-io.version>2.20.0</commons-io.version>
34+
<instancio.version>5.5.1</instancio.version>
35+
<jsonschema2pojo.version>1.2.2</jsonschema2pojo.version>
2636
</properties>
2737

2838
<dependencyManagement>
2939
<dependencies>
40+
<!-- BOM imports — pin versions for entire artifact families to prevent transitive conflicts -->
41+
<dependency>
42+
<groupId>io.netty</groupId>
43+
<artifactId>netty-bom</artifactId>
44+
<version>${netty.version}</version>
45+
<type>pom</type>
46+
<scope>import</scope>
47+
</dependency>
48+
<dependency>
49+
<groupId>com.fasterxml.jackson</groupId>
50+
<artifactId>jackson-bom</artifactId>
51+
<version>${jackson.version}</version>
52+
<type>pom</type>
53+
<scope>import</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>io.micrometer</groupId>
57+
<artifactId>micrometer-bom</artifactId>
58+
<version>${micrometer.version}</version>
59+
<type>pom</type>
60+
<scope>import</scope>
61+
</dependency>
62+
<dependency>
63+
<groupId>org.testcontainers</groupId>
64+
<artifactId>testcontainers-bom</artifactId>
65+
<version>${testcontainers.version}</version>
66+
<type>pom</type>
67+
<scope>import</scope>
68+
</dependency>
69+
<dependency>
70+
<groupId>io.grpc</groupId>
71+
<artifactId>grpc-bom</artifactId>
72+
<version>${grpc.version}</version>
73+
<type>pom</type>
74+
<scope>import</scope>
75+
</dependency>
76+
3077
<!-- Tarantool Java SDK modules -->
3178
<dependency>
3279
<groupId>io.tarantool</groupId>
3380
<artifactId>tarantool-client</artifactId>
34-
<version>${tarantool-java-sdk.version}</version>
81+
<version>${project.version}</version>
3582
</dependency>
3683
<dependency>
3784
<groupId>io.tarantool</groupId>
3885
<artifactId>tarantool-core</artifactId>
39-
<version>${tarantool-java-sdk.version}</version>
86+
<version>${project.version}</version>
4087
</dependency>
4188
<dependency>
4289
<groupId>io.tarantool</groupId>
4390
<artifactId>tarantool-pooling</artifactId>
44-
<version>${tarantool-java-sdk.version}</version>
91+
<version>${project.version}</version>
4592
</dependency>
4693
<dependency>
4794
<groupId>io.tarantool</groupId>
4895
<artifactId>tarantool-jackson-mapping</artifactId>
49-
<version>${tarantool-java-sdk.version}</version>
96+
<version>${project.version}</version>
5097
</dependency>
5198
<dependency>
5299
<groupId>io.tarantool</groupId>
53100
<artifactId>tarantool-schema</artifactId>
54-
<version>${tarantool-java-sdk.version}</version>
101+
<version>${project.version}</version>
55102
</dependency>
56103
<dependency>
57104
<groupId>io.tarantool</groupId>
58105
<artifactId>tarantool-balancer</artifactId>
59-
<version>${tarantool-java-sdk.version}</version>
106+
<version>${project.version}</version>
60107
</dependency>
61108
<dependency>
62109
<groupId>io.tarantool</groupId>
63110
<artifactId>tarantool-spring-data</artifactId>
64-
<version>${tarantool-java-sdk.version}</version>
111+
<version>${project.version}</version>
65112
</dependency>
66113
<dependency>
67114
<groupId>io.tarantool</groupId>
68115
<artifactId>tarantool-spring-data-core</artifactId>
69-
<version>${tarantool-java-sdk.version}</version>
116+
<version>${project.version}</version>
70117
</dependency>
71118
<dependency>
72119
<groupId>io.tarantool</groupId>
73120
<artifactId>testcontainers</artifactId>
74-
<version>${tarantool-java-sdk.version}</version>
121+
<version>${project.version}</version>
75122
<scope>test</scope>
76123
</dependency>
77124

78-
<!-- Third-party runtime -->
125+
<!-- Third-party runtime (not covered by the BOMs above) -->
79126
<dependency>
80127
<groupId>org.msgpack</groupId>
81128
<artifactId>jackson-dataformat-msgpack</artifactId>
@@ -86,16 +133,6 @@
86133
<artifactId>msgpack-core</artifactId>
87134
<version>${msgpack.version}</version>
88135
</dependency>
89-
<dependency>
90-
<groupId>com.fasterxml.jackson.core</groupId>
91-
<artifactId>jackson-databind</artifactId>
92-
<version>${jackson.version}</version>
93-
</dependency>
94-
<dependency>
95-
<groupId>com.fasterxml.jackson.core</groupId>
96-
<artifactId>jackson-annotations</artifactId>
97-
<version>${jackson.version}</version>
98-
</dependency>
99136
<dependency>
100137
<groupId>org.slf4j</groupId>
101138
<artifactId>slf4j-api</artifactId>
@@ -107,6 +144,66 @@
107144
<version>${commons-lang3.version}</version>
108145
</dependency>
109146

147+
<!-- HTTP client -->
148+
<dependency>
149+
<groupId>org.apache.httpcomponents.client5</groupId>
150+
<artifactId>httpclient5</artifactId>
151+
<version>${httpclient5.version}</version>
152+
</dependency>
153+
<dependency>
154+
<groupId>org.apache.httpcomponents.core5</groupId>
155+
<artifactId>httpcore5</artifactId>
156+
<version>${httpcore5.version}</version>
157+
</dependency>
158+
<dependency>
159+
<groupId>org.apache.httpcomponents.core5</groupId>
160+
<artifactId>httpcore5-h2</artifactId>
161+
<version>${httpcore5.version}</version>
162+
</dependency>
163+
164+
<!-- etcd (used by testcontainers module) -->
165+
<dependency>
166+
<groupId>io.etcd</groupId>
167+
<artifactId>jetcd-launcher</artifactId>
168+
<version>${jetcd.version}</version>
169+
</dependency>
170+
<dependency>
171+
<groupId>io.etcd</groupId>
172+
<artifactId>jetcd-core</artifactId>
173+
<version>${jetcd.version}</version>
174+
</dependency>
175+
176+
<!-- Commons -->
177+
<dependency>
178+
<groupId>commons-io</groupId>
179+
<artifactId>commons-io</artifactId>
180+
<version>${commons-io.version}</version>
181+
</dependency>
182+
<dependency>
183+
<groupId>org.apache.commons</groupId>
184+
<artifactId>commons-compress</artifactId>
185+
<version>${commons-compress.version}</version>
186+
</dependency>
187+
<dependency>
188+
<groupId>commons-codec</groupId>
189+
<artifactId>commons-codec</artifactId>
190+
<version>${commons-codec.version}</version>
191+
</dependency>
192+
193+
<!-- Protobuf -->
194+
<dependency>
195+
<groupId>com.google.protobuf</groupId>
196+
<artifactId>protobuf-java</artifactId>
197+
<version>${protobuf.version}</version>
198+
</dependency>
199+
200+
<!-- JSON Schema to POJO -->
201+
<dependency>
202+
<groupId>org.jsonschema2pojo</groupId>
203+
<artifactId>jsonschema2pojo-core</artifactId>
204+
<version>${jsonschema2pojo.version}</version>
205+
</dependency>
206+
110207
<!-- Test dependencies -->
111208
<dependency>
112209
<groupId>ch.qos.logback</groupId>
@@ -120,24 +217,24 @@
120217
<version>${junit-jupiter.version}</version>
121218
<scope>test</scope>
122219
</dependency>
123-
<dependency>
124-
<groupId>org.testcontainers</groupId>
125-
<artifactId>testcontainers-junit-jupiter</artifactId>
126-
<version>${testcontainers.version}</version>
127-
<scope>test</scope>
128-
</dependency>
129220
<dependency>
130221
<groupId>org.projectlombok</groupId>
131222
<artifactId>lombok</artifactId>
132223
<version>${lombok.version}</version>
133-
<scope>test</scope>
224+
<scope>provided</scope>
134225
</dependency>
135226
<dependency>
136227
<groupId>com.google.guava</groupId>
137228
<artifactId>guava</artifactId>
138229
<version>${guava.version}</version>
139230
<scope>test</scope>
140231
</dependency>
232+
<dependency>
233+
<groupId>org.instancio</groupId>
234+
<artifactId>instancio-core</artifactId>
235+
<version>${instancio.version}</version>
236+
<scope>test</scope>
237+
</dependency>
141238
</dependencies>
142239
</dependencyManagement>
143240

‎testcontainers-autogen/pom.xml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,11 @@
2121
<license.header.file>${project.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
2222
</properties>
2323

24-
<dependencyManagement>
25-
<dependencies>
26-
<dependency>
27-
<groupId>org.jsonschema2pojo</groupId>
28-
<artifactId>jsonschema2pojo-core</artifactId>
29-
<version>${jsonschema2pojo.version}</version>
30-
</dependency>
31-
</dependencies>
32-
</dependencyManagement>
33-
3424
<dependencies>
3525
<dependency>
3626
<groupId>org.jsonschema2pojo</groupId>
3727
<artifactId>jsonschema2pojo-core</artifactId>
28+
<version>${jsonschema2pojo.version}</version>
3829
</dependency>
3930
</dependencies>
4031
</project>

‎testcontainers/pom.xml‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,30 @@
1919
<license.header.file>${project.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
2020
<maven.compiler.release>17</maven.compiler.release>
2121
<jetcd.version>0.8.6</jetcd.version>
22+
<httpclient5.version>5.5</httpclient5.version>
23+
<instancio.version>5.5.1</instancio.version>
2224
<grpc.version>1.76.0</grpc.version>
2325
<protobuf.version>3.25.8</protobuf.version>
2426
<protobuf-plugin.version>0.6.1</protobuf-plugin.version>
25-
<apache.http-client.version>5.5</apache.http-client.version>
26-
<instancio.version>5.5.1</instancio.version>
2727
</properties>
2828

29+
<dependencyManagement>
30+
<dependencies>
31+
<dependency>
32+
<groupId>io.grpc</groupId>
33+
<artifactId>grpc-bom</artifactId>
34+
<version>${grpc.version}</version>
35+
<type>pom</type>
36+
<scope>import</scope>
37+
</dependency>
38+
<dependency>
39+
<groupId>com.google.protobuf</groupId>
40+
<artifactId>protobuf-java</artifactId>
41+
<version>${protobuf.version}</version>
42+
</dependency>
43+
</dependencies>
44+
</dependencyManagement>
45+
2946
<dependencies>
3047
<dependency>
3148
<groupId>org.slf4j</groupId>
@@ -41,23 +58,20 @@
4158
<dependency>
4259
<groupId>com.fasterxml.jackson.dataformat</groupId>
4360
<artifactId>jackson-dataformat-yaml</artifactId>
44-
<version>${jackson.version}</version>
4561
</dependency>
4662
<dependency>
4763
<groupId>com.fasterxml.jackson.datatype</groupId>
4864
<artifactId>jackson-datatype-jdk8</artifactId>
49-
<version>${jackson.version}</version>
5065
</dependency>
5166
<dependency>
5267
<groupId>org.projectlombok</groupId>
5368
<artifactId>lombok</artifactId>
5469
<scope>compile</scope>
5570
</dependency>
56-
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5 -->
5771
<dependency>
5872
<groupId>org.apache.httpcomponents.client5</groupId>
5973
<artifactId>httpclient5</artifactId>
60-
<version>${apache.http-client.version}</version>
74+
<version>${httpclient5.version}</version>
6175
</dependency>
6276

6377
<!-- Test -->

0 commit comments

Comments
 (0)