From 849ea2463279377cd70292ad6311c024188f7b38 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Tue, 12 Nov 2024 12:50:36 +0200 Subject: [PATCH] Security artifacts moved in hawkbit-security-parent (#2016) Signed-off-by: Avgustin Marinov --- .../hawkbit-security-controller}/pom.xml | 3 +- ...bstractControllerAuthenticationFilter.java | 0 ...lerPreAuthenticateSecurityTokenFilter.java | 0 ...llerPreAuthenticatedAnonymousDownload.java | 0 ...rollerPreAuthenticatedAnonymousFilter.java | 0 ...thenticatedGatewaySecurityTokenFilter.java | 0 ...rPreAuthenticatedSecurityHeaderFilter.java | 0 .../controller/ControllerSecurityToken.java | 0 .../controller/HeaderAuthentication.java | 0 ...okenSourceTrustAuthenticationProvider.java | 0 .../controller/PreAuthenticationFilter.java | 0 .../TenantAwareWebAuthenticationDetails.java | 0 ...PreAuthenticatedAnonymousDownloadTest.java | 0 ...AuthenticatedSecurityHeaderFilterTest.java | 0 .../hawkbit-security-core}/pom.xml | 5 ++-- .../im/authentication/SpPermission.java | 0 .../hawkbit/im/authentication/SpRole.java | 0 .../StaticAuthenticationProvider.java | 0 .../security/DdiSecurityProperties.java | 0 .../security/HawkbitSecurityProperties.java | 0 .../InMemoryUserAuthoritiesResolver.java | 0 .../eclipse/hawkbit/security/MdcHandler.java | 0 .../hawkbit/security/SecurityConstants.java | 0 .../security/SecurityContextSerializer.java | 0 .../security/SecurityContextTenantAware.java | 0 .../security/SecurityTokenGenerator.java | 0 .../security/SpringSecurityAuditorAware.java | 0 .../security/SystemSecurityContext.java | 0 .../java/org/eclipse/hawkbit/util/IpUtil.java | 0 .../org/eclipse/hawkbit/util/UrlUtils.java | 0 .../im/authentication/SpPermissionTest.java | 0 .../org/eclipse/hawkbit/util/IpUtilTest.java | 0 hawkbit-security/pom.xml | 29 +++++++++++++++++++ pom.xml | 5 ++-- 34 files changed, 36 insertions(+), 6 deletions(-) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/pom.xml (96%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/main/java/org/eclipse/hawkbit/security/controller/AbstractControllerAuthenticationFilter.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticateSecurityTokenFilter.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousDownload.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousFilter.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedGatewaySecurityTokenFilter.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilter.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/main/java/org/eclipse/hawkbit/security/controller/ControllerSecurityToken.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/main/java/org/eclipse/hawkbit/security/controller/HeaderAuthentication.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/main/java/org/eclipse/hawkbit/security/controller/PreAuthTokenSourceTrustAuthenticationProvider.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/main/java/org/eclipse/hawkbit/security/controller/PreAuthenticationFilter.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/main/java/org/eclipse/hawkbit/security/controller/TenantAwareWebAuthenticationDetails.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousDownloadTest.java (100%) rename {hawkbit-security-controller => hawkbit-security/hawkbit-security-controller}/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilterTest.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/pom.xml (94%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/im/authentication/SpRole.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/im/authentication/StaticAuthenticationProvider.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/security/DdiSecurityProperties.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/security/InMemoryUserAuthoritiesResolver.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/security/MdcHandler.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/security/SecurityConstants.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/security/SecurityContextSerializer.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/security/SecurityTokenGenerator.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/util/IpUtil.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/main/java/org/eclipse/hawkbit/util/UrlUtils.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/test/java/org/eclipse/hawkbit/im/authentication/SpPermissionTest.java (100%) rename {hawkbit-security-core => hawkbit-security/hawkbit-security-core}/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java (100%) create mode 100644 hawkbit-security/pom.xml diff --git a/hawkbit-security-controller/pom.xml b/hawkbit-security/hawkbit-security-controller/pom.xml similarity index 96% rename from hawkbit-security-controller/pom.xml rename to hawkbit-security/hawkbit-security-controller/pom.xml index 8b6d24521..80ccaa135 100644 --- a/hawkbit-security-controller/pom.xml +++ b/hawkbit-security/hawkbit-security-controller/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.hawkbit - hawkbit-parent + hawkbit-security-parent ${revision} @@ -32,6 +32,7 @@ org.springframework.security spring-security-web + jakarta.servlet jakarta.servlet-api diff --git a/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/AbstractControllerAuthenticationFilter.java b/hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/AbstractControllerAuthenticationFilter.java similarity index 100% rename from hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/AbstractControllerAuthenticationFilter.java rename to hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/AbstractControllerAuthenticationFilter.java diff --git a/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticateSecurityTokenFilter.java b/hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticateSecurityTokenFilter.java similarity index 100% rename from hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticateSecurityTokenFilter.java rename to hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticateSecurityTokenFilter.java diff --git a/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousDownload.java b/hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousDownload.java similarity index 100% rename from hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousDownload.java rename to hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousDownload.java diff --git a/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousFilter.java b/hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousFilter.java similarity index 100% rename from hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousFilter.java rename to hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousFilter.java diff --git a/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedGatewaySecurityTokenFilter.java b/hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedGatewaySecurityTokenFilter.java similarity index 100% rename from hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedGatewaySecurityTokenFilter.java rename to hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedGatewaySecurityTokenFilter.java diff --git a/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilter.java b/hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilter.java similarity index 100% rename from hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilter.java rename to hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilter.java diff --git a/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerSecurityToken.java b/hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerSecurityToken.java similarity index 100% rename from hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerSecurityToken.java rename to hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/ControllerSecurityToken.java diff --git a/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/HeaderAuthentication.java b/hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/HeaderAuthentication.java similarity index 100% rename from hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/HeaderAuthentication.java rename to hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/HeaderAuthentication.java diff --git a/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/PreAuthTokenSourceTrustAuthenticationProvider.java b/hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/PreAuthTokenSourceTrustAuthenticationProvider.java similarity index 100% rename from hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/PreAuthTokenSourceTrustAuthenticationProvider.java rename to hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/PreAuthTokenSourceTrustAuthenticationProvider.java diff --git a/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/PreAuthenticationFilter.java b/hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/PreAuthenticationFilter.java similarity index 100% rename from hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/PreAuthenticationFilter.java rename to hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/PreAuthenticationFilter.java diff --git a/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/TenantAwareWebAuthenticationDetails.java b/hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/TenantAwareWebAuthenticationDetails.java similarity index 100% rename from hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/TenantAwareWebAuthenticationDetails.java rename to hawkbit-security/hawkbit-security-controller/src/main/java/org/eclipse/hawkbit/security/controller/TenantAwareWebAuthenticationDetails.java diff --git a/hawkbit-security-controller/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousDownloadTest.java b/hawkbit-security/hawkbit-security-controller/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousDownloadTest.java similarity index 100% rename from hawkbit-security-controller/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousDownloadTest.java rename to hawkbit-security/hawkbit-security-controller/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedAnonymousDownloadTest.java diff --git a/hawkbit-security-controller/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilterTest.java b/hawkbit-security/hawkbit-security-controller/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilterTest.java similarity index 100% rename from hawkbit-security-controller/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilterTest.java rename to hawkbit-security/hawkbit-security-controller/src/test/java/org/eclipse/hawkbit/security/controller/ControllerPreAuthenticatedSecurityHeaderFilterTest.java diff --git a/hawkbit-security-core/pom.xml b/hawkbit-security/hawkbit-security-core/pom.xml similarity index 94% rename from hawkbit-security-core/pom.xml rename to hawkbit-security/hawkbit-security-core/pom.xml index 094b4bd25..28e965b35 100644 --- a/hawkbit-security-core/pom.xml +++ b/hawkbit-security/hawkbit-security-core/pom.xml @@ -14,11 +14,12 @@ 4.0.0 org.eclipse.hawkbit - hawkbit-parent + hawkbit-security-parent ${revision} + hawkbit-security-core - hawkBit :: Core Security + hawkBit :: Security :: Core diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpRole.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpRole.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpRole.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpRole.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/StaticAuthenticationProvider.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/StaticAuthenticationProvider.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/StaticAuthenticationProvider.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/StaticAuthenticationProvider.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/DdiSecurityProperties.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/DdiSecurityProperties.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/DdiSecurityProperties.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/DdiSecurityProperties.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/HawkbitSecurityProperties.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/InMemoryUserAuthoritiesResolver.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/InMemoryUserAuthoritiesResolver.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/InMemoryUserAuthoritiesResolver.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/InMemoryUserAuthoritiesResolver.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MdcHandler.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MdcHandler.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MdcHandler.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MdcHandler.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityConstants.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityConstants.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityConstants.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityConstants.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextSerializer.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextSerializer.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextSerializer.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextSerializer.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityContextTenantAware.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityTokenGenerator.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityTokenGenerator.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityTokenGenerator.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SecurityTokenGenerator.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/util/IpUtil.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/util/IpUtil.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/util/IpUtil.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/util/IpUtil.java diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/util/UrlUtils.java b/hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/util/UrlUtils.java similarity index 100% rename from hawkbit-security-core/src/main/java/org/eclipse/hawkbit/util/UrlUtils.java rename to hawkbit-security/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/util/UrlUtils.java diff --git a/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/SpPermissionTest.java b/hawkbit-security/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/SpPermissionTest.java similarity index 100% rename from hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/SpPermissionTest.java rename to hawkbit-security/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/SpPermissionTest.java diff --git a/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java b/hawkbit-security/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java similarity index 100% rename from hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java rename to hawkbit-security/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java diff --git a/hawkbit-security/pom.xml b/hawkbit-security/pom.xml new file mode 100644 index 000000000..4087d71f3 --- /dev/null +++ b/hawkbit-security/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + org.eclipse.hawkbit + hawkbit-parent + ${revision} + + + hawkbit-security-parent + hawkBit :: Security + pom + + + hawkbit-security-core + hawkbit-security-controller + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8e0f898b6..4d96e0b86 100644 --- a/pom.xml +++ b/pom.xml @@ -133,13 +133,12 @@ hawkbit-core - hawkbit-security-core - hawkbit-security-controller + hawkbit-rest-core + hawkbit-security hawkbit-artifact hawkbit-repository hawkbit-autoconfigure - hawkbit-rest-core hawkbit-mgmt hawkbit-ddi hawkbit-dmf