From 109854956ba6216a915c16ab1c0e77ce066612e2 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Fri, 8 Nov 2024 13:40:06 +0200 Subject: [PATCH] Remove commons-io dependency from hawkbit-core (#1968) Signed-off-by: Avgustin Marinov --- hawkbit-core/pom.xml | 6 ------ .../artifact/repository/AbstractArtifactRepository.java | 4 +--- hawkbit-rest/hawkbit-rest-core/pom.xml | 5 +++++ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/hawkbit-core/pom.xml b/hawkbit-core/pom.xml index 74b532cfe..23f16bbfc 100644 --- a/hawkbit-core/pom.xml +++ b/hawkbit-core/pom.xml @@ -33,11 +33,6 @@ jakarta.validation jakarta.validation-api - - commons-io - commons-io - ${commons-io.version} - @@ -56,5 +51,4 @@ test - \ No newline at end of file diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java index 0e5f53721..0f6040757 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java @@ -22,11 +22,9 @@ import java.security.NoSuchAlgorithmException; import java.util.HexFormat; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.io.IOUtils; import org.eclipse.hawkbit.artifact.repository.model.AbstractDbArtifact; import org.eclipse.hawkbit.artifact.repository.model.DbArtifactHash; import org.springframework.util.ObjectUtils; -import org.springframework.util.StringUtils; /** * Abstract utility class for ArtifactRepository implementations with common @@ -98,7 +96,7 @@ public abstract class AbstractArtifactRepository implements ArtifactRepository { protected String storeTempFile(final InputStream content) throws IOException { final File file = createTempFile(); try (final OutputStream outputstream = new BufferedOutputStream(new FileOutputStream(file))) { - IOUtils.copy(content, outputstream); + content.transferTo(outputstream); outputstream.flush(); } return file.getPath(); diff --git a/hawkbit-rest/hawkbit-rest-core/pom.xml b/hawkbit-rest/hawkbit-rest-core/pom.xml index e7e888c44..d8aac620c 100644 --- a/hawkbit-rest/hawkbit-rest-core/pom.xml +++ b/hawkbit-rest/hawkbit-rest-core/pom.xml @@ -31,6 +31,11 @@ org.apache.commons commons-lang3 + + commons-io + commons-io + ${commons-io.version} + org.springframework.boot spring-boot-starter-web