Merge branch 'to/#98-fat-jar' into to/#2-time-range-configuration

# Conflicts: # build.gradle # src/main/java/edu/ie3/tools/Converter.java
ie3-institute · Apr 1, 2022 · 301a33e · 301a33e
2 parents 2e441cc + 1f9df5b
commit 301a33e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,6 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+
 plugins {
 	id "com.jfrog.artifactory" version "4.24.20" //artifactory support
 	id 'groovy' // groovy support

diff --git a/src/main/java/edu/ie3/tools/Converter.java b/src/main/java/edu/ie3/tools/Converter.java
@@ -35,8 +35,6 @@
  * @version 4.0
  */
 public class Converter implements Runnable {
-  private ZonedDateTime convertFrom;
-  private ZonedDateTime convertUntil;
   public static final Logger logger = LogManager.getLogger(Converter.class);
   public static final Logger fileStatusLogger = LogManager.getLogger("FileStatus");