Skip to content

Commit 3a101ca

Browse files
andponlinandponlin
committed
corrections to dependency structure + bumps
1 parent fed5281 commit 3a101ca

File tree

4 files changed

+34
-60
lines changed

4 files changed

+34
-60
lines changed

‎haikudepotserver-core-test/src/test/java/org/haiku/haikudepotserver/captcha/DatabaseCaptchaRepositoryIT.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.sql.Timestamp;
1919
import java.time.Clock;
20-
import java.util.List;
2120

2221
@ContextConfiguration(classes = TestConfig.class)
2322
public class DatabaseCaptchaRepositoryIT extends AbstractIntegrationTest {

‎haikudepotserver-packagefile/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
<artifactId>aircompressor</artifactId>
3131
</dependency>
3232

33+
<dependency>
34+
<groupId>jakarta.annotation</groupId>
35+
<artifactId>jakarta.annotation-api</artifactId>
36+
</dependency>
37+
3338
<dependency>
3439
<groupId>org.slf4j</groupId>
3540
<artifactId>slf4j-api</artifactId>

‎haikudepotserver-packagefile/src/main/java/org/haiku/pkg/model/Attribute.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
import com.google.common.base.Preconditions;
99
import com.google.common.collect.ImmutableList;
10+
import jakarta.annotation.Nullable;
1011
import org.haiku.pkg.AttributeContext;
1112

12-
import javax.annotation.Nullable;
1313
import java.util.Collections;
1414
import java.util.List;
1515
import java.util.Optional;

‎haikudepotserver-parent/pom.xml‎

Lines changed: 28 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<!--
3-
~ Copyright 2018-2024, Andrew Lindesay
3+
~ Copyright 2018-2025, Andrew Lindesay
44
~ Distributed under the terms of the MIT License.
55
-->
66

@@ -32,39 +32,35 @@
3232
<maven.compiler.source>21</maven.compiler.source>
3333
<maven.compiler.parameters>true</maven.compiler.parameters>
3434

35-
<spring-boot.version>3.4.3</spring-boot.version>
35+
<spring-boot.version>3.5.0</spring-boot.version>
3636
<spring-retry.version>2.0.11</spring-retry.version>
3737

38-
<postgresql.version>42.7.5</postgresql.version>
39-
<cayenne.version>4.2.1</cayenne.version>
38+
<postgresql.version>42.7.7</postgresql.version>
39+
<cayenne.version>4.2.2</cayenne.version>
4040

41-
<slf4j.version>2.0.7</slf4j.version>
42-
<jackson-databind.version>2.16.1</jackson-databind.version>
41+
<guava.version>33.4.8-jre</guava.version>
4342

44-
<guava.version>33.4.0-jre</guava.version>
45-
46-
<openapi-generator-maven-plugin.version>7.11.0</openapi-generator-maven-plugin.version>
43+
<openapi-generator-maven-plugin.version>7.13.0</openapi-generator-maven-plugin.version>
4744
<springfox.version>3.0.0</springfox.version>
4845

49-
<nimbus-jose-jwt.version>9.37.3</nimbus-jose-jwt.version>
46+
<nimbus-jose-jwt.version>9.48</nimbus-jose-jwt.version>
5047

5148
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
52-
<maven-failsafe-plugin.version>3.2.3</maven-failsafe-plugin.version>
49+
<maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
5350
<jsonschema2pojo-maven-plugin.version>1.2.2</jsonschema2pojo-maven-plugin.version>
5451

5552
<flexmark.version>0.64.8</flexmark.version>
5653
<freemarker.version>2.3.34</freemarker.version>
57-
<hikaricp.version>5.1.0</hikaricp.version>
58-
<opencsv.version>5.9</opencsv.version>
54+
<opencsv.version>5.11</opencsv.version>
5955
<aircompressor.version>2.0.2</aircompressor.version>
6056

61-
<commons-collections4.version>4.4</commons-collections4.version>
57+
<commons-collections4.version>4.5.0</commons-collections4.version>
6258
<commons-lang3.version>3.17.0</commons-lang3.version>
6359
<commons-compress.version>1.27.1</commons-compress.version>
64-
<commons-codec.version>1.17.1</commons-codec.version>
65-
<commons-csv.version>1.12.0</commons-csv.version>
60+
<commons-codec.version>1.18.0</commons-codec.version>
61+
<commons-csv.version>1.14.0</commons-csv.version>
6662

67-
<testcontainers.version>1.20.4</testcontainers.version>
63+
<testcontainers.version>1.21.1</testcontainers.version>
6864
</properties>
6965

7066
<dependencyManagement>
@@ -78,6 +74,18 @@
7874
<scope>import</scope>
7975
</dependency>
8076

77+
<dependency>
78+
<groupId>org.springframework.boot</groupId>
79+
<artifactId>spring-boot-starter-json</artifactId>
80+
<version>${spring-boot.version}</version>
81+
</dependency>
82+
83+
<dependency>
84+
<groupId>org.springframework.boot</groupId>
85+
<artifactId>spring-boot-starter-jdbc</artifactId>
86+
<version>${spring-boot.version}</version>
87+
</dependency>
88+
8189
<dependency>
8290
<groupId>org.springframework.retry</groupId>
8391
<artifactId>spring-retry</artifactId>
@@ -90,32 +98,6 @@
9098
<version>2.37</version>
9199
</dependency>
92100

93-
<dependency>
94-
<groupId>org.slf4j</groupId>
95-
<artifactId>slf4j-api</artifactId>
96-
<version>${slf4j.version}</version>
97-
</dependency>
98-
<dependency>
99-
<groupId>org.slf4j</groupId>
100-
<artifactId>jul-to-slf4j</artifactId>
101-
<version>${slf4j.version}</version>
102-
</dependency>
103-
<dependency>
104-
<groupId>org.slf4j</groupId>
105-
<artifactId>jcl-over-slf4j</artifactId>
106-
<version>${slf4j.version}</version>
107-
</dependency>
108-
<dependency>
109-
<groupId>org.slf4j</groupId>
110-
<artifactId>log4j-over-slf4j</artifactId>
111-
<version>${slf4j.version}</version>
112-
</dependency>
113-
114-
<dependency>
115-
<groupId>com.fasterxml.jackson.core</groupId>
116-
<artifactId>jackson-databind</artifactId>
117-
<version>${jackson-databind.version}</version>
118-
</dependency>
119101
<dependency>
120102
<groupId>com.google.guava</groupId>
121103
<artifactId>guava</artifactId>
@@ -230,25 +212,13 @@
230212
<version>${cayenne.version}</version>
231213
</dependency>
232214

233-
<dependency>
234-
<groupId>com.zaxxer</groupId>
235-
<artifactId>HikariCP</artifactId>
236-
<version>${hikaricp.version}</version>
237-
</dependency>
238-
239215
<dependency>
240216
<groupId>ar.com.hjg</groupId>
241217
<artifactId>pngj</artifactId>
242218
<version>2.1.0</version>
243219
</dependency>
244220

245-
<dependency>
246-
<groupId>org.springframework.boot</groupId>
247-
<artifactId>spring-boot-dependencies</artifactId>
248-
<version>${spring-boot.version}</version>
249-
<type>pom</type>
250-
<scope>import</scope>
251-
</dependency>
221+
252222

253223
<dependency>
254224
<groupId>org.springframework.boot</groupId>
@@ -259,7 +229,7 @@
259229
<dependency>
260230
<groupId>org.junit.jupiter</groupId>
261231
<artifactId>junit-jupiter</artifactId>
262-
<version>5.10.1</version>
232+
<version>5.13.0</version>
263233
</dependency>
264234
<dependency>
265235
<groupId>org.easytesting</groupId>
@@ -298,7 +268,7 @@
298268
<dependency>
299269
<groupId>org.awaitility</groupId>
300270
<artifactId>awaitility</artifactId>
301-
<version>4.2.0</version>
271+
<version>4.3.0</version>
302272
<scope>test</scope>
303273
</dependency>
304274

0 commit comments

Comments
 (0)