From 734960d031cb989ed16da532f6e2a5ea1b833222 Mon Sep 17 00:00:00 2001
From: suyiiyii <suyiiyii@gmail.com>
Date: Sat, 17 Aug 2024 02:06:05 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(ci):=20=E8=B7=B3=E8=BF=87=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95=E5=B9=B6=E4=BF=AE=E5=A4=8D=E4=BE=9D=E8=B5=96=E5=9B=BE?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=9C=A8GitHub=20?=
=?UTF-8?q?Actions=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=B8=AD=EF=BC=8CMaven?=
=?UTF-8?q?=E6=89=93=E5=8C=85=E6=AD=A5=E9=AA=A4=E7=8E=B0=E5=9C=A8=E8=B7=B3?=
=?UTF-8?q?=E8=BF=87=E6=B5=8B=E8=AF=95=E4=BB=A5=E5=8A=A0=E5=BF=AB=E6=9E=84?=
=?UTF-8?q?=E5=BB=BA=E9=80=9F=E5=BA=A6=E5=B9=B6=E9=81=BF=E5=85=8D=E4=B8=8D?=
=?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E4=BE=9D=E8=B5=96=E3=80=82=E6=AD=A4?=
=?UTF-8?q?=E5=A4=96=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=9B=BE=E7=9A=84=E6=AD=A5=E9=AA=A4=EF=BC=8C?=
=?UTF-8?q?=E4=BB=A5=E7=A1=AE=E4=BF=9D=E5=85=B6=E5=9C=A8=E6=9E=84=E5=BB=BA?=
=?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=B8=AD=E6=AD=A3=E7=A1=AE=E6=89=A7=E8=A1=8C?=
=?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/maven.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c2c04d7..ee4c4c8 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -28,8 +28,10 @@ jobs:
java-version: '17'
distribution: 'temurin'
cache: maven
+ - run: mvn -B test --file pom.xml
- name: Build with Maven
- run: mvn -B package --file pom.xml
+ run: mvn -B package -DskipTests --file pom.xml
+
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
# - name: Update dependency graph
From c080be00932a58228db28cbad61bbc9359c594ed Mon Sep 17 00:00:00 2001
From: suyiiyii <suyiiyii@gmail.com>
Date: Sat, 17 Aug 2024 02:28:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?```javarefactor(maven):=20=E5=B0=86Java?=
=?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E5=88=B021?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
更新CI工作流和pom.xml中的Java版本。此更改包括将GitHub Actions工作流中使用的JDK版本从17更新到21，
以及将pom.xml中定义的Java版本属性从17更新到21，以适应新的Java版本。
```
---
.github/workflows/maven.yml | 4 ++--
pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ee4c4c8..0c82c7e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -22,10 +22,10 @@ jobs:
steps:
- uses: actions/checkout@v4
- run: rm -rf test.db
- - name: Set up JDK 17
+ - name: Set up JDK 21
uses: actions/setup-java@v4
with:
- java-version: '17'
+ java-version: '21'
distribution: 'temurin'
cache: maven
- run: mvn -B test --file pom.xml
diff --git a/pom.xml b/pom.xml
index 160087f..976b8cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<url/>
</scm>
<properties>
- <java.version>17</java.version>
+ <java.version>21</java.version>
</properties>
<dependencies>
<dependency>
From 6c6ab8475c511b88a7673156d7dfdb6e1d0f7b3f Mon Sep 17 00:00:00 2001
From: suyiiyii <suyiiyii@gmail.com>
Date: Sat, 17 Aug 2024 02:31:18 +0800
Subject: [PATCH 3/4] =?UTF-8?q?Revert=20"```javarefactor(maven):=20?=
=?UTF-8?q?=E5=B0=86Java=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E5=88=B021"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit c080be00932a58228db28cbad61bbc9359c594ed.
---
.github/workflows/maven.yml | 4 ++--
pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 0c82c7e..ee4c4c8 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -22,10 +22,10 @@ jobs:
steps:
- uses: actions/checkout@v4
- run: rm -rf test.db
- - name: Set up JDK 21
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
- java-version: '21'
+ java-version: '17'
distribution: 'temurin'
cache: maven
- run: mvn -B test --file pom.xml
diff --git a/pom.xml b/pom.xml
index 976b8cd..160087f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<url/>
</scm>
<properties>
- <java.version>21</java.version>
+ <java.version>17</java.version>
</properties>
<dependencies>
<dependency>
From da6057ccab5e12ab99c228813e6c55e1f9137f84 Mon Sep 17 00:00:00 2001
From: suyiiyii <suyiiyii@gmail.com>
Date: Sat, 17 Aug 2024 02:39:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?test(sims):=20=E5=88=A0=E9=99=A4=E5=A4=9A?=
=?UTF-8?q?=E4=BD=99=E7=9A=84=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../top/suyiiyii/sims/SimsApplicationTests.java | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 src/test/java/top/suyiiyii/sims/SimsApplicationTests.java
diff --git a/src/test/java/top/suyiiyii/sims/SimsApplicationTests.java b/src/test/java/top/suyiiyii/sims/SimsApplicationTests.java
deleted file mode 100644
index e7a4422..0000000
--- a/src/test/java/top/suyiiyii/sims/SimsApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package top.suyiiyii.sims;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class SimsApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}