Merge conflict resolution and updates

2026-02-24 20:26:50 -07:00
parent 208aaae652
commit 13e8c01a28
38 changed files with 594 additions and 266 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
    <name>PetShopDesktop</name>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <javafx.version>25.0.2</javafx.version>
+        <javafx.version>17.0.10</javafx.version>
        <junit.version>5.12.1</junit.version>
    </properties>

@@ -53,8 +53,7 @@
                <artifactId>maven-compiler-plugin</artifactId>
                <version>3.13.0</version>
                <configuration>
-                    <source>23</source>
-                    <target>23</target>
+                    <release>17</release>
                </configuration>
            </plugin>
            <plugin>