Merge pull request #356 from Ravendwyr/pom

Addressed a few maven warnings.
mircokroon · Jun 2, 2022 · 5cdc7ec · 5cdc7ec
2 parents d4f92ac + 391c88c
commit 5cdc7ec
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -47,6 +47,13 @@
                 <configuration>
                     <minimizeJar>true</minimizeJar>
                     <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/**</exclude>
+                                <exclude>module-info.class</exclude>
+                            </excludes>
+                        </filter>
                         <filter>
                             <artifact>org.openjfx</artifact>
                             <excludeDefaults>false</excludeDefaults>
@@ -55,12 +62,6 @@
                                 <include>javafx/**</include>
                             </includes>
                         </filter>
-                        <filter>
-                            <artifact>log4j:log4j</artifact>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </filter>
                         <filter>
                             <artifact>commons-logging:commons-logging</artifact>
                             <includes>
@@ -74,7 +75,7 @@
                         </transformer>
                     </transformers>
                     <finalName>world-downloader</finalName>
-            </configuration>
+                </configuration>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -128,12 +129,12 @@
                                 <maxHeapSize>2048</maxHeapSize>
                             </jre>
                             <versionInfo>
-                                <fileVersion>${version}</fileVersion>
-                                <txtFileVersion>${version}</txtFileVersion>
+                                <fileVersion>${project.version}</fileVersion>
+                                <txtFileVersion>${project.version}</txtFileVersion>
                                 <fileDescription>Minecraft world downloader</fileDescription>
-                                <productVersion>${version}</productVersion>
+                                <productVersion>${project.version}</productVersion>
                                 <copyright>!</copyright>
-                                <txtProductVersion>${version}</txtProductVersion>
+                                <txtProductVersion>${project.version}</txtProductVersion>
                                 <productName>Minecraft world downloader</productName>
                                 <internalName>Minecraft world downloader</internalName>
                                 <originalFilename>world-downloader.exe</originalFilename>
@@ -198,11 +199,6 @@
             <version>2.33</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-controls</artifactId>
-            <version>15.0.1</version>
-        </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
@@ -265,19 +261,19 @@
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
-            <artifactId>javafx-graphics </artifactId>
+            <artifactId>javafx-graphics</artifactId>
             <version>11</version>
             <classifier>win</classifier>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
-            <artifactId>javafx-graphics </artifactId>
+            <artifactId>javafx-graphics</artifactId>
             <version>11</version>
             <classifier>linux</classifier>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
-            <artifactId>javafx-graphics </artifactId>
+            <artifactId>javafx-graphics</artifactId>
             <version>11</version>
             <classifier>mac</classifier>
         </dependency>