From 87199937c4865478d7ff78be3ce09682f741f771 Mon Sep 17 00:00:00 2001
From: Bondar Bogdan <36962546+bogdan-bondar@users.noreply.github.com>
Date: Mon, 30 Aug 2021 15:39:23 +0200
Subject: [PATCH] Dependency upgrades (#1170)

* Increase jsoup version

Signed-off-by: Bogdan Bondar <Bogdan.Bondar@bosch.io>

* bumped vaadin/guava/common-io to newest versions

Signed-off-by: Bogdan Bondar <Bogdan.Bondar@bosch.io>

* substituted deprecated guava create temp dir method

Signed-off-by: Bogdan Bondar <Bogdan.Bondar@bosch.io>
---
 .../ArtifactFilesystemRepositoryTest.java        |  7 +++----
 .../test/util/AbstractIntegrationTest.java       | 16 +++++++++++-----
 pom.xml                                          |  8 ++++----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java
index 71c1e5b30..4118c553a 100644
--- a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java
+++ b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java
@@ -13,6 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.Random;
 
 import org.apache.commons.io.FileUtils;
@@ -25,8 +26,6 @@ import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.io.Files;
-
 import io.qameta.allure.Description;
 import io.qameta.allure.Feature;
 import io.qameta.allure.Story;
@@ -43,9 +42,9 @@ public class ArtifactFilesystemRepositoryTest {
     private static ArtifactFilesystemRepository artifactFilesystemRepository;
 
     @BeforeAll
-    public static void setup() {
+    public static void setup() throws IOException {
         artifactResourceProperties = new ArtifactFilesystemProperties();
-        artifactResourceProperties.setPath(Files.createTempDir().getAbsolutePath());
+        artifactResourceProperties.setPath(Files.createTempDirectory(null).toString());
 
         artifactFilesystemRepository = new ArtifactFilesystemRepository(artifactResourceProperties);
     }
diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
index 860d14e66..0ea641459 100644
--- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
+++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
@@ -15,6 +15,7 @@ import static org.eclipse.hawkbit.im.authentication.SpPermission.SpringEvalExpre
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.nio.file.Files;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.Collections;
@@ -88,10 +89,8 @@ import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.TestExecutionListeners.MergeMode;
 import org.springframework.test.context.TestPropertySource;
 
-import com.google.common.io.Files;
-
 @ActiveProfiles({ "test" })
-@ExtendWith({JUnitTestLoggerExtension.class, WithSpringAuthorityRule.class})
+@ExtendWith({ JUnitTestLoggerExtension.class, WithSpringAuthorityRule.class })
 @WithUser(principal = "bumlux", allSpPermissions = true, authorities = { CONTROLLER_ROLE, SYSTEM_ROLE })
 @SpringBootTest
 @ContextConfiguration(classes = { TestConfiguration.class, TestSupportBinderAutoConfiguration.class })
@@ -383,8 +382,15 @@ public abstract class AbstractIntegrationTest {
 
     }
 
-    private static String artifactDirectory = Files.createTempDir().getAbsolutePath() + "/"
-            + RandomStringUtils.randomAlphanumeric(20);
+    private static String artifactDirectory = createTempDir();
+
+    private static String createTempDir() {
+        try {
+            return Files.createTempDirectory(null).toString() + "/" + RandomStringUtils.randomAlphanumeric(20);
+        } catch (final IOException e) {
+            throw new IllegalStateException("Failed to create temp directory");
+        }
+    }
 
     @AfterEach
     public void cleanUp() {
diff --git a/pom.xml b/pom.xml
index 68c92ad8e..f42694413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@
        <!-- Spring boot version overrides - END -->
 
       <!-- Vaadin versions - START -->
-      <vaadin.version>8.12.3</vaadin.version>
+      <vaadin.version>8.13.3</vaadin.version>
       <vaadin.spring.version>3.2.1</vaadin.spring.version>
       <vaadin.spring.addon.version>2.0.0.RELEASE</vaadin.spring.addon.version>
       <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
@@ -163,15 +163,15 @@
 
       <!-- Misc libraries versions - START -->      
       <cron-utils.version>9.1.3</cron-utils.version>
-      <jsoup.version>1.11.2</jsoup.version>
+      <jsoup.version>1.14.2</jsoup.version>
       <allure.version>2.13.6</allure.version>
       <eclipselink.version>2.7.3</eclipselink.version>
       <gwtmockito.version>1.1.8</gwtmockito.version>
-      <guava.version>25.0-jre</guava.version>
+      <guava.version>30.1.1-jre</guava.version>
       <javax.el-api.version>2.2.4</javax.el-api.version>
       <corn-cps.version>1.1.7</corn-cps.version>
       <jlorem.version>1.1</jlorem.version>
-      <commons-io.version>2.5</commons-io.version>
+      <commons-io.version>2.11.0</commons-io.version>
       <rsql-parser.version>2.1.0</rsql-parser.version>
       <awaitility.version>3.1.2</awaitility.version>
       <io-protostuff.version>1.5.6</io-protostuff.version>