From 111532dc4a59c2e7564621c592477fa867536572 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Tue, 3 Jan 2023 00:02:26 +0530 Subject: [PATCH] Revert "Java 16013 Add suffix legacy to spring-cloud-bootstrap module (#13218)" (#13231) This reverts commit 4c153707aa7837fe8b2dd4a80594db6c0862d341. --- spring-cloud-modules/pom.xml | 2 +- .../README.md | 0 .../application-config/book-service.properties | 0 .../application-config/discovery.properties | 0 .../application-config/gateway.properties | 0 .../application-config/rating-service.properties | 0 .../application-config/zipkin.properties | 0 .../config/pom.xml | 0 .../cloud/bootstrap/config/ConfigApplication.java | 0 .../cloud/bootstrap/config/SecurityConfig.java | 0 .../src/main/resources/application.properties | 0 .../config/src/main/resources/logback.xml | 0 .../test/java/com/baeldung/SpringContextTest.java | 0 .../customer-service/pom.xml | 0 .../java/com/baeldung/customerservice/Customer.java | 0 .../customerservice/CustomerApplication.java | 0 .../baeldung/customerservice/CustomerService.java | 0 .../src/main/resources/application.properties | 0 .../src/test/resources/application.properties | 0 .../discovery/pom.xml | 0 .../bootstrap/discovery/DiscoveryApplication.java | 0 .../cloud/bootstrap/discovery/SecurityConfig.java | 0 .../cloud/bootstrap/discovery/SessionConfig.java | 0 .../src/main/resources/bootstrap.properties | 0 .../discovery/src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextLiveTest.java | 0 .../gateway/pom.xml | 0 .../gateway/src/main/angular/ui/.angular-cli.json | 0 .../gateway/src/main/angular/ui/.editorconfig | 0 .../gateway/src/main/angular/ui/.gitignore | 0 .../gateway/src/main/angular/ui/README.md | 0 .../gateway/src/main/angular/ui/e2e/app.e2e-spec.ts | 0 .../gateway/src/main/angular/ui/e2e/app.po.ts | 0 .../src/main/angular/ui/e2e/tsconfig.e2e.json | 0 .../gateway/src/main/angular/ui/karma.conf.js | 0 .../gateway/src/main/angular/ui/package.json | 0 .../gateway/src/main/angular/ui/protractor.conf.js | 0 .../src/main/angular/ui/src/app/app.component.css | 0 .../src/main/angular/ui/src/app/app.component.html | 0 .../src/main/angular/ui/src/app/app.component.ts | 0 .../src/main/angular/ui/src/app/app.module.ts | 0 .../gateway/src/main/angular/ui/src/app/book.ts | 0 .../app/book/book-detail/book-detail.component.css | 0 .../app/book/book-detail/book-detail.component.html | 0 .../app/book/book-detail/book-detail.component.ts | 0 .../src/app/book/book-list/book-list.component.css | 0 .../src/app/book/book-list/book-list.component.html | 0 .../src/app/book/book-list/book-list.component.ts | 0 .../ui/src/app/click-stop-propagation.directive.ts | 0 .../src/main/angular/ui/src/app/http.service.ts | 0 .../src/main/angular/ui/src/app/principal.ts | 0 .../gateway/src/main/angular/ui/src/app/rating.ts | 0 .../angular/ui/src/app/rating/rating.component.css | 0 .../angular/ui/src/app/rating/rating.component.html | 0 .../angular/ui/src/app/rating/rating.component.ts | 0 .../gateway/src/main/angular/ui/src/assets/.gitkeep | 0 .../angular/ui/src/environments/environment.prod.ts | 0 .../main/angular/ui/src/environments/environment.ts | 0 .../gateway/src/main/angular/ui/src/favicon.ico | Bin .../gateway/src/main/angular/ui/src/index.html | 0 .../gateway/src/main/angular/ui/src/main.ts | 0 .../gateway/src/main/angular/ui/src/polyfills.ts | 0 .../gateway/src/main/angular/ui/src/styles.css | 0 .../gateway/src/main/angular/ui/src/test.ts | 0 .../src/main/angular/ui/src/tsconfig.app.json | 0 .../src/main/angular/ui/src/tsconfig.spec.json | 0 .../gateway/src/main/angular/ui/src/typings.d.ts | 0 .../gateway/src/main/angular/ui/tsconfig.json | 0 .../gateway/src/main/angular/ui/tslint.json | 0 .../bootstrap/gateway/AuthenticationController.java | 0 .../cloud/bootstrap/gateway/ErrorPageConfig.java | 0 .../cloud/bootstrap/gateway/GatewayApplication.java | 0 .../cloud/bootstrap/gateway/SecurityConfig.java | 0 .../cloud/bootstrap/gateway/SessionConfig.java | 0 .../cloud/bootstrap/gateway/client/book/Book.java | 0 .../bootstrap/gateway/client/book/BooksClient.java | 0 .../bootstrap/gateway/client/rating/Rating.java | 0 .../gateway/client/rating/RatingsClient.java | 0 .../gateway/controller/CombinedController.java | 0 .../gateway/filter/SessionSavingZuulPreFilter.java | 0 .../gateway/src/main/resources/bootstrap.properties | 0 .../gateway/src/main/resources/logback.xml | 0 .../src/main/resources/static/eureka/css/wro.css | 0 .../static/eureka/fonts/montserrat-webfont.eot | Bin .../static/eureka/fonts/montserrat-webfont.svg | 0 .../static/eureka/fonts/montserrat-webfont.ttf | Bin .../static/eureka/fonts/montserrat-webfont.woff | Bin .../static/eureka/fonts/varela_round-webfont.eot | Bin .../static/eureka/fonts/varela_round-webfont.svg | 0 .../static/eureka/fonts/varela_round-webfont.ttf | Bin .../static/eureka/fonts/varela_round-webfont.woff | Bin .../resources/static/eureka/images/404-icon.png | Bin .../resources/static/eureka/images/homepage-bg.jpg | Bin .../resources/static/eureka/images/platform-bg.png | Bin .../static/eureka/images/platform-spring-xd.png | Bin .../eureka/images/spring-logo-eureka-mobile.png | Bin .../static/eureka/images/spring-logo-eureka.png | Bin .../src/main/resources/static/eureka/js/wro.js | 0 .../src/main/resources/static/home/favicon.ico | Bin .../src/main/resources/static/home/index.html | 0 .../src/main/resources/static/home/inline.bundle.js | 0 .../main/resources/static/home/inline.bundle.js.map | 0 .../src/main/resources/static/home/main.bundle.js | 0 .../main/resources/static/home/main.bundle.js.map | 0 .../main/resources/static/home/polyfills.bundle.js | 0 .../resources/static/home/polyfills.bundle.js.map | 0 .../src/main/resources/static/home/styles.bundle.js | 0 .../main/resources/static/home/styles.bundle.js.map | 0 .../gateway/src/main/resources/static/index.html | 0 .../java/com/baeldung/SpringContextLiveTest.java | 0 .../spring/cloud/bootstrap/gateway/LiveTest.java | 0 .../bootstrap/gateway/SpringContextLiveTest.java | 0 .../gateway/src/test/resources/bootstrap.properties | 0 .../order-service/order-client/pom.xml | 0 .../baeldung/orderservice/client/OrderClient.java | 0 .../orderservice/client/OrderClientImpl.java | 0 .../com/baeldung/orderservice/client/OrderDTO.java | 0 .../baeldung/orderservice/client/OrderResponse.java | 0 .../src/main/resources/application.properties | 0 .../order-service/order-server/pom.xml | 0 .../main/java/com/baeldung/orderservice/Order.java | 0 .../com/baeldung/orderservice/OrderApplication.java | 0 .../com/baeldung/orderservice/OrderService.java | 0 .../src/main/resources/application.properties | 0 .../order-service/pom.xml | 0 .../pom.xml | 4 ++-- .../svc-book/pom.xml | 0 .../bootstrap/svcbook/BookServiceApplication.java | 0 .../spring/cloud/bootstrap/svcbook/DataLoader.java | 0 .../cloud/bootstrap/svcbook/SecurityConfig.java | 0 .../cloud/bootstrap/svcbook/SessionConfig.java | 0 .../spring/cloud/bootstrap/svcbook/book/Book.java | 0 .../bootstrap/svcbook/book/BookController.java | 0 .../svcbook/book/BookNotFoundException.java | 0 .../bootstrap/svcbook/book/BookRepository.java | 0 .../cloud/bootstrap/svcbook/book/BookService.java | 0 .../src/main/resources/bootstrap.properties | 0 .../svc-book/src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextLiveTest.java | 0 .../src/test/resources/bootstrap.properties | 0 .../svc-rating/pom.xml | 0 .../cloud/bootstrap/svcrating/DataLoader.java | 0 .../svcrating/RatingServiceApplication.java | 0 .../cloud/bootstrap/svcrating/SecurityConfig.java | 0 .../cloud/bootstrap/svcrating/SessionConfig.java | 0 .../cloud/bootstrap/svcrating/rating/Rating.java | 0 .../svcrating/rating/RatingCacheRepository.java | 0 .../svcrating/rating/RatingController.java | 0 .../svcrating/rating/RatingNotFoundException.java | 0 .../svcrating/rating/RatingRepository.java | 0 .../bootstrap/svcrating/rating/RatingService.java | 0 .../src/main/resources/bootstrap.properties | 0 .../svc-rating/src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextLiveTest.java | 0 .../src/test/resources/bootstrap.properties | 0 .../zipkin/pom.xml | 0 .../cloud/bootstrap/zipkin/ZipkinApplication.java | 0 .../zipkin/src/main/resources/bootstrap.properties | 0 .../zipkin/src/main/resources/logback.xml | 0 .../test/java/com/baeldung/SpringContextTest.java | 0 160 files changed, 3 insertions(+), 3 deletions(-) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/README.md (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/application-config/book-service.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/application-config/discovery.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/application-config/gateway.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/application-config/rating-service.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/application-config/zipkin.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/config/pom.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/config/src/main/resources/application.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/config/src/main/resources/logback.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/config/src/test/java/com/baeldung/SpringContextTest.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/customer-service/pom.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/customer-service/src/main/java/com/baeldung/customerservice/Customer.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/customer-service/src/main/resources/application.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/customer-service/src/test/resources/application.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/discovery/pom.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/discovery/src/main/resources/bootstrap.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/discovery/src/main/resources/logback.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/pom.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/.angular-cli.json (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/.editorconfig (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/.gitignore (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/README.md (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/e2e/app.po.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/karma.conf.js (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/package.json (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/protractor.conf.js (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/app.component.css (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/app.component.html (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/app.component.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/app.module.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/book.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/http.service.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/principal.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/rating.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/rating/rating.component.css (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/rating/rating.component.html (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/app/rating/rating.component.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/assets/.gitkeep (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/environments/environment.prod.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/environments/environment.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/favicon.ico (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/index.html (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/main.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/polyfills.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/styles.css (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/test.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/tsconfig.app.json (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/tsconfig.spec.json (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/src/typings.d.ts (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/tsconfig.json (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/angular/ui/tslint.json (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/bootstrap.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/logback.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/css/wro.css (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/images/404-icon.png (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/images/platform-bg.png (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/eureka/js/wro.js (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/home/favicon.ico (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/home/index.html (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/home/inline.bundle.js (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/home/inline.bundle.js.map (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/home/main.bundle.js (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/home/main.bundle.js.map (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/home/polyfills.bundle.js (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/home/polyfills.bundle.js.map (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/home/styles.bundle.js (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/home/styles.bundle.js.map (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/main/resources/static/index.html (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/gateway/src/test/resources/bootstrap.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/order-client/pom.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/order-client/src/main/resources/application.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/order-server/pom.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/order-server/src/main/resources/application.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/order-service/pom.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/pom.xml (89%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/pom.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/main/resources/bootstrap.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/main/resources/logback.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-book/src/test/resources/bootstrap.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/pom.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/resources/bootstrap.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/main/resources/logback.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/svc-rating/src/test/resources/bootstrap.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/zipkin/pom.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/zipkin/src/main/resources/bootstrap.properties (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/zipkin/src/main/resources/logback.xml (100%) rename spring-cloud-modules/{spring-cloud-bootstrap-legacy => spring-cloud-bootstrap}/zipkin/src/test/java/com/baeldung/SpringContextTest.java (100%) diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml index 2f5410b308..7a4eec679e 100644 --- a/spring-cloud-modules/pom.xml +++ b/spring-cloud-modules/pom.xml @@ -21,7 +21,7 @@ spring-cloud-config spring-cloud-eureka spring-cloud-hystrix - spring-cloud-bootstrap-legacy + spring-cloud-bootstrap spring-cloud-ribbon-client spring-cloud-zookeeper spring-cloud-gateway diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/README.md b/spring-cloud-modules/spring-cloud-bootstrap/README.md similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/README.md rename to spring-cloud-modules/spring-cloud-bootstrap/README.md diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/application-config/book-service.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/book-service.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/application-config/book-service.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/book-service.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/application-config/discovery.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/discovery.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/application-config/discovery.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/discovery.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/application-config/gateway.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/gateway.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/application-config/gateway.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/gateway.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/application-config/rating-service.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/rating-service.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/application-config/rating-service.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/rating-service.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/application-config/zipkin.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/zipkin.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/application-config/zipkin.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/zipkin.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/config/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/config/pom.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/config/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/config/pom.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/config/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/config/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/config/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/config/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/config/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/config/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/pom.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/pom.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/src/main/java/com/baeldung/customerservice/Customer.java b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/src/main/java/com/baeldung/customerservice/Customer.java rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/customer-service/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/discovery/pom.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/pom.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/gateway/pom.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/pom.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/.angular-cli.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/.angular-cli.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/.editorconfig b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/.editorconfig rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/.gitignore b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/.gitignore rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/README.md b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/README.md rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/e2e/app.po.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/e2e/app.po.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/karma.conf.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/karma.conf.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/package.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/package.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/protractor.conf.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/protractor.conf.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/app.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/app.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/app.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/app.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/app.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/app.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/app.module.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/app.module.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/http.service.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/http.service.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/principal.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/principal.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/rating.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/rating.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/rating/rating.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/rating/rating.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/rating/rating.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/rating/rating.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/rating/rating.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/app/rating/rating.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/assets/.gitkeep b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/assets/.gitkeep rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/environments/environment.prod.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/environments/environment.prod.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/environments/environment.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/environments/environment.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/favicon.ico b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/favicon.ico rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/index.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/index.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/main.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/main.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/polyfills.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/polyfills.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/styles.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/styles.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/test.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/test.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/tsconfig.app.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/tsconfig.app.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/tsconfig.spec.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/tsconfig.spec.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/typings.d.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/src/typings.d.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/tsconfig.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/tsconfig.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/tslint.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/angular/ui/tslint.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/css/wro.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/css/wro.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/404-icon.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/404-icon.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/platform-bg.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/platform-bg.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/js/wro.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/eureka/js/wro.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/favicon.ico b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/favicon.ico rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/index.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/index.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/inline.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/inline.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/inline.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/inline.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/main.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/main.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/main.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/main.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/polyfills.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/polyfills.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/polyfills.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/polyfills.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/styles.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/styles.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/styles.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/home/styles.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/index.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/main/resources/static/index.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/test/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/gateway/src/test/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/pom.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/pom.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-client/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-server/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/pom.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-server/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/pom.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/order-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/order-service/pom.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/order-service/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/pom.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/pom.xml similarity index 89% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/pom.xml index 597f669c69..1e97082db1 100644 --- a/spring-cloud-modules/spring-cloud-bootstrap-legacy/pom.xml +++ b/spring-cloud-modules/spring-cloud-bootstrap/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-cloud-bootstrap-legacy + spring-cloud-bootstrap 1.0.0-SNAPSHOT - spring-cloud-bootstrap-legacy + spring-cloud-bootstrap pom diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/pom.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/pom.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/test/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-book/src/test/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/pom.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/pom.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/test/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/svc-rating/src/test/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/zipkin/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/pom.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/zipkin/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/pom.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/zipkin/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/zipkin/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/zipkin/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/zipkin/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-bootstrap-legacy/zipkin/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bootstrap-legacy/zipkin/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java