From beafa3fe67f63c1da62946f993109d428119a5ae Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Thu, 21 Oct 2021 08:41:09 +0200 Subject: [PATCH 1/9] Use Github Actions for CI --- .github/workflows/maven-build.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/maven-build.yml diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml new file mode 100644 index 000000000..b2099fb2a --- /dev/null +++ b/.github/workflows/maven-build.yml @@ -0,0 +1,26 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Java CI with Maven + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + cache: maven + - name: Build with Maven + run: mvn -B package --file pom.xml From cf60dbdff080e31658353018c43c689653d9659f Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Fri, 8 Oct 2021 19:38:55 +0200 Subject: [PATCH 2/9] Upgrade to Spring Cloud 2021.0.0-M2 and Spring Boot 2.6.0-M3 --- pom.xml | 23 ++++++++++++++++++---- spring-petclinic-admin-server/pom.xml | 2 +- spring-petclinic-api-gateway/pom.xml | 2 +- spring-petclinic-config-server/pom.xml | 2 +- spring-petclinic-customers-service/pom.xml | 2 +- spring-petclinic-discovery-server/pom.xml | 2 +- spring-petclinic-vets-service/pom.xml | 2 +- spring-petclinic-visits-service/pom.xml | 2 +- 8 files changed, 26 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index c2c8d2f78..088861b7f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ org.springframework.boot spring-boot-starter-parent - 2.5.1 + 2.6.0-M3 org.springframework.samples spring-petclinic-microservices - 2.5.1 + 2.6.0 ${project.artifactId} pom @@ -29,8 +29,8 @@ 1.8 3.17.1 - 2.5.1 - 2020.0.3 + 2.6.0-M3 + 2021.0.0-M2 2.3.10 springcommunity @@ -167,4 +167,19 @@ + + + + spring-milestones + Spring Milestone Repository + https://repo.spring.io/milestone + + + + + + spring-milestones + https://repo.spring.io/milestone + + diff --git a/spring-petclinic-admin-server/pom.xml b/spring-petclinic-admin-server/pom.xml index 951bff91d..cf78f9784 100644 --- a/spring-petclinic-admin-server/pom.xml +++ b/spring-petclinic-admin-server/pom.xml @@ -12,7 +12,7 @@ org.springframework.samples spring-petclinic-microservices - 2.5.1 + 2.6.0 diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml index 3bc2f6147..2f54cee83 100644 --- a/spring-petclinic-api-gateway/pom.xml +++ b/spring-petclinic-api-gateway/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.5.1 + 2.6.0 diff --git a/spring-petclinic-config-server/pom.xml b/spring-petclinic-config-server/pom.xml index ef45071e8..4a5a8acb9 100644 --- a/spring-petclinic-config-server/pom.xml +++ b/spring-petclinic-config-server/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.5.1 + 2.6.0 diff --git a/spring-petclinic-customers-service/pom.xml b/spring-petclinic-customers-service/pom.xml index 2bd021d6b..8940eecde 100644 --- a/spring-petclinic-customers-service/pom.xml +++ b/spring-petclinic-customers-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.5.1 + 2.6.0 diff --git a/spring-petclinic-discovery-server/pom.xml b/spring-petclinic-discovery-server/pom.xml index f08859f30..a35b720fd 100644 --- a/spring-petclinic-discovery-server/pom.xml +++ b/spring-petclinic-discovery-server/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.5.1 + 2.6.0 diff --git a/spring-petclinic-vets-service/pom.xml b/spring-petclinic-vets-service/pom.xml index 06ff6cd53..a69d3cb23 100644 --- a/spring-petclinic-vets-service/pom.xml +++ b/spring-petclinic-vets-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.5.1 + 2.6.0 diff --git a/spring-petclinic-visits-service/pom.xml b/spring-petclinic-visits-service/pom.xml index 2268234e0..21c669662 100644 --- a/spring-petclinic-visits-service/pom.xml +++ b/spring-petclinic-visits-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.5.1 + 2.6.0 From 297632c838f4a92dd9779e9620328205656ddd37 Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Mon, 1 Nov 2021 11:38:37 +0100 Subject: [PATCH 3/9] Upgrade to Spring Cloud 2021.0.0-M3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 088861b7f..d86875a4f 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 3.17.1 2.6.0-M3 - 2021.0.0-M2 + 2021.0.0-M3 2.3.10 springcommunity From bcd468915c186806c2530e2d3d4966a300cf7e9b Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Thu, 4 Nov 2021 18:11:38 +0100 Subject: [PATCH 4/9] Upgrade to Spring Cloud 2021.0.0-RC1 and Spring Boot 2.6.0-RC1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d86875a4f..553108a1b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.0-M3 + 2.6.0-RC1 org.springframework.samples @@ -29,8 +29,8 @@ 1.8 3.17.1 - 2.6.0-M3 - 2021.0.0-M3 + 2.6.0-RC1 + 2021.0.0-RC1 2.3.10 springcommunity From db1d05f43616977b0674851991729d47370c224d Mon Sep 17 00:00:00 2001 From: arey Date: Wed, 24 Nov 2021 19:25:32 +0100 Subject: [PATCH 5/9] Upgrade to Spring Boot 2.6.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 553108a1b..7be299c66 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.0-RC1 + 2.6.0 org.springframework.samples @@ -29,7 +29,7 @@ 1.8 3.17.1 - 2.6.0-RC1 + 2.6.0 2021.0.0-RC1 2.3.10 From 54d74a2c77990ec023997509e82543bf8d1fb614 Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Fri, 10 Dec 2021 08:20:48 +0100 Subject: [PATCH 6/9] Upgrade to Spring Cloud 2021.0.0 and Spring Boot 2.6.1 --- pom.xml | 20 +++----------------- spring-petclinic-admin-server/pom.xml | 4 ++-- spring-petclinic-api-gateway/pom.xml | 2 +- spring-petclinic-config-server/pom.xml | 2 +- spring-petclinic-customers-service/pom.xml | 2 +- spring-petclinic-discovery-server/pom.xml | 2 +- spring-petclinic-vets-service/pom.xml | 2 +- spring-petclinic-visits-service/pom.xml | 2 +- 8 files changed, 11 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index 7be299c66..a10d6daa8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ org.springframework.boot spring-boot-starter-parent - 2.6.0 + 2.6.1 org.springframework.samples spring-petclinic-microservices - 2.6.0 + 2.6.1 ${project.artifactId} pom @@ -30,7 +30,7 @@ 3.17.1 2.6.0 - 2021.0.0-RC1 + 2021.0.0 2.3.10 springcommunity @@ -168,18 +168,4 @@ - - - spring-milestones - Spring Milestone Repository - https://repo.spring.io/milestone - - - - - - spring-milestones - https://repo.spring.io/milestone - - diff --git a/spring-petclinic-admin-server/pom.xml b/spring-petclinic-admin-server/pom.xml index cf78f9784..31ea39289 100644 --- a/spring-petclinic-admin-server/pom.xml +++ b/spring-petclinic-admin-server/pom.xml @@ -12,11 +12,11 @@ org.springframework.samples spring-petclinic-microservices - 2.6.0 + 2.6.1 - 2.4.1 + 2.5.4 9090 ${basedir}/../docker diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml index 2f54cee83..c2d950d7a 100644 --- a/spring-petclinic-api-gateway/pom.xml +++ b/spring-petclinic-api-gateway/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.6.0 + 2.6.1 diff --git a/spring-petclinic-config-server/pom.xml b/spring-petclinic-config-server/pom.xml index 4a5a8acb9..192b42f6a 100644 --- a/spring-petclinic-config-server/pom.xml +++ b/spring-petclinic-config-server/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.6.0 + 2.6.1 diff --git a/spring-petclinic-customers-service/pom.xml b/spring-petclinic-customers-service/pom.xml index 8940eecde..0a565e46d 100644 --- a/spring-petclinic-customers-service/pom.xml +++ b/spring-petclinic-customers-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.6.0 + 2.6.1 diff --git a/spring-petclinic-discovery-server/pom.xml b/spring-petclinic-discovery-server/pom.xml index a35b720fd..a56a26319 100644 --- a/spring-petclinic-discovery-server/pom.xml +++ b/spring-petclinic-discovery-server/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.6.0 + 2.6.1 diff --git a/spring-petclinic-vets-service/pom.xml b/spring-petclinic-vets-service/pom.xml index a69d3cb23..b6392f426 100644 --- a/spring-petclinic-vets-service/pom.xml +++ b/spring-petclinic-vets-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.6.0 + 2.6.1 diff --git a/spring-petclinic-visits-service/pom.xml b/spring-petclinic-visits-service/pom.xml index 21c669662..4bfb20abb 100644 --- a/spring-petclinic-visits-service/pom.xml +++ b/spring-petclinic-visits-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.samples spring-petclinic-microservices - 2.6.0 + 2.6.1 From bb100c23a4854d413182f757d137b20d93a14f6a Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Fri, 10 Dec 2021 08:23:45 +0100 Subject: [PATCH 7/9] Change copyright date to 2021 --- .../samples/petclinic/admin/SpringBootAdminApplication.java | 2 +- .../samples/petclinic/api/ApiGatewayApplication.java | 2 +- .../petclinic/api/application/CustomersServiceClient.java | 2 +- .../samples/petclinic/api/application/VisitsServiceClient.java | 2 +- .../petclinic/api/boundary/web/ApiGatewayController.java | 2 +- .../springframework/samples/petclinic/api/dto/OwnerDetails.java | 2 +- .../springframework/samples/petclinic/api/dto/PetDetails.java | 2 +- .../org/springframework/samples/petclinic/api/dto/PetType.java | 2 +- .../springframework/samples/petclinic/api/dto/VisitDetails.java | 2 +- .../org/springframework/samples/petclinic/api/dto/Visits.java | 2 +- .../samples/petclinic/config/ConfigServerApplication.java | 2 +- .../petclinic/config/PetclinicConfigServerApplicationTests.java | 2 +- .../petclinic/customers/CustomersServiceApplication.java | 2 +- .../samples/petclinic/customers/model/Owner.java | 2 +- .../samples/petclinic/customers/model/OwnerRepository.java | 2 +- .../springframework/samples/petclinic/customers/model/Pet.java | 2 +- .../samples/petclinic/customers/model/PetRepository.java | 2 +- .../samples/petclinic/customers/model/PetType.java | 2 +- .../samples/petclinic/customers/web/OwnerResource.java | 2 +- .../samples/petclinic/customers/web/PetDetails.java | 2 +- .../samples/petclinic/customers/web/PetRequest.java | 2 +- .../samples/petclinic/customers/web/PetResource.java | 2 +- .../samples/petclinic/discovery/DiscoveryServerApplication.java | 2 +- .../petclinic/discovery/DiscoveryServerApplicationTests.java | 2 +- .../samples/petclinic/vets/VetsServiceApplication.java | 2 +- .../springframework/samples/petclinic/vets/model/Specialty.java | 2 +- .../org/springframework/samples/petclinic/vets/model/Vet.java | 2 +- .../samples/petclinic/vets/model/VetRepository.java | 2 +- .../samples/petclinic/vets/system/CacheConfig.java | 2 +- .../samples/petclinic/vets/system/VetsProperties.java | 2 +- .../springframework/samples/petclinic/vets/web/VetResource.java | 2 +- .../samples/petclinic/vets/web/VetResourceTest.java | 2 +- .../samples/petclinic/visits/VisitsServiceApplication.java | 2 +- .../springframework/samples/petclinic/visits/model/Visit.java | 2 +- .../samples/petclinic/visits/model/VisitRepository.java | 2 +- .../samples/petclinic/visits/web/VisitResource.java | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/spring-petclinic-admin-server/src/main/java/org/springframework/samples/petclinic/admin/SpringBootAdminApplication.java b/spring-petclinic-admin-server/src/main/java/org/springframework/samples/petclinic/admin/SpringBootAdminApplication.java index 7e0429f94..49785d15e 100644 --- a/spring-petclinic-admin-server/src/main/java/org/springframework/samples/petclinic/admin/SpringBootAdminApplication.java +++ b/spring-petclinic-admin-server/src/main/java/org/springframework/samples/petclinic/admin/SpringBootAdminApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/ApiGatewayApplication.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/ApiGatewayApplication.java index fd13cc08d..df86a6fc2 100644 --- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/ApiGatewayApplication.java +++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/ApiGatewayApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/CustomersServiceClient.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/CustomersServiceClient.java index 0cb31c9b1..e0619b1dc 100644 --- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/CustomersServiceClient.java +++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/CustomersServiceClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/VisitsServiceClient.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/VisitsServiceClient.java index ffb3d848a..d49dbf9b3 100644 --- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/VisitsServiceClient.java +++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/application/VisitsServiceClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/boundary/web/ApiGatewayController.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/boundary/web/ApiGatewayController.java index 3d7163e9c..4cacc6106 100644 --- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/boundary/web/ApiGatewayController.java +++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/boundary/web/ApiGatewayController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/OwnerDetails.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/OwnerDetails.java index 5cea00a88..35391c026 100644 --- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/OwnerDetails.java +++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/OwnerDetails.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/PetDetails.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/PetDetails.java index e9630d07d..bf064fe6f 100644 --- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/PetDetails.java +++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/PetDetails.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/PetType.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/PetType.java index 63d2b2005..e6b6d9e56 100644 --- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/PetType.java +++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/PetType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/VisitDetails.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/VisitDetails.java index de3a40543..e9f353544 100644 --- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/VisitDetails.java +++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/VisitDetails.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/Visits.java b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/Visits.java index 90bd82bee..fb5851f1f 100644 --- a/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/Visits.java +++ b/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/dto/Visits.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-config-server/src/main/java/org/springframework/samples/petclinic/config/ConfigServerApplication.java b/spring-petclinic-config-server/src/main/java/org/springframework/samples/petclinic/config/ConfigServerApplication.java index 7d91d1012..e6b810b58 100644 --- a/spring-petclinic-config-server/src/main/java/org/springframework/samples/petclinic/config/ConfigServerApplication.java +++ b/spring-petclinic-config-server/src/main/java/org/springframework/samples/petclinic/config/ConfigServerApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-config-server/src/test/java/org/springframework/samples/petclinic/config/PetclinicConfigServerApplicationTests.java b/spring-petclinic-config-server/src/test/java/org/springframework/samples/petclinic/config/PetclinicConfigServerApplicationTests.java index e4cd33f3a..e3d5191a4 100644 --- a/spring-petclinic-config-server/src/test/java/org/springframework/samples/petclinic/config/PetclinicConfigServerApplicationTests.java +++ b/spring-petclinic-config-server/src/test/java/org/springframework/samples/petclinic/config/PetclinicConfigServerApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/CustomersServiceApplication.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/CustomersServiceApplication.java index 3c757c9d4..867cdc198 100644 --- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/CustomersServiceApplication.java +++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/CustomersServiceApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/Owner.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/Owner.java index 360e7652f..542919668 100644 --- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/Owner.java +++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/Owner.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/OwnerRepository.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/OwnerRepository.java index a9eec088a..aa720f24f 100644 --- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/OwnerRepository.java +++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/OwnerRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/Pet.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/Pet.java index e0d28a9fd..0dc3ca770 100644 --- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/Pet.java +++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/Pet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/PetRepository.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/PetRepository.java index 93feb49ab..5bd16dbee 100644 --- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/PetRepository.java +++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/PetRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/PetType.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/PetType.java index 5ca44874b..fcac8596c 100644 --- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/PetType.java +++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/PetType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java index c9ea4b929..cc830db7c 100644 --- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java +++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetDetails.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetDetails.java index 2cda1e787..6e61fc0be 100644 --- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetDetails.java +++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetDetails.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetRequest.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetRequest.java index f7b68f650..b2e265316 100644 --- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetRequest.java +++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java index 3b8bdd887..62245d2e6 100644 --- a/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java +++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-discovery-server/src/main/java/org/springframework/samples/petclinic/discovery/DiscoveryServerApplication.java b/spring-petclinic-discovery-server/src/main/java/org/springframework/samples/petclinic/discovery/DiscoveryServerApplication.java index 6c2d281ec..56c49ed2d 100644 --- a/spring-petclinic-discovery-server/src/main/java/org/springframework/samples/petclinic/discovery/DiscoveryServerApplication.java +++ b/spring-petclinic-discovery-server/src/main/java/org/springframework/samples/petclinic/discovery/DiscoveryServerApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-discovery-server/src/test/java/org/springframework/samples/petclinic/discovery/DiscoveryServerApplicationTests.java b/spring-petclinic-discovery-server/src/test/java/org/springframework/samples/petclinic/discovery/DiscoveryServerApplicationTests.java index a1ede35e1..8bcc0afd5 100644 --- a/spring-petclinic-discovery-server/src/test/java/org/springframework/samples/petclinic/discovery/DiscoveryServerApplicationTests.java +++ b/spring-petclinic-discovery-server/src/test/java/org/springframework/samples/petclinic/discovery/DiscoveryServerApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/VetsServiceApplication.java b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/VetsServiceApplication.java index 2f5cb3663..e11e1b00d 100644 --- a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/VetsServiceApplication.java +++ b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/VetsServiceApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/Specialty.java b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/Specialty.java index 4a22dd167..e0267d062 100644 --- a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/Specialty.java +++ b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/Specialty.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/Vet.java b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/Vet.java index cddb6a9e3..31135eccb 100644 --- a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/Vet.java +++ b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/Vet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/VetRepository.java b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/VetRepository.java index 67e257133..cb22d143b 100644 --- a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/VetRepository.java +++ b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/model/VetRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/system/CacheConfig.java b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/system/CacheConfig.java index 6941a1446..2f3fb794a 100644 --- a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/system/CacheConfig.java +++ b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/system/CacheConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/system/VetsProperties.java b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/system/VetsProperties.java index e6529f102..017bffe71 100644 --- a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/system/VetsProperties.java +++ b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/system/VetsProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/web/VetResource.java b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/web/VetResource.java index d61d5dda1..7e0a57481 100644 --- a/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/web/VetResource.java +++ b/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/web/VetResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-vets-service/src/test/java/org/springframework/samples/petclinic/vets/web/VetResourceTest.java b/spring-petclinic-vets-service/src/test/java/org/springframework/samples/petclinic/vets/web/VetResourceTest.java index 83e6a6fb6..05e29b922 100644 --- a/spring-petclinic-vets-service/src/test/java/org/springframework/samples/petclinic/vets/web/VetResourceTest.java +++ b/spring-petclinic-vets-service/src/test/java/org/springframework/samples/petclinic/vets/web/VetResourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/VisitsServiceApplication.java b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/VisitsServiceApplication.java index 51a0ecd8c..78f2963f8 100644 --- a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/VisitsServiceApplication.java +++ b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/VisitsServiceApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/model/Visit.java b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/model/Visit.java index f799b43a0..c7032140f 100644 --- a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/model/Visit.java +++ b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/model/Visit.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/model/VisitRepository.java b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/model/VisitRepository.java index 063b3d270..bd7a6d726 100644 --- a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/model/VisitRepository.java +++ b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/model/VisitRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java index 4c921d811..0f1e391b4 100644 --- a/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java +++ b/spring-petclinic-visits-service/src/main/java/org/springframework/samples/petclinic/visits/web/VisitResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 8b0df988107d9f5b51f3e74bf7fc6724eb2ecc28 Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Sun, 12 Dec 2021 22:04:13 +0100 Subject: [PATCH 8/9] Migrate from spring-cloud-starter-bootstrap to spring-cloud-starter-config --- pom.xml | 9 +------- spring-petclinic-admin-server/pom.xml | 4 ---- .../src/main/resources/application.yml | 13 ++++++++++++ .../src/main/resources/bootstrap.yml | 14 ------------- spring-petclinic-api-gateway/pom.xml | 4 ---- .../src/main/resources/application.yml | 13 ++++++++++++ .../src/main/resources/bootstrap.yml | 14 ------------- ...ootstrap-test.yml => application-test.yml} | 0 spring-petclinic-config-server/pom.xml | 4 ---- .../{bootstrap.yml => application.yml} | 1 + spring-petclinic-customers-service/pom.xml | 4 ---- .../src/main/resources/application.properties | 0 .../src/main/resources/application.yml | 13 ++++++++++++ .../src/main/resources/bootstrap.yml | 14 ------------- .../src/test/resources/application-test.yml | 19 ++++++++++++----- .../src/test/resources/bootstrap-test.yml | 2 -- spring-petclinic-discovery-server/pom.xml | 6 +----- .../src/main/resources/application.yml | 21 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 14 ------------- spring-petclinic-vets-service/pom.xml | 4 ---- .../src/main/resources/application.properties | 2 -- .../src/main/resources/application.yml | 16 ++++++++++++++ .../src/main/resources/bootstrap.yml | 14 ------------- .../src/test/resources/application-test.yml | 19 ++++++++++++----- .../src/test/resources/bootstrap-test.yml | 2 -- spring-petclinic-visits-service/pom.xml | 4 ---- .../src/main/resources/application.properties | 0 .../src/main/resources/application.yml | 13 ++++++++++++ .../src/main/resources/bootstrap.yml | 14 ------------- .../src/test/resources/application-test.yml | 19 ++++++++++++----- .../src/test/resources/bootstrap-test.yml | 2 -- 31 files changed, 134 insertions(+), 144 deletions(-) create mode 100644 spring-petclinic-admin-server/src/main/resources/application.yml delete mode 100644 spring-petclinic-admin-server/src/main/resources/bootstrap.yml delete mode 100644 spring-petclinic-api-gateway/src/main/resources/bootstrap.yml rename spring-petclinic-api-gateway/src/test/resources/{bootstrap-test.yml => application-test.yml} (100%) rename spring-petclinic-config-server/src/main/resources/{bootstrap.yml => application.yml} (91%) delete mode 100644 spring-petclinic-customers-service/src/main/resources/application.properties create mode 100644 spring-petclinic-customers-service/src/main/resources/application.yml delete mode 100644 spring-petclinic-customers-service/src/main/resources/bootstrap.yml delete mode 100644 spring-petclinic-customers-service/src/test/resources/bootstrap-test.yml create mode 100644 spring-petclinic-discovery-server/src/main/resources/application.yml delete mode 100644 spring-petclinic-discovery-server/src/main/resources/bootstrap.yml delete mode 100644 spring-petclinic-vets-service/src/main/resources/application.properties create mode 100644 spring-petclinic-vets-service/src/main/resources/application.yml delete mode 100644 spring-petclinic-vets-service/src/main/resources/bootstrap.yml delete mode 100644 spring-petclinic-vets-service/src/test/resources/bootstrap-test.yml delete mode 100644 spring-petclinic-visits-service/src/main/resources/application.properties create mode 100644 spring-petclinic-visits-service/src/main/resources/application.yml delete mode 100644 spring-petclinic-visits-service/src/main/resources/bootstrap.yml delete mode 100644 spring-petclinic-visits-service/src/test/resources/bootstrap-test.yml diff --git a/pom.xml b/pom.xml index a10d6daa8..60aa27d51 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ - src/main/resources/bootstrap.yml + src/main/resources/application.yml @@ -77,13 +77,6 @@ org.springframework.boot spring-boot-maven-plugin - - true - - - true - - diff --git a/spring-petclinic-admin-server/pom.xml b/spring-petclinic-admin-server/pom.xml index 31ea39289..095a0c0d0 100644 --- a/spring-petclinic-admin-server/pom.xml +++ b/spring-petclinic-admin-server/pom.xml @@ -27,10 +27,6 @@ org.springframework.boot spring-boot-starter - - org.springframework.cloud - spring-cloud-starter-bootstrap - org.springframework.cloud spring-cloud-starter-config diff --git a/spring-petclinic-admin-server/src/main/resources/application.yml b/spring-petclinic-admin-server/src/main/resources/application.yml new file mode 100644 index 000000000..d745bb18b --- /dev/null +++ b/spring-petclinic-admin-server/src/main/resources/application.yml @@ -0,0 +1,13 @@ +spring: + application: + name: admin-server + config: + import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/} + + +--- +spring: + config: + activate: + on-profile: docker + import: configserver:http://config-server:8888 diff --git a/spring-petclinic-admin-server/src/main/resources/bootstrap.yml b/spring-petclinic-admin-server/src/main/resources/bootstrap.yml deleted file mode 100644 index d1ec2a854..000000000 --- a/spring-petclinic-admin-server/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - cloud: - config: - uri: http://localhost:8888 - application: - name: admin-server ---- -spring: - config: - activate: - on-profile: docker - cloud: - config: - uri: http://config-server:8888 diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml index c2d950d7a..4c82edc9b 100644 --- a/spring-petclinic-api-gateway/pom.xml +++ b/spring-petclinic-api-gateway/pom.xml @@ -51,10 +51,6 @@ org.springframework.cloud spring-cloud-sleuth-zipkin - - org.springframework.cloud - spring-cloud-starter-bootstrap - org.springframework.cloud spring-cloud-starter-circuitbreaker-reactor-resilience4j diff --git a/spring-petclinic-api-gateway/src/main/resources/application.yml b/spring-petclinic-api-gateway/src/main/resources/application.yml index 74da17a05..24d84e785 100644 --- a/spring-petclinic-api-gateway/src/main/resources/application.yml +++ b/spring-petclinic-api-gateway/src/main/resources/application.yml @@ -1,4 +1,8 @@ spring: + application: + name: api-gateway + config: + import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/} cloud: loadbalancer: ribbon: @@ -23,3 +27,12 @@ spring: - Path=/api/customer/** filters: - StripPrefix=2 + + + +--- +spring: + config: + activate: + on-profile: docker + import: configserver:http://config-server:8888 diff --git a/spring-petclinic-api-gateway/src/main/resources/bootstrap.yml b/spring-petclinic-api-gateway/src/main/resources/bootstrap.yml deleted file mode 100644 index 9aef7487e..000000000 --- a/spring-petclinic-api-gateway/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - cloud: - config: - uri: http://localhost:8888 - application: - name: api-gateway ---- -spring: - config: - activate: - on-profile: docker - cloud: - config: - uri: http://config-server:8888 diff --git a/spring-petclinic-api-gateway/src/test/resources/bootstrap-test.yml b/spring-petclinic-api-gateway/src/test/resources/application-test.yml similarity index 100% rename from spring-petclinic-api-gateway/src/test/resources/bootstrap-test.yml rename to spring-petclinic-api-gateway/src/test/resources/application-test.yml diff --git a/spring-petclinic-config-server/pom.xml b/spring-petclinic-config-server/pom.xml index 192b42f6a..68d1f0eb0 100644 --- a/spring-petclinic-config-server/pom.xml +++ b/spring-petclinic-config-server/pom.xml @@ -32,10 +32,6 @@ org.springframework.cloud spring-cloud-config-server - - org.springframework.cloud - spring-cloud-starter-bootstrap - diff --git a/spring-petclinic-config-server/src/main/resources/bootstrap.yml b/spring-petclinic-config-server/src/main/resources/application.yml similarity index 91% rename from spring-petclinic-config-server/src/main/resources/bootstrap.yml rename to spring-petclinic-config-server/src/main/resources/application.yml index 43e3e9906..9a58811ba 100644 --- a/spring-petclinic-config-server/src/main/resources/bootstrap.yml +++ b/spring-petclinic-config-server/src/main/resources/application.yml @@ -5,6 +5,7 @@ spring: server: git: uri: https://github.com/spring-petclinic/spring-petclinic-microservices-config + default-label: main # Use the File System Backend to avoid git pulling. Enable "native" profile in the Config Server. native: searchLocations: file:///${GIT_REPO} diff --git a/spring-petclinic-customers-service/pom.xml b/spring-petclinic-customers-service/pom.xml index 0a565e46d..0f224495b 100644 --- a/spring-petclinic-customers-service/pom.xml +++ b/spring-petclinic-customers-service/pom.xml @@ -41,10 +41,6 @@ - - org.springframework.cloud - spring-cloud-starter-bootstrap - org.springframework.cloud spring-cloud-starter-config diff --git a/spring-petclinic-customers-service/src/main/resources/application.properties b/spring-petclinic-customers-service/src/main/resources/application.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/spring-petclinic-customers-service/src/main/resources/application.yml b/spring-petclinic-customers-service/src/main/resources/application.yml new file mode 100644 index 000000000..7c95adf78 --- /dev/null +++ b/spring-petclinic-customers-service/src/main/resources/application.yml @@ -0,0 +1,13 @@ +spring: + application: + name: customers-service + config: + import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/} + + +--- +spring: + config: + activate: + on-profile: docker + import: configserver:http://config-server:8888 diff --git a/spring-petclinic-customers-service/src/main/resources/bootstrap.yml b/spring-petclinic-customers-service/src/main/resources/bootstrap.yml deleted file mode 100644 index 58281a444..000000000 --- a/spring-petclinic-customers-service/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - cloud: - config: - uri: http://localhost:8888 - application: - name: customers-service ---- -spring: - config: - activate: - on-profile: docker - cloud: - config: - uri: http://config-server:8888 diff --git a/spring-petclinic-customers-service/src/test/resources/application-test.yml b/spring-petclinic-customers-service/src/test/resources/application-test.yml index 0abdac443..b9c699b5f 100644 --- a/spring-petclinic-customers-service/src/test/resources/application-test.yml +++ b/spring-petclinic-customers-service/src/test/resources/application-test.yml @@ -1,9 +1,18 @@ -spring.jpa.hibernate.ddl-auto: none - spring: - datasource: - schema: classpath*:db/hsqldb/schema.sql - data: classpath*:db/hsqldb/data.sql + cloud: + config: + enabled: false + sql: + init: + schema-locations: classpath*:db/hsqldb/schema.sql + data-locations: classpath*:db/hsqldb/data.sql + jpa: + hibernate: + ddl-auto: none + +eureka: + client: + enabled: false logging.level.org.springframework: INFO diff --git a/spring-petclinic-customers-service/src/test/resources/bootstrap-test.yml b/spring-petclinic-customers-service/src/test/resources/bootstrap-test.yml deleted file mode 100644 index cb8e4f5f7..000000000 --- a/spring-petclinic-customers-service/src/test/resources/bootstrap-test.yml +++ /dev/null @@ -1,2 +0,0 @@ -spring.cloud.config.enabled: false -eureka.client.enabled: false diff --git a/spring-petclinic-discovery-server/pom.xml b/spring-petclinic-discovery-server/pom.xml index a56a26319..0c9321960 100644 --- a/spring-petclinic-discovery-server/pom.xml +++ b/spring-petclinic-discovery-server/pom.xml @@ -30,16 +30,12 @@ org.springframework.cloud - spring-cloud-starter-bootstrap + spring-cloud-starter-netflix-eureka-server org.springframework.cloud spring-cloud-starter-config - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-server - diff --git a/spring-petclinic-discovery-server/src/main/resources/application.yml b/spring-petclinic-discovery-server/src/main/resources/application.yml new file mode 100644 index 000000000..9fbcbc588 --- /dev/null +++ b/spring-petclinic-discovery-server/src/main/resources/application.yml @@ -0,0 +1,21 @@ +spring: + application: + name: discovery-server + config: + import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/} + +# Avoid some debugging logs at startup +logging: + level: + org: + springframework: + boot: INFO + web: INFO + +--- +spring: + config: + activate: + on-profile: docker + import: configserver:http://config-server:8888 + diff --git a/spring-petclinic-discovery-server/src/main/resources/bootstrap.yml b/spring-petclinic-discovery-server/src/main/resources/bootstrap.yml deleted file mode 100644 index eba87c89e..000000000 --- a/spring-petclinic-discovery-server/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - cloud: - config: - uri: http://localhost:8888 - application: - name: discovery-server ---- -spring: - config: - activate: - on-profile: docker - cloud: - config: - uri: http://config-server:8888 diff --git a/spring-petclinic-vets-service/pom.xml b/spring-petclinic-vets-service/pom.xml index b6392f426..2e017f92f 100644 --- a/spring-petclinic-vets-service/pom.xml +++ b/spring-petclinic-vets-service/pom.xml @@ -53,10 +53,6 @@ org.springframework.cloud spring-cloud-sleuth-zipkin - - org.springframework.cloud - spring-cloud-starter-bootstrap - org.springframework.cloud spring-cloud-starter-config diff --git a/spring-petclinic-vets-service/src/main/resources/application.properties b/spring-petclinic-vets-service/src/main/resources/application.properties deleted file mode 100644 index 68f17e806..000000000 --- a/spring-petclinic-vets-service/src/main/resources/application.properties +++ /dev/null @@ -1,2 +0,0 @@ -spring.profiles.active=production -spring.cache.cache-names=vets diff --git a/spring-petclinic-vets-service/src/main/resources/application.yml b/spring-petclinic-vets-service/src/main/resources/application.yml new file mode 100644 index 000000000..983a015db --- /dev/null +++ b/spring-petclinic-vets-service/src/main/resources/application.yml @@ -0,0 +1,16 @@ +spring: + application: + name: vets-service + config: + import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/} + cache: + cache-names: vets + profiles: + active: production + +--- +spring: + config: + activate: + on-profile: docker + import: configserver:http://config-server:8888 diff --git a/spring-petclinic-vets-service/src/main/resources/bootstrap.yml b/spring-petclinic-vets-service/src/main/resources/bootstrap.yml deleted file mode 100644 index bc2f683e5..000000000 --- a/spring-petclinic-vets-service/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - cloud: - config: - uri: http://localhost:8888 - application: - name: vets-service ---- -spring: - config: - activate: - on-profile: docker - cloud: - config: - uri: http://config-server:8888 diff --git a/spring-petclinic-vets-service/src/test/resources/application-test.yml b/spring-petclinic-vets-service/src/test/resources/application-test.yml index 2d18cfdea..684fa8988 100644 --- a/spring-petclinic-vets-service/src/test/resources/application-test.yml +++ b/spring-petclinic-vets-service/src/test/resources/application-test.yml @@ -1,9 +1,18 @@ -spring.jpa.hibernate.ddl-auto: none - spring: - datasource: - schema: classpath*:db/hsqldb/schema.sql - data: classpath*:db/hsqldb/data.sql + cloud: + config: + enabled: false + sql: + init: + schema-locations: classpath*:db/hsqldb/schema.sql + data-locations: classpath*:db/hsqldb/data.sql + jpa: + hibernate: + ddl-auto: none + +eureka: + client: + enabled: false vets: cache: diff --git a/spring-petclinic-vets-service/src/test/resources/bootstrap-test.yml b/spring-petclinic-vets-service/src/test/resources/bootstrap-test.yml deleted file mode 100644 index cb8e4f5f7..000000000 --- a/spring-petclinic-vets-service/src/test/resources/bootstrap-test.yml +++ /dev/null @@ -1,2 +0,0 @@ -spring.cloud.config.enabled: false -eureka.client.enabled: false diff --git a/spring-petclinic-visits-service/pom.xml b/spring-petclinic-visits-service/pom.xml index 4bfb20abb..5df45a4ba 100644 --- a/spring-petclinic-visits-service/pom.xml +++ b/spring-petclinic-visits-service/pom.xml @@ -40,10 +40,6 @@ - - org.springframework.cloud - spring-cloud-starter-bootstrap - org.springframework.cloud spring-cloud-starter-config diff --git a/spring-petclinic-visits-service/src/main/resources/application.properties b/spring-petclinic-visits-service/src/main/resources/application.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/spring-petclinic-visits-service/src/main/resources/application.yml b/spring-petclinic-visits-service/src/main/resources/application.yml new file mode 100644 index 000000000..ada02194c --- /dev/null +++ b/spring-petclinic-visits-service/src/main/resources/application.yml @@ -0,0 +1,13 @@ +spring: + application: + name: visits-service + config: + import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/} + + +--- +spring: + config: + activate: + on-profile: docker + import: configserver:http://config-server:8888 diff --git a/spring-petclinic-visits-service/src/main/resources/bootstrap.yml b/spring-petclinic-visits-service/src/main/resources/bootstrap.yml deleted file mode 100644 index 92f4fcae3..000000000 --- a/spring-petclinic-visits-service/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,14 +0,0 @@ -spring: - cloud: - config: - uri: http://localhost:8888 - application: - name: visits-service ---- -spring: - config: - activate: - on-profile: docker - cloud: - config: - uri: http://config-server:8888 diff --git a/spring-petclinic-visits-service/src/test/resources/application-test.yml b/spring-petclinic-visits-service/src/test/resources/application-test.yml index 0abdac443..b9c699b5f 100644 --- a/spring-petclinic-visits-service/src/test/resources/application-test.yml +++ b/spring-petclinic-visits-service/src/test/resources/application-test.yml @@ -1,9 +1,18 @@ -spring.jpa.hibernate.ddl-auto: none - spring: - datasource: - schema: classpath*:db/hsqldb/schema.sql - data: classpath*:db/hsqldb/data.sql + cloud: + config: + enabled: false + sql: + init: + schema-locations: classpath*:db/hsqldb/schema.sql + data-locations: classpath*:db/hsqldb/data.sql + jpa: + hibernate: + ddl-auto: none + +eureka: + client: + enabled: false logging.level.org.springframework: INFO diff --git a/spring-petclinic-visits-service/src/test/resources/bootstrap-test.yml b/spring-petclinic-visits-service/src/test/resources/bootstrap-test.yml deleted file mode 100644 index cb8e4f5f7..000000000 --- a/spring-petclinic-visits-service/src/test/resources/bootstrap-test.yml +++ /dev/null @@ -1,2 +0,0 @@ -spring.cloud.config.enabled: false -eureka.client.enabled: false From 38a483f268d9b638c36c59ec24df15403d631271 Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Sun, 12 Dec 2021 22:08:16 +0100 Subject: [PATCH 9/9] Remove spring.cloud.loadbalancer.ribbon.enabled deprecated property --- .../src/main/resources/application.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/spring-petclinic-api-gateway/src/main/resources/application.yml b/spring-petclinic-api-gateway/src/main/resources/application.yml index 24d84e785..48ead7d0f 100644 --- a/spring-petclinic-api-gateway/src/main/resources/application.yml +++ b/spring-petclinic-api-gateway/src/main/resources/application.yml @@ -4,9 +4,6 @@ spring: config: import: optional:configserver:${CONFIG_SERVER_URL:http://localhost:8888/} cloud: - loadbalancer: - ribbon: - enabled: false gateway: routes: - id: vets-service