Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
GoldenGnu committed Dec 21, 2024
2 parents 41647cf + 392000e commit 7372a61
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -809,38 +809,38 @@
<!-- slf4j http://www.slf4j.org/news.html -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<version>2.0.16</version>
</dependency>
<dependency>
<!-- log4j to slf4j API -->
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.36</version>
<version>2.0.16</version>
</dependency>
<dependency>
<!-- commons-logging to slf4j API -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.36</version>
<version>2.0.16</version>
</dependency>
<dependency>
<!-- java.util.logging to the slf4j API -->
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.36</version>
<version>2.0.16</version>
</dependency>
<dependency>
<!-- use logback for logging -->
<!-- http://logback.qos.ch/news.html -->
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.13</version>
<version>1.3.14</version>
</dependency>
<dependency>
<!-- use logback for logging -->
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.2.13</version>
<version>1.3.14</version>
</dependency>
<dependency>
<!-- https://github.com/jfree/jfreechart/releases -->
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/net/nikr/eve/jeveasset/LibraryManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@ public static synchronized Set<String> getLibFiles() {
files.add("jfreechart-1.5.3.jar");
files.add("pricing-3.1.1.jar");
files.add("routing-2.0.0.jar");
files.add("slf4j-api-1.7.36.jar");
files.add("log4j-over-slf4j-1.7.36.jar");
files.add("jcl-over-slf4j-1.7.36.jar");
files.add("jul-to-slf4j-1.7.36.jar");
files.add("logback-core-1.2.13.jar");
files.add("logback-classic-1.2.13.jar");
files.add("super-csv-2.4.0.jar");
files.add("translations-3.1.1.jar");
files.add("annotations-13.0.jar");
Expand All @@ -127,6 +121,13 @@ public static synchronized Set<String> getLibFiles() {
files.add("kotlin-stdlib-jdk8-1.6.10.jar");
files.add("EvalEx-2.7.jar");
files.add("picocli-4.6.2.jar");
//Logging
files.add("slf4j-api-2.0.16.jar");
files.add("jul-to-slf4j-2.0.16.jar");
files.add("jcl-over-slf4j-2.0.16.jar");
files.add("logback-core-1.3.14.jar");
files.add("log4j-over-slf4j-2.0.16.jar");
files.add("logback-classic-1.3.14.jar");
//Native Mac GUI integration
files.add("jsvg-1.4.0.jar");
files.add("flatlaf-extras-3.4.1.jar");
Expand Down

0 comments on commit 7372a61

Please sign in to comment.