Skip to content
This repository was archived by the owner on May 5, 2025. It is now read-only.

Commit fc6ab56

Browse files
Mryan2005Mryan2005
committed
fix some bugs
1 parent ccf7024 commit fc6ab56

File tree

2 files changed

+107
-4
lines changed

2 files changed

+107
-4
lines changed

‎dependency-reduced-pom.xml

Lines changed: 98 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,43 @@
66
<name>DictSystemInJava</name>
77
<version>latest</version>
88
<build>
9+
<resources>
10+
<resource>
11+
<directory>${basedir}/src/main/resources</directory>
12+
<includes>
13+
<include>**/*.*</include>
14+
</includes>
15+
</resource>
16+
</resources>
917
<plugins>
18+
<plugin>
19+
<artifactId>maven-failsafe-plugin</artifactId>
20+
<version>2.22.2</version>
21+
</plugin>
22+
<plugin>
23+
<artifactId>maven-surefire-plugin</artifactId>
24+
<version>2.22.2</version>
25+
<dependencies>
26+
<dependency>
27+
<groupId>org.apache.maven.surefire</groupId>
28+
<artifactId>surefire-junit47</artifactId>
29+
<version>2.22.2</version>
30+
</dependency>
31+
</dependencies>
32+
</plugin>
33+
<plugin>
34+
<groupId>net.alchim31.maven</groupId>
35+
<artifactId>scala-maven-plugin</artifactId>
36+
<version>3.4.6</version>
37+
</plugin>
38+
<plugin>
39+
<groupId>org.codehaus.mojo</groupId>
40+
<artifactId>exec-maven-plugin</artifactId>
41+
<version>1.6.0</version>
42+
<configuration>
43+
<classpathScope>test</classpathScope>
44+
</configuration>
45+
</plugin>
1046
<plugin>
1147
<artifactId>maven-shade-plugin</artifactId>
1248
<version>3.6.0</version>
@@ -45,9 +81,23 @@
4581
</configuration>
4682
</plugin>
4783
<plugin>
48-
<groupId>org.xolstice.maven.plugins</groupId>
49-
<artifactId>protobuf-maven-plugin</artifactId>
50-
<version>0.5.1</version>
84+
<groupId>org.openjfx</groupId>
85+
<artifactId>javafx-maven-plugin</artifactId>
86+
<version>0.0.8</version>
87+
<executions>
88+
<execution>
89+
<id>default-cli</id>
90+
<configuration>
91+
<mainClass>top.mryan2005.managesysteminjava/top.mryan2005.managesysteminjava.SwingBootstrap</mainClass>
92+
<launcher>app</launcher>
93+
<jlinkZipName>app</jlinkZipName>
94+
<jlinkImageName>app</jlinkImageName>
95+
<noManPages>true</noManPages>
96+
<stripDebug>true</stripDebug>
97+
<noHeaderFiles>true</noHeaderFiles>
98+
</configuration>
99+
</execution>
100+
</executions>
51101
</plugin>
52102
</plugins>
53103
</build>
@@ -106,22 +156,66 @@
106156
</dependency>
107157
<dependency>
108158
<groupId>org.junit.jupiter</groupId>
109-
<artifactId>junit-jupiter-engine</artifactId>
159+
<artifactId>junit-jupiter</artifactId>
160+
<version>5.8.2</version>
161+
<scope>test</scope>
162+
<exclusions>
163+
<exclusion>
164+
<artifactId>junit-jupiter-params</artifactId>
165+
<groupId>org.junit.jupiter</groupId>
166+
</exclusion>
167+
<exclusion>
168+
<artifactId>junit-jupiter-engine</artifactId>
169+
<groupId>org.junit.jupiter</groupId>
170+
</exclusion>
171+
</exclusions>
172+
</dependency>
173+
<dependency>
174+
<groupId>org.junit.vintage</groupId>
175+
<artifactId>junit-vintage-engine</artifactId>
110176
<version>5.11.2</version>
111177
<scope>test</scope>
112178
<exclusions>
113179
<exclusion>
114180
<artifactId>junit-platform-engine</artifactId>
115181
<groupId>org.junit.platform</groupId>
116182
</exclusion>
183+
<exclusion>
184+
<artifactId>junit</artifactId>
185+
<groupId>junit</groupId>
186+
</exclusion>
117187
<exclusion>
118188
<artifactId>apiguardian-api</artifactId>
119189
<groupId>org.apiguardian</groupId>
120190
</exclusion>
121191
</exclusions>
122192
</dependency>
193+
<dependency>
194+
<groupId>org.testng</groupId>
195+
<artifactId>testng</artifactId>
196+
<version>7.10.2</version>
197+
<scope>test</scope>
198+
<exclusions>
199+
<exclusion>
200+
<artifactId>jcommander</artifactId>
201+
<groupId>com.beust</groupId>
202+
</exclusion>
203+
<exclusion>
204+
<artifactId>jquery</artifactId>
205+
<groupId>org.webjars</groupId>
206+
</exclusion>
207+
</exclusions>
208+
</dependency>
209+
<dependency>
210+
<groupId>org.hamcrest</groupId>
211+
<artifactId>hamcrest</artifactId>
212+
<version>2.2</version>
213+
<scope>test</scope>
214+
</dependency>
123215
</dependencies>
124216
<properties>
217+
<maven.compiler.target>20</maven.compiler.target>
218+
<maven.compiler.source>20</maven.compiler.source>
125219
<start-class>top.mryan2005.managesysteminjava.SwingBootstrap</start-class>
126220
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
127221
<junit.version>5.11.2</junit.version>

‎pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,15 @@
317317
</dependency>
318318
</dependencies>
319319
<build>
320+
<resources>
321+
<resource>
322+
<directory>${basedir}/src/main/resources</directory>
323+
<includes>
324+
<include>**/*.*</include>
325+
</includes>
326+
<filtering>false</filtering>
327+
</resource>
328+
</resources>
320329
<plugins>
321330
<plugin>
322331
<artifactId>maven-failsafe-plugin</artifactId>

0 commit comments

Comments
 (0)