Skip to content

Commit bc7f474

Browse files
committed
Merge remote-tracking branch 'origin/master' into CORE3_IDF5
2 parents 5e9f21d + 66d0370 commit bc7f474

File tree

6 files changed

+3
-3
lines changed

6 files changed

+3
-3
lines changed

data/img/pcb_eth.jpg

900 KB
Loading

data/img/pcb_noeth.jpg

1.24 MB
Loading

data/img/supermini.jpg

386 KB
Loading

data/img/waveshare.jpg

271 KB
Loading

data/img/xiao.jpg

571 KB
Loading

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@
2121
<project.version>2.25.6</project.version>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.fx.version>25.0.1</java.fx.version>
24+
<java.fx.version>25.0.2</java.fx.version>
2525
<javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>
2626
<maven.compiler.source>25</maven.compiler.source>
2727
<maven.compiler.target>25</maven.compiler.target>
2828
<maven.compiler.plugin.version>3.14.1</maven.compiler.plugin.version>
2929
<maven.assembly.version>3.8.0</maven.assembly.version>
3030
<maven.shade.version>3.6.0</maven.shade.version>
3131
<jserialcomm.version>2.11.4</jserialcomm.version>
32-
<jackson.version>2.20.1</jackson.version>
32+
<jackson.version>2.21.0</jackson.version>
3333
<lombok.version>1.18.42</lombok.version>
3434
<mapstruct.version>1.6.3</mapstruct.version>
3535
<jna.version>5.18.1</jna.version>
3636
<gstreamer.binding.version>1.4.0</gstreamer.binding.version>
3737
<paho.version>1.2.5</paho.version>
38-
<logback.version>1.5.23</logback.version>
38+
<logback.version>1.5.25</logback.version>
3939
<slf4j.version>2.0.17</slf4j.version>
4040
<xtaudio.version>2.0</xtaudio.version>
4141
<dbus.java.version>5.2.0</dbus.java.version>

0 commit comments

Comments
 (0)