Resolve Bean overriding issues

- Split the repositories into two, sub-packages (map and jpa) to prevent double scanning while canning for Map and Jpa repositories - Ensure that the Skipper auto configuration is started before the EorrorMvcAutoconfiguration - Temporarily disable Skipper OAuth configuration in favor of SCDF like security configuration. Resolves #756
spring-cloud · Dec 6, 2018 · 74fb739 · 74fb739
1 parent ecfff7e
commit 74fb739
Show file tree

Hide file tree

Showing 53 changed files with 120 additions and 102 deletions.
diff --git a/...rg/springframework/cloud/skipper/server/autoconfigure/SkipperServerAutoConfiguration.java b/...rg/springframework/cloud/skipper/server/autoconfigure/SkipperServerAutoConfiguration.java
@@ -15,8 +15,10 @@
  */
 package org.springframework.cloud.skipper.server.autoconfigure;
 
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration;
 import org.springframework.cloud.skipper.server.config.EnableSkipperServerConfiguration;
 import org.springframework.cloud.skipper.server.config.SkipperServerConfiguration;
 import org.springframework.cloud.skipper.server.config.SkipperServerPlatformConfiguration;
@@ -31,6 +33,7 @@
  */
 @Configuration
 @ConditionalOnBean(EnableSkipperServerConfiguration.Marker.class)
+@AutoConfigureBefore(ErrorMvcAutoConfiguration.class)
 @Import({SkipperServerConfiguration.class, SkipperServerPlatformConfiguration.class,
 		SpringDataRestConfiguration.class})
 @ConditionalOnProperty(prefix = "spring.cloud.skipper.server", name = "enabled", havingValue = "true", matchIfMissing = true)

diff --git a/.../java/org/springframework/cloud/skipper/deployer/cloudfoundry/CloudFoundryDeleteStep.java b/.../java/org/springframework/cloud/skipper/deployer/cloudfoundry/CloudFoundryDeleteStep.java
@@ -26,7 +26,7 @@
 import org.springframework.cloud.skipper.domain.Status;
 import org.springframework.cloud.skipper.domain.StatusCode;
 import org.springframework.cloud.skipper.server.domain.AppDeployerData;
-import org.springframework.cloud.skipper.server.repository.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.ReleaseRepository;
 
 /**
  * Responsible for deleting the provided list of applications and updating the status of

diff --git a/...va/org/springframework/cloud/skipper/deployer/cloudfoundry/CloudFoundryDeployAppStep.java b/...va/org/springframework/cloud/skipper/deployer/cloudfoundry/CloudFoundryDeployAppStep.java
@@ -30,8 +30,8 @@
 import org.springframework.cloud.skipper.domain.StatusCode;
 import org.springframework.cloud.skipper.server.deployer.ReleaseAnalysisReport;
 import org.springframework.cloud.skipper.server.domain.AppDeployerData;
-import org.springframework.cloud.skipper.server.repository.AppDeployerDataRepository;
-import org.springframework.cloud.skipper.server.repository.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.AppDeployerDataRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.ReleaseRepository;
 import org.springframework.cloud.skipper.server.util.ArgumentSanitizer;
 import org.springframework.dao.DataAccessException;
 import org.springframework.transaction.annotation.Transactional;

diff --git a/...pringframework/cloud/skipper/deployer/cloudfoundry/CloudFoundryHandleHealthCheckStep.java b/...pringframework/cloud/skipper/deployer/cloudfoundry/CloudFoundryHandleHealthCheckStep.java
@@ -26,8 +26,8 @@
 import org.springframework.cloud.skipper.server.deployer.ReleaseManager;
 import org.springframework.cloud.skipper.server.deployer.ReleaseManagerFactory;
 import org.springframework.cloud.skipper.server.domain.AppDeployerData;
-import org.springframework.cloud.skipper.server.repository.AppDeployerDataRepository;
-import org.springframework.cloud.skipper.server.repository.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.AppDeployerDataRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.ReleaseRepository;
 import org.springframework.cloud.skipper.server.util.ManifestUtils;
 import org.springframework.dao.DataAccessException;
 import org.springframework.transaction.annotation.Transactional;

diff --git a/...a/org/springframework/cloud/skipper/deployer/cloudfoundry/CloudFoundryReleaseManager.java b/...a/org/springframework/cloud/skipper/deployer/cloudfoundry/CloudFoundryReleaseManager.java
@@ -34,8 +34,8 @@
 import org.springframework.cloud.skipper.server.deployer.ReleaseAnalysisReport;
 import org.springframework.cloud.skipper.server.deployer.ReleaseManager;
 import org.springframework.cloud.skipper.server.domain.AppDeployerData;
-import org.springframework.cloud.skipper.server.repository.AppDeployerDataRepository;
-import org.springframework.cloud.skipper.server.repository.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.AppDeployerDataRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.ReleaseRepository;
 import org.springframework.cloud.skipper.server.util.ArgumentSanitizer;
 import org.springframework.util.Assert;
 

diff --git a/...framework/cloud/skipper/deployer/cloudfoundry/CloudFoundrySkipperServerConfiguration.java b/...framework/cloud/skipper/deployer/cloudfoundry/CloudFoundrySkipperServerConfiguration.java
@@ -18,8 +18,8 @@
 import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader;
 import org.springframework.cloud.skipper.domain.CloudFoundryApplicationManifestReader;
 import org.springframework.cloud.skipper.server.deployer.ReleaseManagerFactory;
-import org.springframework.cloud.skipper.server.repository.AppDeployerDataRepository;
-import org.springframework.cloud.skipper.server.repository.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.AppDeployerDataRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.ReleaseRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

diff --git a/.../src/main/java/org/springframework/cloud/skipper/server/config/SecurityConfiguration.java b/.../src/main/java/org/springframework/cloud/skipper/server/config/SecurityConfiguration.java
@@ -16,14 +16,20 @@
 
 package org.springframework.cloud.skipper.server.config;
 
-import org.springframework.cloud.skipper.server.config.security.SkipperOAuthSecurityConfiguration;
+import org.springframework.cloud.common.security.BasicAuthSecurityConfiguration;
+import org.springframework.cloud.common.security.DefaultBootUserAuthenticationConfiguration;
+import org.springframework.cloud.common.security.IgnoreAllSecurityConfiguration;
+import org.springframework.cloud.common.security.OAuthSecurityConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 /**
  * @author Gunnar Hillert
  */
 @Configuration
-@Import({ SkipperOAuthSecurityConfiguration.class })
+// TODO Tzolov
+@Import({ BasicAuthSecurityConfiguration.class, DefaultBootUserAuthenticationConfiguration.class,
+		OAuthSecurityConfiguration.class, IgnoreAllSecurityConfiguration.class })
+// @Import({ SkipperOAuthSecurityConfiguration.class })
 public class SecurityConfiguration {
 }
diff --git a/...main/java/org/springframework/cloud/skipper/server/config/SkipperServerConfiguration.java b/...main/java/org/springframework/cloud/skipper/server/config/SkipperServerConfiguration.java
@@ -63,11 +63,11 @@
 import org.springframework.cloud.skipper.server.index.PackageMetadataResourceProcessor;
 import org.springframework.cloud.skipper.server.index.PackageSummaryResourceProcessor;
 import org.springframework.cloud.skipper.server.index.SkipperLinksResourceProcessor;
-import org.springframework.cloud.skipper.server.repository.AppDeployerDataRepository;
-import org.springframework.cloud.skipper.server.repository.DeployerRepository;
-import org.springframework.cloud.skipper.server.repository.PackageMetadataRepository;
-import org.springframework.cloud.skipper.server.repository.ReleaseRepository;
-import org.springframework.cloud.skipper.server.repository.RepositoryRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.AppDeployerDataRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.PackageMetadataRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.RepositoryRepository;
+import org.springframework.cloud.skipper.server.repository.map.DeployerRepository;
 import org.springframework.cloud.skipper.server.service.PackageMetadataService;
 import org.springframework.cloud.skipper.server.service.PackageService;
 import org.springframework.cloud.skipper.server.service.ReleaseReportService;
@@ -102,10 +102,9 @@
 @EnableConfigurationProperties({ SkipperServerProperties.class, VersionInfoProperties.class,
 		LocalPlatformProperties.class, /* CloudFoundryPlatformProperties.class, */ MavenConfigurationProperties.class,
 		HealthCheckProperties.class })
-@EntityScan({ "org.springframework.cloud.skipper.domain",
-		"org.springframework.cloud.skipper.server.domain" })
-@EnableMapRepositories(basePackages = "org.springframework.cloud.skipper.server.repository")
-@EnableJpaRepositories(basePackages = "org.springframework.cloud.skipper.server.repository")
+@EntityScan({ "org.springframework.cloud.skipper.domain", "org.springframework.cloud.skipper.server.domain" })
+@EnableMapRepositories(basePackages = "org.springframework.cloud.skipper.server.repository.map")
+@EnableJpaRepositories(basePackages = "org.springframework.cloud.skipper.server.repository.jpa")
 @EnableTransactionManagement
 @EnableAsync
 @Import({ StateMachinePersistConfiguration.class, StateMachineExecutorConfiguration.class,

diff --git a/...a/org/springframework/cloud/skipper/server/config/SkipperServerPlatformConfiguration.java b/...a/org/springframework/cloud/skipper/server/config/SkipperServerPlatformConfiguration.java
@@ -24,7 +24,7 @@
 import org.springframework.cloud.deployer.spi.local.LocalDeployerProperties;
 import org.springframework.cloud.skipper.domain.Deployer;
 import org.springframework.cloud.skipper.domain.Platform;
-import org.springframework.cloud.skipper.server.repository.DeployerRepository;
+import org.springframework.cloud.skipper.server.repository.map.DeployerRepository;
 import org.springframework.cloud.skipper.server.service.DeployerInitializationService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...rc/main/java/org/springframework/cloud/skipper/server/deployer/DefaultReleaseManager.java b/...rc/main/java/org/springframework/cloud/skipper/server/deployer/DefaultReleaseManager.java
@@ -41,9 +41,9 @@
 import org.springframework.cloud.skipper.domain.Status;
 import org.springframework.cloud.skipper.domain.StatusCode;
 import org.springframework.cloud.skipper.server.domain.AppDeployerData;
-import org.springframework.cloud.skipper.server.repository.AppDeployerDataRepository;
-import org.springframework.cloud.skipper.server.repository.DeployerRepository;
-import org.springframework.cloud.skipper.server.repository.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.AppDeployerDataRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.map.DeployerRepository;
 import org.springframework.cloud.skipper.server.util.ArgumentSanitizer;
 import org.springframework.cloud.skipper.server.util.ConfigValueUtils;
 import org.springframework.cloud.skipper.server.util.ManifestUtils;

diff --git a/...rc/main/java/org/springframework/cloud/skipper/server/deployer/strategies/DeleteStep.java b/...rc/main/java/org/springframework/cloud/skipper/server/deployer/strategies/DeleteStep.java
@@ -28,8 +28,8 @@
 import org.springframework.cloud.skipper.domain.Status;
 import org.springframework.cloud.skipper.domain.StatusCode;
 import org.springframework.cloud.skipper.server.domain.AppDeployerData;
-import org.springframework.cloud.skipper.server.repository.DeployerRepository;
-import org.springframework.cloud.skipper.server.repository.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.map.DeployerRepository;
 
 /**
  * Responsible for deleting the provided list of applications and updating the status of

diff --git a/...main/java/org/springframework/cloud/skipper/server/deployer/strategies/DeployAppStep.java b/...main/java/org/springframework/cloud/skipper/server/deployer/strategies/DeployAppStep.java
@@ -30,9 +30,9 @@
 import org.springframework.cloud.skipper.server.deployer.AppDeploymentRequestFactory;
 import org.springframework.cloud.skipper.server.deployer.ReleaseAnalysisReport;
 import org.springframework.cloud.skipper.server.domain.AppDeployerData;
-import org.springframework.cloud.skipper.server.repository.AppDeployerDataRepository;
-import org.springframework.cloud.skipper.server.repository.DeployerRepository;
-import org.springframework.cloud.skipper.server.repository.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.AppDeployerDataRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.map.DeployerRepository;
 import org.springframework.dao.DataAccessException;
 import org.springframework.transaction.annotation.Transactional;
 

diff --git a/...a/org/springframework/cloud/skipper/server/deployer/strategies/HandleHealthCheckStep.java b/...a/org/springframework/cloud/skipper/server/deployer/strategies/HandleHealthCheckStep.java
@@ -26,8 +26,8 @@
 import org.springframework.cloud.skipper.server.deployer.ReleaseManager;
 import org.springframework.cloud.skipper.server.deployer.ReleaseManagerFactory;
 import org.springframework.cloud.skipper.server.domain.AppDeployerData;
-import org.springframework.cloud.skipper.server.repository.AppDeployerDataRepository;
-import org.springframework.cloud.skipper.server.repository.ReleaseRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.AppDeployerDataRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.ReleaseRepository;
 import org.springframework.cloud.skipper.server.util.ManifestUtils;
 import org.springframework.dao.DataAccessException;
 import org.springframework.transaction.annotation.Transactional;

diff --git a/...in/java/org/springframework/cloud/skipper/server/deployer/strategies/HealthCheckStep.java b/...in/java/org/springframework/cloud/skipper/server/deployer/strategies/HealthCheckStep.java
@@ -26,8 +26,8 @@
 import org.springframework.cloud.skipper.domain.Release;
 import org.springframework.cloud.skipper.domain.SpringCloudDeployerApplicationManifestReader;
 import org.springframework.cloud.skipper.server.domain.AppDeployerData;
-import org.springframework.cloud.skipper.server.repository.AppDeployerDataRepository;
-import org.springframework.cloud.skipper.server.repository.DeployerRepository;
+import org.springframework.cloud.skipper.server.repository.jpa.AppDeployerDataRepository;
+import org.springframework.cloud.skipper.server.repository.map.DeployerRepository;
 
 /**
  * Checks if the apps in the Replacing release are healthy. Health polling values are set

diff --git a/...repository/AppDeployerDataRepository.java → ...sitory/jpa/AppDeployerDataRepository.java b/...repository/AppDeployerDataRepository.java → ...sitory/jpa/AppDeployerDataRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.jpa;
 
 import org.springframework.cloud.skipper.server.domain.AppDeployerData;
 import org.springframework.data.repository.PagingAndSortingRepository;

diff --git a/...tory/AppDeployerDataRepositoryCustom.java → .../jpa/AppDeployerDataRepositoryCustom.java b/...tory/AppDeployerDataRepositoryCustom.java → .../jpa/AppDeployerDataRepositoryCustom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.jpa;
 
 import org.springframework.cloud.skipper.server.domain.AppDeployerData;
 

diff --git a/...sitory/AppDeployerDataRepositoryImpl.java → ...ry/jpa/AppDeployerDataRepositoryImpl.java b/...sitory/AppDeployerDataRepositoryImpl.java → ...ry/jpa/AppDeployerDataRepositoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.jpa;
 
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/...repository/PackageMetadataRepository.java → ...sitory/jpa/PackageMetadataRepository.java b/...repository/PackageMetadataRepository.java → ...sitory/jpa/PackageMetadataRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.jpa;
 
 import java.util.List;
 

diff --git a/...tory/PackageMetadataRepositoryCustom.java → .../jpa/PackageMetadataRepositoryCustom.java b/...tory/PackageMetadataRepositoryCustom.java → .../jpa/PackageMetadataRepositoryCustom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.jpa;
 
 import java.util.List;
 

diff --git a/...sitory/PackageMetadataRepositoryImpl.java → ...ry/jpa/PackageMetadataRepositoryImpl.java b/...sitory/PackageMetadataRepositoryImpl.java → ...ry/jpa/PackageMetadataRepositoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.jpa;
 
 import java.util.List;
 

diff --git a/.../server/repository/ReleaseRepository.java → ...ver/repository/jpa/ReleaseRepository.java b/.../server/repository/ReleaseRepository.java → ...ver/repository/jpa/ReleaseRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.jpa;
 
 import java.util.List;
 

diff --git a/...r/repository/ReleaseRepositoryCustom.java → ...pository/jpa/ReleaseRepositoryCustom.java b/...r/repository/ReleaseRepositoryCustom.java → ...pository/jpa/ReleaseRepositoryCustom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.jpa;
 
 import java.util.List;
 

diff --git a/...ver/repository/ReleaseRepositoryImpl.java → ...repository/jpa/ReleaseRepositoryImpl.java b/...ver/repository/ReleaseRepositoryImpl.java → ...repository/jpa/ReleaseRepositoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.jpa;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...rver/repository/RepositoryRepository.java → .../repository/jpa/RepositoryRepository.java b/...rver/repository/RepositoryRepository.java → .../repository/jpa/RepositoryRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.jpa;
 
 import java.util.List;
 

diff --git a/...server/repository/DeployerRepository.java → ...er/repository/map/DeployerRepository.java b/...server/repository/DeployerRepository.java → ...er/repository/map/DeployerRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.map;
 
 import org.springframework.cloud.skipper.domain.Deployer;
 import org.springframework.data.repository.PagingAndSortingRepository;

diff --git a/.../repository/DeployerRepositoryCustom.java → ...ository/map/DeployerRepositoryCustom.java b/.../repository/DeployerRepositoryCustom.java → ...ository/map/DeployerRepositoryCustom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.skipper.server.repository;
+package org.springframework.cloud.skipper.server.repository.map;
 
 import org.springframework.cloud.skipper.SkipperException;
 import org.springframework.cloud.skipper.domain.Deployer;