From cf5b91cfd35d2a1ed29d0923e4627bd882117bed Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Tue, 12 Nov 2024 13:47:28 +0200 Subject: [PATCH] Fix ArtifactFilesystemConfiguration auto configuration (#2018) Signed-off-by: Avgustin Marinov --- .../filesystem}/ArtifactFilesystemConfiguration.java | 5 ++++- ...ingframework.boot.autoconfigure.AutoConfiguration.imports | 2 +- ...ingframework.boot.autoconfigure.AutoConfiguration.imports | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) rename hawkbit-artifact/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/{artifact/repository => autoconfigure/artifact/repository/filesystem}/ArtifactFilesystemConfiguration.java (80%) diff --git a/hawkbit-artifact/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemConfiguration.java b/hawkbit-artifact/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/autoconfigure/artifact/repository/filesystem/ArtifactFilesystemConfiguration.java similarity index 80% rename from hawkbit-artifact/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemConfiguration.java rename to hawkbit-artifact/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/autoconfigure/artifact/repository/filesystem/ArtifactFilesystemConfiguration.java index 084942e89..97460fc68 100644 --- a/hawkbit-artifact/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemConfiguration.java +++ b/hawkbit-artifact/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/autoconfigure/artifact/repository/filesystem/ArtifactFilesystemConfiguration.java @@ -7,8 +7,11 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.artifact.repository; +package org.eclipse.hawkbit.autoconfigure.artifact.repository.filesystem; +import org.eclipse.hawkbit.artifact.repository.ArtifactFilesystemProperties; +import org.eclipse.hawkbit.artifact.repository.ArtifactFilesystemRepository; +import org.eclipse.hawkbit.artifact.repository.ArtifactRepository; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/hawkbit-artifact/hawkbit-artifact-repository-filesystem/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hawkbit-artifact/hawkbit-artifact-repository-filesystem/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index cb425ea65..fd9f6adb3 100644 --- a/hawkbit-artifact/hawkbit-artifact-repository-filesystem/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/hawkbit-artifact/hawkbit-artifact-repository-filesystem/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -org.eclipse.hawkbit.artifact.repository.ArtifactFilesystemConfiguration \ No newline at end of file +org.eclipse.hawkbit.autoconfigure.artifact.repository.filesystem.ArtifactFilesystemConfiguration \ No newline at end of file diff --git a/hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 838bd209f..1dd95aab0 100644 --- a/hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,7 +1,6 @@ org.eclipse.hawkbit.autoconfigure.artifact.ArtifactUrlHandlerAutoConfiguration org.eclipse.hawkbit.autoconfigure.cache.CacheAutoConfiguration org.eclipse.hawkbit.autoconfigure.repository.event.EventPublisherAutoConfiguration -org.eclipse.hawkbit.autoconfigure.repository.ArtifactFilesystemAutoConfiguration org.eclipse.hawkbit.autoconfigure.repository.JpaRepositoryAutoConfiguration org.eclipse.hawkbit.autoconfigure.scheduling.AsyncConfigurerAutoConfiguration org.eclipse.hawkbit.autoconfigure.scheduling.ExecutorAutoConfiguration