Commit Graph

1135 Commits

Author SHA1 Message Date
buildmaster
57e2ff5918 Bumping versions 2023-06-17 13:46:03 +00:00
Ryan Baxter
d0d11f2595 Merge branch '3.1.x' into 4.0.x 2023-06-16 15:40:27 -04:00
Ryan Baxter
12597fef31 Initialize ConfigClientProperties instead of using whats in bootstrap. (#2282)
Fixes #2281

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
2023-06-16 15:37:22 -04:00
Kaveh Shamsi
c4edc5a4f3 Removes unnecessary @RunWith annotations (#2290) 2023-06-15 10:39:40 -04:00
Ryan Baxter
25bf685a27 Fixing merge conflicts 2023-06-14 14:23:38 -04:00
Ryan Baxter
ed0c170b41 Merge branch '3.1.x' 2023-06-14 14:23:22 -04:00
Kaveh Shamsi
e9c8570803 Configures SshSessionFactory only if there is at least one git uri with ssh scheme (#2288) 2023-06-14 14:08:44 -04:00
Kaveh Shamsi
1b748ca048 Removes duplicate bean definition in ResourceControllerIntegrationTests (#2286) 2023-06-14 08:34:19 -04:00
Ryan Baxter
25366e8d3d Merge branch '3.1.x' 2023-06-13 20:36:11 -04:00
buildmaster
0febbc0a92 Bumping versions 2023-06-14 00:31:19 +00:00
Ryan Baxter
5d757d81c1 Create a bean for ResourceControllerAdvice. (#2285)
Adding test

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
2023-06-13 19:47:05 -04:00
buildmaster
c8a10ab58a Bumping versions 2023-05-26 16:14:27 +00:00
buildmaster
5e3ba46508 Bumping versions 2023-05-25 02:38:35 +00:00
buildmaster
2f739046b2 Bumping versions to 4.0.4-SNAPSHOT after release 2023-05-24 19:19:26 +00:00
buildmaster
5e0dca46b0 Going back to snapshots 2023-05-24 19:19:25 +00:00
buildmaster
a854ba768c Update SNAPSHOT to 4.0.3 2023-05-24 19:16:04 +00:00
buildmaster
06d953a6eb Bumping versions 2023-05-05 02:38:15 +00:00
Antoine
66724a978d fix: transmit data from spring cloud config server controller to getEncryptor (#2253)
Fixes gh-2252
2023-05-04 20:08:33 -04:00
Chen Li
0075653f80 fix issue #2245, related to #385 (#2247) 2023-05-04 16:54:11 -04:00
Ryan Baxter
8a2d72ec71 Merge branch '3.1.x' 2023-05-04 16:05:25 -04:00
Ryan Baxter
436fdf9910 Better parsing of connection factory urls. Fixes #2254 (#2263)
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
2023-05-04 16:04:49 -04:00
Ryan Baxter
5694964a1f Formatting 2023-05-04 15:46:40 -04:00
Ryan Baxter
39c0127671 Remove unused import 2023-05-04 11:50:57 -04:00
Ryan Baxter
10ccf7bc7b Remove other credentials from test and use system properties 2023-05-04 11:48:40 -04:00
Ryan Baxter
a90a4513e1 Set credentials via system property 2023-05-04 11:39:01 -04:00
Ryan Baxter
64095ce3db Enhance logging 2023-05-04 11:25:46 -04:00
Ryan Baxter
902606e036 Adding some test logs 2023-05-04 11:05:48 -04:00
Ryan Baxter
dd065f2ba8 Removing if statement 2023-05-04 10:39:26 -04:00
Ryan Baxter
807400ed50 Enable logging for integration tests 2023-05-04 10:19:08 -04:00
Ryan Baxter
30915b456f Adding logging in AwsS3EnvironmentRepository 2023-05-04 10:12:02 -04:00
Ryan Baxter
7fd8ce4c0d Enabling test 2023-05-04 08:45:26 -04:00
Ryan Baxter
65f848635a Merge branch '3.1.x' 2023-05-03 16:49:34 -04:00
Ryan Baxter
f59f8b5816 Include property sources without profile and include application property source (#2261)
Fixes #1911

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
2023-05-03 16:26:48 -04:00
Ryan Baxter
a3db3392dc Merge branch '3.1.x' 2023-05-03 14:14:31 -04:00
Kaveh Shamsi
5a1797ac47 Loads the default configuration for application names prefixed with (#2262) 2023-05-03 13:33:14 -04:00
Ryan Baxter
7f9af92c4f Reenable AwsIntegrationTest On Main (#2227) 2023-05-03 09:42:38 -04:00
buildmaster
0449471ade Bumping versions to 3.1.8-SNAPSHOT after release 2023-04-27 15:00:40 +00:00
buildmaster
265b5fdb87 Going back to snapshots 2023-04-27 15:00:39 +00:00
buildmaster
937088716d Update SNAPSHOT to 3.1.7 2023-04-27 14:58:13 +00:00
Ryan Baxter
0a36367208 Fixing tests for 3.1.x compatibility 2023-04-20 15:28:04 -04:00
buildmaster
f25b8b2dc9 Bumping versions to 4.0.3-SNAPSHOT after release 2023-03-28 15:19:53 +00:00
buildmaster
721307dd69 Going back to snapshots 2023-03-28 15:19:53 +00:00
buildmaster
2998bb5017 Update SNAPSHOT to 4.0.2 2023-03-28 15:16:36 +00:00
Ryan Baxter
63e70ee9d8 Fixing merge 2023-03-22 20:22:08 -04:00
Ryan Baxter
fab9ceb0e5 Merge branch '3.1.x' 2023-03-22 20:21:45 -04:00
Ryan Baxter
dd5bc2b03c Put ExceptionHandler into a ResourceControllerAdvice to allow overriding behavior (#2243)
Fixes #2192

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
2023-03-22 20:05:39 -04:00
Ryan Baxter
d93052fa00 Fixing merger 2023-03-22 20:05:16 -04:00
Ryan Baxter
416747f26a Merge branch '3.1.x' 2023-03-22 17:18:27 -04:00
Ryan Baxter
8478a5263f Add property to reverse location order. Fixes #1910 (#2239)
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
2023-03-09 11:31:52 -05:00
Ryan Baxter
68f5566732 Fixing tests 2023-03-09 11:22:54 -05:00