Fixes config data log constructor.

Also, compatibility with framework 6/boot 3
2022-05-09 12:58:51 -04:00
parent a613db4e06
commit a49a9d13d7
12 changed files with 15 additions and 13 deletions
--- a/spring-cloud-config-server/src/test/resources/encrypt-repo/application.yml
+++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/application.yml
@@ -2,8 +2,7 @@ info:
  foo: bar

 ---
-spring:
-  profiles: encrypt
+spring.config.activate.on-profile: encrypt
 config:
  foo: '{cipher}{key:mytestkey}AQCohs2V6P8/UiG6a4TF/CZTCBdt5Q7wvNvcyf6vs2ByK2ZYSM77Nu0sOAduxUpMbVwJ/syecmkIXR+hU3EfT2uqPieA7/v5n33ppqIQ9JAt5JggdYIGe+wX25zU3DTXOOJdAAMzNX+zjOVyCh0QtmJf/kFslg6NqQq0E+kSg3zBi3AnkKj5BLnLIxkjxzKA4mnDXpSm7ekLZZP2iQSYSW/82AC7UOLLzTqwInMI3tJLW1e9Ne+LDsjmSxA+nkK9zhidtXPwb/SPaNF74cJCEf9mgzzKYwJlwqChLzJt8UQ1jHwRc8B6FufmizUHSp27nxdtVB4HMqh3nNsMCy137Ces58T09ZS/y/cYNRxcFbp78MHFHUqAgbC0B/p5t6h4XbQ='

--- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/COMMIT_EDITMSG
+++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/COMMIT_EDITMSG
@@ -1 +1 @@
-Added server overrides
+changed spring.profiles to spring.config.activate.on-profile
--- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/index
+++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/index
--- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/HEAD
+++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/HEAD
@@ -8,3 +8,4 @@
 ad5e0cb7036ed11ddd4b7be6ed86ad3565c8a3fc bd414a6cc8653d7e282df0a257babc6283b83596 Marcin Grzejszczak <marcin@grzejszczak.pl> 1549357702 +0100	commit: Updated
 bd414a6cc8653d7e282df0a257babc6283b83596 fd07d827993aaf6ed7ef1b979767ee9277d1d409 Tim Ysewyn <tysewyn@pivotal.io> 1564492480 +0200	commit: Added server overrides
 fd07d827993aaf6ed7ef1b979767ee9277d1d409 fd07d827993aaf6ed7ef1b979767ee9277d1d409 Ryan Baxter <rbaxter@vmware.com> 1636990355 -0500	checkout: moving from master to main
+fd07d827993aaf6ed7ef1b979767ee9277d1d409 fb1a59a90f034288d14dc4b607f9f76697aa972d spencergibb <spencer@gibb.us> 1652114959 -0400	commit: changed spring.profiles to spring.config.activate.on-profile
--- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/refs/heads/main
+++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/refs/heads/main
@@ -1 +1,2 @@
 0000000000000000000000000000000000000000 fd07d827993aaf6ed7ef1b979767ee9277d1d409 Ryan Baxter <rbaxter@vmware.com> 1636990355 -0500	branch: Created from HEAD
+fd07d827993aaf6ed7ef1b979767ee9277d1d409 fb1a59a90f034288d14dc4b607f9f76697aa972d spencergibb <spencer@gibb.us> 1652114959 -0400	commit: changed spring.profiles to spring.config.activate.on-profile
--- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/23/b743fe05412cf11975f0817ac8e12a13992dbe
+++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/23/b743fe05412cf11975f0817ac8e12a13992dbe
--- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/3c/e2c946ed7061ec24f69061795b557c065d6688
+++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/3c/e2c946ed7061ec24f69061795b557c065d6688
--- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/fb/1a59a90f034288d14dc4b607f9f76697aa972d
+++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/fb/1a59a90f034288d14dc4b607f9f76697aa972d
--- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/refs/heads/main
+++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/refs/heads/main
@@ -1 +1 @@
-fd07d827993aaf6ed7ef1b979767ee9277d1d409
+fb1a59a90f034288d14dc4b607f9f76697aa972d