rippers log4j --> log4j2

src/main/java/com/rarchives/ripme/App.java

@@ -24,7 +24,6 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.lang.SystemUtils;
-import org.apache.log4j.Logger;
 
 import com.rarchives.ripme.ripper.AbstractRipper;
 import com.rarchives.ripme.ui.History;
@@ -34,6 +33,8 @@ import com.rarchives.ripme.ui.UpdateUtils;
 import com.rarchives.ripme.utils.Proxy;
 import com.rarchives.ripme.utils.RipUtils;
 import com.rarchives.ripme.utils.Utils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * Entry point to application.
@@ -44,7 +45,7 @@ import com.rarchives.ripme.utils.Utils;
  */
 public class App {
 
-    public static final Logger logger = Logger.getLogger(App.class);
+    public static final Logger logger = LogManager.getLogger(App.class);
     public static String stringToAppendToFoldername = null;
     private static final History HISTORY = new History();
 

src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java

@@ -13,7 +13,8 @@ import java.util.ResourceBundle;
 import javax.net.ssl.HttpsURLConnection;
 
 import com.rarchives.ripme.ui.MainWindow;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jsoup.HttpStatusException;
 
 import com.rarchives.ripme.ui.RipStatusMessage.STATUS;
@@ -24,7 +25,7 @@ import com.rarchives.ripme.utils.Utils;
  * and other goodies.
  */
 class DownloadFileThread extends Thread {
-    private static final Logger logger = Logger.getLogger(DownloadFileThread.class);
+    private static final Logger logger = LogManager.getLogger(DownloadFileThread.class);
 
     private String referrer = "";
     private Map<String, String> cookies = new HashMap<>();

src/main/java/com/rarchives/ripme/ripper/DownloadThreadPool.java

@@ -4,16 +4,16 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
-
 import com.rarchives.ripme.utils.Utils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * Simple wrapper around a FixedThreadPool.
  */
 public class DownloadThreadPool {
 
-    private static final Logger logger = Logger.getLogger(DownloadThreadPool.class);
+    private static final Logger logger = LogManager.getLogger(DownloadThreadPool.class);
     private ThreadPoolExecutor threadPool = null;
 
     public DownloadThreadPool() {

src/main/java/com/rarchives/ripme/ripper/DownloadVideoThread.java

@@ -11,10 +11,10 @@ import java.net.URL;
 
 import javax.net.ssl.HttpsURLConnection;
 
-import org.apache.log4j.Logger;
-
 import com.rarchives.ripme.ui.RipStatusMessage.STATUS;
 import com.rarchives.ripme.utils.Utils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * Thread for downloading files.
@@ -22,7 +22,7 @@ import com.rarchives.ripme.utils.Utils;
  */
 class DownloadVideoThread extends Thread {
 
-    private static final Logger logger = Logger.getLogger(DownloadVideoThread.class);
+    private static final Logger logger = LogManager.getLogger(DownloadVideoThread.class);
 
     private URL url;
     private File saveAs;

src/main/java/com/rarchives/ripme/ripper/rippers/BooruRipper.java

@@ -12,12 +12,14 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 
 public class BooruRipper extends AbstractHTMLRipper {
-    private static final Logger logger = Logger.getLogger(BooruRipper.class);
+    private static final Logger logger = LogManager.getLogger(BooruRipper.class);
 
     private static Pattern gidPattern = null;
 

src/main/java/com/rarchives/ripme/ripper/rippers/E621Ripper.java

@@ -17,7 +17,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
@@ -25,7 +27,7 @@ import org.jsoup.select.Elements;
 
 
 public class E621Ripper extends AbstractHTMLRipper {
-    private static final Logger logger = Logger.getLogger(E621Ripper.class);
+    private static final Logger logger = LogManager.getLogger(E621Ripper.class);
 
     private static Pattern gidPattern = null;
     private static Pattern gidPattern2 = null;

src/main/java/com/rarchives/ripme/ripper/rippers/MangadexRipper.java

@@ -5,7 +5,6 @@ import com.rarchives.ripme.ui.History;
 import com.rarchives.ripme.ui.RipStatusMessage;
 import com.rarchives.ripme.utils.Http;
 import com.rarchives.ripme.utils.Utils;
-import org.apache.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.jsoup.Connection;

src/main/java/com/rarchives/ripme/ripper/rippers/PahealRipper.java

@@ -15,13 +15,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 public class PahealRipper extends AbstractHTMLRipper {
-    private static final Logger logger = Logger.getLogger(PahealRipper.class);
+    private static final Logger logger = LogManager.getLogger(PahealRipper.class);
 
     private static Map<String, String> cookies = null;
     private static Pattern gidPattern = null;

src/main/java/com/rarchives/ripme/ui/UpdateUtils.java

@@ -11,7 +11,8 @@ import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.jsoup.Connection.Response;
@@ -22,7 +23,7 @@ import com.rarchives.ripme.utils.Utils;
 
 public class UpdateUtils {
 
-    private static final Logger logger = Logger.getLogger(UpdateUtils.class);
+    private static final Logger logger = LogManager.getLogger(UpdateUtils.class);
     // do not update the default version without adjusting the unit test. the real version comes from METAINF.MF
     private static final String DEFAULT_VERSION = "1.7.94-10-b6345398";
     private static final String REPO_NAME = "ripmeapp/ripme";

src/main/java/com/rarchives/ripme/utils/Http.java

@@ -8,7 +8,8 @@ import java.util.Map;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.json.JSONObject;
 import org.jsoup.Connection;
 import org.jsoup.Connection.Method;
@@ -28,7 +29,7 @@ import com.rarchives.ripme.ripper.AbstractRipper;
 public class Http {
 
     private static final int TIMEOUT = Utils.getConfigInteger("page.timeout", 5 * 1000);
-    private static final Logger logger = Logger.getLogger(Http.class);
+    private static final Logger logger = LogManager.getLogger(Http.class);
 
     private int retries;
     private String url;

src/main/java/com/rarchives/ripme/utils/RipUtils.java

@@ -16,14 +16,15 @@ import com.rarchives.ripme.ripper.rippers.VidbleRipper;
 import com.rarchives.ripme.ripper.rippers.GfycatRipper;
 import com.rarchives.ripme.ripper.rippers.SoundgasmRipper;
 import org.apache.commons.lang.math.NumberUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 
 
 public class RipUtils {
-    private static final Logger logger = Logger.getLogger(RipUtils.class);
+    private static final Logger logger = LogManager.getLogger(RipUtils.class);
 
     public static List<URL> getFilesFromURL(URL url) {
         List<URL> result = new ArrayList<>();