Merge pull request #12 from HarryDulaney/Update-dependencies-release-…

…1.1.0 Release 1.1.0
HarryDulaney · Dec 19, 2022 · 23b65ae · 23b65ae
2 parents fefd0c8 + a07617d
commit 23b65ae
Show file tree

Hide file tree

Showing 11 changed files with 443,882 additions and 47 deletions.
diff --git a/File-Commander-1.1.0.jar b/File-Commander-1.1.0.jar
diff --git a/File-Commander.bat b/File-Commander.bat
@@ -1 +1 @@
-java -jar File-Commander-0.2.0.jar
+java -jar File-Commander-1.1.0.jar
diff --git a/build.fxbuild b/build.fxbuild
diff --git a/pom.xml b/pom.xml
@@ -1,33 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.4.RELEASE</version>
-        <relativePath />
+        <version>2.7.4</version>
+        <relativePath/>
     </parent>
 
     <groupId>com.commander</groupId>
     <artifactId>FileCommander</artifactId>
-    <version>0.2.0</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
     <name>FileCommander</name>
-    <description>File format conversion system with settings for preferred file formatting by type</description>
+    <description>File conversion system desktop user interface and preferences file formatting by type</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>11</java.version>
         <javafx.weaver.version>1.3.0</javafx.weaver.version>
+        <openjfx.version>11.0.2</openjfx.version>
+        <apache.poi.version>5.2.3</apache.poi.version>
+        <doc4j.version>1.1.10</doc4j.version>
+        <xdocs.version>2.0.4</xdocs.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -47,32 +55,31 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-loader</artifactId>
-            <version>2.2.4.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-base</artifactId>
-            <version>11.0.2</version>
+            <version>${openjfx.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
-            <version>11.0.2</version>
+            <version>${openjfx.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
-            <version>11.0.2</version>
+            <version>${openjfx.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-graphics</artifactId>
-            <version>11.0.2</version>
+            <version>${openjfx.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-web</artifactId>
-            <version>11.0.2</version>
+            <version>${openjfx.version}</version>
         </dependency>
 
         <dependency>
@@ -83,33 +90,33 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>4.1.1</version>
+            <version>${apache.poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>4.1.1</version>
+            <version>${apache.poi.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
-            <version>1.7</version>
+            <version>1.9.0</version>
         </dependency>
         <dependency>
             <groupId>com.documents4j</groupId>
             <artifactId>documents4j-local</artifactId>
-            <version>1.0.3</version>
+            <version>${doc4j.version}</version>
         </dependency>
         <dependency>
             <groupId>com.documents4j</groupId>
             <artifactId>documents4j-transformer-msoffice-word</artifactId>
-            <version>1.0.3</version>
+            <version>${doc4j.version}</version>
         </dependency>
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
-            <version>5.0</version>
+            <version>5.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.jfoenix</groupId>
@@ -119,22 +126,22 @@
         <dependency>
             <groupId>fr.opensagres.xdocreport</groupId>
             <artifactId>fr.opensagres.poi.xwpf.converter.pdf</artifactId>
-            <version>2.0.2</version>
+            <version>${xdocs.version}</version>
         </dependency>
         <dependency>
             <groupId>fr.opensagres.xdocreport</groupId>
             <artifactId>fr.opensagres.poi.xwpf.converter.core</artifactId>
-            <version>2.0.2</version>
+            <version>${xdocs.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itextpdf</artifactId>
-            <version>5.5.12</version>
+            <version>5.5.13.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
@@ -146,16 +153,11 @@
             <artifactId>pngdecoder</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.5.12</version>
-        </dependency>
 
 
     </dependencies>
     <build>
-        <finalName>File-Commander-0.2.0</finalName>
+        <finalName>File-Commander-1.1.0</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -178,7 +180,7 @@
         <developer>
             <name>Harry Dulaney IV</name>
             <id>HGDIV</id>
-            <email>github.com/harrydulaney</email>
+            <organizationUrl>harrydulaney.com</organizationUrl>
         </developer>
     </developers>
 </project>
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
@@ -1,4 +1,2 @@
 Manifest-Version: 1.0
 Main-Class: com.commander.FileCommanderApp
-Class-Path: BOOT-INF/classes
-
diff --git a/src/main/java/com/commander/PrimaryStageInitializer.java b/src/main/java/com/commander/PrimaryStageInitializer.java
@@ -19,9 +19,9 @@ public class PrimaryStageInitializer implements ApplicationListener<com.commande
 
     private final FxWeaver fxWeaver;
     private final String LIGHT_STYLE_SHEET =
-            getClass().getClassLoader().getResource("style" + File.separator + "light.css").toExternalForm();
+            getClass().getClassLoader().getResource("light.css").toExternalForm();
     private final String DARK_STYLE_SHEET =
-            getClass().getClassLoader().getResource("style" + File.separator + "dark.css").toExternalForm();
+            getClass().getClassLoader().getResource("dark.css").toExternalForm();
 
     @Value("${application.ui.title}")
     private String title;

diff --git a/src/main/java/com/commander/controller/RootController.java b/src/main/java/com/commander/controller/RootController.java
@@ -23,9 +23,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.FileSystemResourceLoader;
+import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -96,11 +100,13 @@ public class RootController {
 
 
     protected RootController(FxWeaver fxWeaver,
-                             @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") FxControllerAndView<DragDropController, BorderPane> dragDropController) {
+                             @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") FxControllerAndView<DragDropController, BorderPane> dragDropController) throws IOException {
         this.dragDropController = dragDropController;
         this.fxWeaver = fxWeaver;
-        LIGHT_THEME_STYLE = getClass().getClassLoader().getResource("style" + File.separator + "light.css").toExternalForm();
-        DARK_THEME_STYLE = getClass().getClassLoader().getResource("style" + File.separator + "dark.css").toExternalForm();
+        LIGHT_THEME_STYLE = getClass().getClassLoader().getResource("light.css").toExternalForm();
+        DARK_THEME_STYLE = getClass().getClassLoader().getResource("dark.css").toExternalForm();
+
+
     }
 
 

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -0,0 +1,8 @@
+application:
+  ui:
+    title: File Commander 1.1.0
+
+spring:
+  main:
+    banner-mode: off
+    web-application-type: none
diff --git a/src/main/resources/style/dark.css → src/main/resources/dark.css b/src/main/resources/style/dark.css → src/main/resources/dark.css
diff --git a/src/main/resources/style/light.css → src/main/resources/light.css b/src/main/resources/style/light.css → src/main/resources/light.css