weblocopener-57: Fixed dependencies

benchdoos · Oct 28, 2023 · 5e5577c · 5e5577c
1 parent 3938d13
commit 5e5577c
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -434,10 +434,22 @@
     </dependency>
 
     <!--Intellij Forms-->
+
+    <dependency>
+      <groupId>org.jdom</groupId>
+      <artifactId>jdom2</artifactId>
+      <version>2.0.6.1</version>
+    </dependency>
     <dependency>
       <groupId>com.intellij</groupId>
       <artifactId>forms_rt</artifactId>
       <version>7.0.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>jdom</groupId>
+          <artifactId>jdom</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!--Logging-->
@@ -474,10 +486,21 @@
       <version>1.18.24</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.4</version>
+    </dependency>
     <dependency>
       <groupId>commons-validator</groupId>
       <artifactId>commons-validator</artifactId>
       <version>1.7</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-collections</groupId>
+          <artifactId>commons-collections</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>

diff --git a/src/main/java/com/github/benchdoos/weblocopener/service/impl/DefaultHtmlService.java b/src/main/java/com/github/benchdoos/weblocopener/service/impl/DefaultHtmlService.java
@@ -7,15 +7,16 @@
 import com.github.benchdoos.weblocopenercore.service.translation.Translation;
 import j2html.TagCreator;
 import j2html.tags.specialized.HtmlTag;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
 
 @Log4j2
 public class DefaultHtmlService implements Serializable, HtmlService {

diff --git a/src/main/java/com/github/benchdoos/weblocopener/update/impl/UnixUpdater.java b/src/main/java/com/github/benchdoos/weblocopener/update/impl/UnixUpdater.java
@@ -29,7 +29,7 @@
 import com.github.benchdoos.weblocopenercore.service.actions.ActionListenerSupport;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.assertj.core.util.Files;
 
 import javax.swing.*;

diff --git a/src/main/java/com/github/benchdoos/weblocopener/update/impl/WindowsUpdater.java b/src/main/java/com/github/benchdoos/weblocopener/update/impl/WindowsUpdater.java
@@ -27,7 +27,7 @@
 import com.github.benchdoos.weblocopenercore.exceptions.NoAvailableVersionException;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/src/main/java/com/github/benchdoos/weblocopener/utils/UpdateHelperUtil.java b/src/main/java/com/github/benchdoos/weblocopener/utils/UpdateHelperUtil.java
@@ -9,16 +9,17 @@
 import com.github.benchdoos.weblocopenercore.service.actions.ActionListener;
 import com.github.benchdoos.weblocopenercore.utils.system.OS;
 import com.github.benchdoos.weblocopenercore.utils.version.Version;
+import lombok.experimental.UtilityClass;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+
+import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import javax.swing.Timer;
-import lombok.experimental.UtilityClass;
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.io.IOUtils;
 
 @UtilityClass
 @Log4j2

diff --git a/src/test/java/com/github/benchdoos/weblocopener/update/UpdaterHelperTest.java b/src/test/java/com/github/benchdoos/weblocopener/update/UpdaterHelperTest.java
@@ -3,7 +3,7 @@
 import com.github.benchdoos.weblocopener.base.BaseUnitTest;
 import com.github.benchdoos.weblocopener.utils.UpdateHelperUtil;
 import com.github.benchdoos.weblocopenercore.domain.version.UpdateInfo;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.util.StringUtils;