Skip to content

Commit eb4970b

Browse files
authored
Merge pull request #28 from aboutbits/updates
update java and deps
2 parents 3ff7ef2 + bb8c07c commit eb4970b

File tree

4 files changed

+26
-12
lines changed

4 files changed

+26
-12
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v5
1515
- uses: aboutbits/github-actions-java/setup-with-maven@v4
1616
with:
17-
java-version: 21
17+
java-version: 25
1818
- name: Test
1919
env:
2020
GITHUB_USER_NAME: ${{ github.actor }}

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: aboutbits/github-actions-base/git-setup@v2
2020
- uses: aboutbits/github-actions-java/setup-with-maven@v4
2121
with:
22-
java-version: 21
22+
java-version: 25
2323
- uses: aboutbits/github-actions-java/set-version-with-maven@v4
2424
with:
2525
version: "${{ github.event.inputs.version }}"

.idea/misc.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<parent>
67
<groupId>org.springframework.boot</groupId>
78
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.4.5</version>
9+
<version>3.5.7</version>
910
<relativePath/> <!-- lookup parent from repository -->
1011
</parent>
1112

@@ -15,15 +16,15 @@
1516
<description>Testing library for Spring Boot projects.</description>
1617

1718
<properties>
18-
<java.version>21</java.version>
19+
<java.version>25</java.version>
1920
</properties>
2021

2122
<dependencyManagement>
2223
<dependencies>
2324
<dependency>
2425
<groupId>it.aboutbits</groupId>
2526
<artifactId>spring-boot-toolbox</artifactId>
26-
<version>1.3.0</version>
27+
<version>1.6.0</version>
2728
</dependency>
2829
</dependencies>
2930
</dependencyManagement>
@@ -50,11 +51,17 @@
5051
<dependency>
5152
<groupId>org.springframework.boot</groupId>
5253
<artifactId>spring-boot-starter-test</artifactId>
54+
<exclusions>
55+
<exclusion>
56+
<groupId>org.hamcrest</groupId>
57+
<artifactId>hamcrest</artifactId>
58+
</exclusion>
59+
</exclusions>
5360
</dependency>
5461
<dependency>
5562
<groupId>net.datafaker</groupId>
5663
<artifactId>datafaker</artifactId>
57-
<version>2.4.3</version>
64+
<version>2.5.3</version>
5865
</dependency>
5966
</dependencies>
6067

@@ -63,16 +70,23 @@
6370
<plugin>
6471
<groupId>org.apache.maven.plugins</groupId>
6572
<artifactId>maven-compiler-plugin</artifactId>
66-
<version>3.11.0</version>
73+
<version>3.14.1</version>
6774
<configuration>
6875
<source>${java.version}</source>
6976
<target>${java.version}</target>
77+
<annotationProcessorPaths>
78+
<path>
79+
<groupId>org.projectlombok</groupId>
80+
<artifactId>lombok</artifactId>
81+
<version>${lombok.version}</version>
82+
</path>
83+
</annotationProcessorPaths>
7084
</configuration>
7185
</plugin>
7286
<plugin>
7387
<groupId>org.apache.maven.plugins</groupId>
7488
<artifactId>maven-checkstyle-plugin</artifactId>
75-
<version>3.5.0</version>
89+
<version>3.6.0</version>
7690
<configuration>
7791
<configLocation>checkstyle.xml</configLocation>
7892
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
@@ -94,7 +108,7 @@
94108
<dependency>
95109
<groupId>com.puppycrawl.tools</groupId>
96110
<artifactId>checkstyle</artifactId>
97-
<version>10.18.1</version>
111+
<version>11.1.0</version>
98112
</dependency>
99113
<dependency>
100114
<groupId>it.aboutbits</groupId>

0 commit comments

Comments
 (0)