Skip to content

Commit 1836657

Browse files
build: Complete Spring Boot 3 migration: update dependencies, fix deprecated APIs, and add packaging workflow (#235)
* Initial plan * Complete Spring Boot 3 migration: update dependencies and fix deprecated APIs - Remove log4j2.version override (2.17.0→SB3-managed 2.23.1) - Update MySQL connector (mysql:mysql-connector-java:5.1.49→com.mysql:mysql-connector-j:8.3.0) - Update git-commit-id plugin (pl.project13.maven→io.github.git-commit-id) - Replace deprecated ListenableFuture with CompletableFuture in VisibleThreadPoolTaskExecutor Co-authored-by: unknowIfGuestInDream <57802425+unknowIfGuestInDream@users.noreply.github.com> * ci: add manual-only packaging workflow with 1-day artifact retention Co-authored-by: unknowIfGuestInDream <57802425+unknowIfGuestInDream@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: unknowIfGuestInDream <57802425+unknowIfGuestInDream@users.noreply.github.com>
1 parent cfbef82 commit 1836657

3 files changed

Lines changed: 39 additions & 20 deletions

File tree

.github/workflows/package.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Package
2+
3+
on:
4+
workflow_dispatch:
5+
6+
permissions:
7+
contents: read
8+
9+
jobs:
10+
package:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v6
15+
- name: Set up JDK 17
16+
uses: actions/setup-java@v5
17+
with:
18+
java-version: '17'
19+
distribution: 'temurin'
20+
cache: maven
21+
- name: Build with Maven
22+
run: mvn -B package --file pom.xml '-Dmaven.test.skip=true'
23+
- name: Upload artifact
24+
uses: actions/upload-artifact@v4
25+
with:
26+
name: genCode
27+
path: target/genCode.jar
28+
retention-days: 1

pom.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
<properties>
1818
<java.version>17</java.version>
1919
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
20-
<log4j2.version>2.17.0</log4j2.version>
2120
<druid-spring-boot-starter.version>1.2.27</druid-spring-boot-starter.version>
22-
<mysql-connector-java.version>5.1.49</mysql-connector-java.version>
2321
<mariadb-java-client.version>3.5.7</mariadb-java-client.version>
2422
<ojdbc7.version>12.1.0.2</ojdbc7.version>
2523
<sqljdbc4.version>4.0</sqljdbc4.version>
@@ -77,9 +75,8 @@
7775
<systemPath>${project.basedir}/src/main/resources/lib/ojdbc7-12.1.0.2.jar</systemPath>
7876
</dependency>
7977
<dependency>
80-
<groupId>mysql</groupId>
81-
<artifactId>mysql-connector-java</artifactId>
82-
<version>${mysql-connector-java.version}</version>
78+
<groupId>com.mysql</groupId>
79+
<artifactId>mysql-connector-j</artifactId>
8380
</dependency>
8481
<!--for SqlServer-->
8582
<dependency>
@@ -156,8 +153,8 @@
156153
</configuration>
157154
</plugin>
158155
<plugin>
159-
<groupId>pl.project13.maven</groupId>
160-
<artifactId>git-commit-id-plugin</artifactId>
156+
<groupId>io.github.git-commit-id</groupId>
157+
<artifactId>git-commit-id-maven-plugin</artifactId>
161158
<configuration>
162159
<!--日期格式;默认值:dd.MM.yyyy '@' HH:mm:ss z;-->
163160
<dateFormat>yyyyMMddHHmmss</dateFormat>

src/main/java/com/tlcsdm/gen/config/VisibleThreadPoolTaskExecutor.java

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
5-
import org.springframework.util.concurrent.ListenableFuture;
65

76
import java.util.concurrent.Callable;
7+
import java.util.concurrent.CompletableFuture;
88
import java.util.concurrent.Future;
99
import java.util.concurrent.ThreadPoolExecutor;
1010

@@ -32,12 +32,6 @@ public void execute(Runnable task) {
3232
super.execute(task);
3333
}
3434

35-
@Override
36-
public void execute(Runnable task, long startTimeout) {
37-
showThreadPoolInfo("2. do execute");
38-
super.execute(task, startTimeout);
39-
}
40-
4135
@Override
4236
public Future<?> submit(Runnable task) {
4337
showThreadPoolInfo("1. do submit");
@@ -51,15 +45,15 @@ public <T> Future<T> submit(Callable<T> task) {
5145
}
5246

5347
@Override
54-
public ListenableFuture<?> submitListenable(Runnable task) {
55-
showThreadPoolInfo("1. do submitListenable");
56-
return super.submitListenable(task);
48+
public CompletableFuture<Void> submitCompletable(Runnable task) {
49+
showThreadPoolInfo("1. do submitCompletable");
50+
return super.submitCompletable(task);
5751
}
5852

5953
@Override
60-
public <T> ListenableFuture<T> submitListenable(Callable<T> task) {
61-
showThreadPoolInfo("2. do submitListenable");
62-
return super.submitListenable(task);
54+
public <T> CompletableFuture<T> submitCompletable(Callable<T> task) {
55+
showThreadPoolInfo("2. do submitCompletable");
56+
return super.submitCompletable(task);
6357
}
6458

6559
}

0 commit comments

Comments
 (0)