root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
24,992 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

24992 Commits

Author SHA1 Message Date
Andy Wilkinson 8da1e3addb Merge branch '2.1.x' into 2.2.x 2020-06-08 11:35:10 +01:00
Andy Wilkinson 6a9450ee8b Polish 2020-06-08 11:34:56 +01:00
Phillip Webb bfe1c281f0 Merge branch '2.1.x' into 2.2.x 
Closes gh-21743
 2020-06-07 10:25:33 -07:00
Phillip Webb 70e0a27949 Drop the use of the term "white list" 
Closes gh-21737
 2020-06-07 10:22:35 -07:00
Stephane Nicoll 4c26c7d043 Start building against Spring Framework 5.2.7 snapshots 
See gh-21738
 2020-06-07 10:54:38 +02:00
Stephane Nicoll b997154caa Merge branch '2.1.x' into 2.2.x 2020-06-07 10:53:47 +02:00
Stephane Nicoll d4c8fa9b2a Start building against Spring Framework 5.1.16 snapshots 
See gh-21729
 2020-06-07 10:37:47 +02:00
Stephane Nicoll f4f9df3d10 Start building against Reactor Dysprosium-SR8 snapshots 
See gh-21730
 2020-06-06 09:26:15 +02:00
Stephane Nicoll 9141e9b9e0 Merge branch '2.1.x' into 2.2.x 2020-06-06 09:24:54 +02:00
Stephane Nicoll 0b0187cd0d Start building against Reactor Californium-SR19 snapshots 
See gh-21728
 2020-06-06 08:48:15 +02:00
Phillip Webb 97d4613fba Refine prepare-forward-merge to detect master 2020-06-05 16:21:36 -07:00
Phillip Webb 0a05b4c9fd Update copyright year of changed files 2020-06-05 15:36:09 -07:00
Phillip Webb c8e966002a Fixup prepare-forward-merge for master 
Fix the regex so that merges to master are supported.
 2020-06-05 15:36:09 -07:00
Stephane Nicoll 221e248b66 Merge pull request #21671 from dreis2211 
* pr/21671:
  Remove usages of deprecated Connector.setAttribute()

Closes gh-21671
 2020-06-05 16:41:07 +02:00
dreis2211 9bb22ffb69 Remove usages of deprecated Connector.setAttribute() 
See gh-21671
 2020-06-05 16:32:42 +02:00
Stephane Nicoll eb38eeaf30 Polish 2020-06-05 16:25:12 +02:00
Andy Wilkinson 1a52009cfb Migrate CustomServletPathSampleActuatorTests to JUnit Jupiter 
Closes gh-21717
 2020-06-05 13:40:30 +01:00
Andy Wilkinson 97533a5364 Merge branch '2.1.x' into 2.2.x 
Closes gh-21682
 2020-06-05 12:52:24 +01:00
Andy Wilkinson 20f0b41099 Upgrade CI to Docker 19.03.9 
Closes gh-21681
 2020-06-05 12:48:49 +01:00
Phillip Webb 10fdd65063 Add prepare-forward-merge script 
Add a git hook script that can be used to prepare a sensible merge
commit message.

Closes gh-21688
 2020-06-04 20:10:09 -07:00
Phillip Webb 39caf45155 Allow forward merge to work with .x patterns 
Closes gh-21687
 2020-06-04 20:05:17 -07:00
Phillip Webb 4a6e08c817 Add logging to forward-merge script 
Add some logging to aid with development.
 2020-06-04 20:05:01 -07:00
Phillip Webb b6474f2ca1 Remove accidentally committed hook file 2020-06-04 13:59:14 -07:00
Andy Wilkinson 29c2a0471d Add Oracle DB dependency management under com.oracle.database 
Closes gh-20333
 2020-06-03 08:06:26 +01:00
Phillip Webb 864daab03a Merge branch '2.1.x' into 2.2.x 2020-06-02 22:47:41 -07:00
Phillip Webb b5fe3c3494 Refine YAML type restriction error 
Closes gh-21596
 2020-06-02 22:46:47 -07:00
Phillip Webb 4fc0dec6c4 Support wrapped random property sources 
Update `SpringConfigurationPropertySource` so that wrapped random
property sources can be used. It's assumed that wrapped random
sources will use the name of the source as the prefix.

Closes gh-21595
 2020-06-02 22:22:40 -07:00
Phillip Webb 09a47c9aad Fix containsDescendantOf for random sources 
Fix the `containsDescendantOf` logic for random property sources to
ensure that ancestors are correctly matched.

Closes gh-21654
 2020-06-02 10:57:48 -07:00
Phillip Webb 14e6c734a9 Merge branch '2.1.x' into 2.2.x 
Closes gh-21643
 2020-06-01 14:45:39 -07:00
Phillip Webb 95031295b9 Restore TomcatReactiveWebServerFactoryTests 
Restore tests that were previously ignored due to a framework bug.

Closes gh-19702
 2020-06-01 14:19:20 -07:00
Madhura Bhave 573cb98d90 Make management security configuration back off when SAML present 
Fixes gh-21620
 2020-06-01 13:39:46 -07:00
Phillip Webb 14c9804c5c Fix checkstyle issues 2020-05-27 19:19:11 -07:00
Phillip Webb af90604030 Merge branch '2.1.x' into 2.2.x 
Closes gh-21597
 2020-05-27 16:45:08 -07:00
Phillip Webb 587b840666 Restrict use of custom YAML types 
Update `YamlJsonParser` and `OriginTrackedYamlLoader` to ensure that
custom types cannot be loaded.

Closes gh-21596
 2020-05-27 16:36:46 -07:00
Stephane Nicoll 6a00ccf60c Merge pull request #21540 from BramDeCneudt 
* pr/21540:
  Fix links for Apache Camel starter

Closes gh-21540
 2020-05-25 15:30:30 +02:00
Bram De Cneudt 591d234e43 Fix links for Apache Camel starter 
See gh-21540
 2020-05-25 15:28:40 +02:00
Stephane Nicoll a657c97ce8 Merge pull request #21480 from olamy 
* pr/21480:
  Polish "Use the container IP address for tests using TestContainer"
  Use the container IP address for tests using TestContainer

Closes gh-21480
 2020-05-25 14:39:43 +02:00
Stephane Nicoll 77981ac2ae Polish "Use the container IP address for tests using TestContainer" 
See gh-21480
 2020-05-25 14:29:24 +02:00
olivier lamy 0c2bf70bb8 Use the container IP address for tests using TestContainer 
See gh-21480
 2020-05-25 14:03:18 +02:00
Stephane Nicoll afcb5d54b2 Polish "Fix uri tag for empty path" 
See gh-21392
 2020-05-25 13:51:40 +02:00
Stephane Nicoll 3f372824ea Merge pull request #21392 from jkschneider 
* pr/21392:
  Fix uri tag for empty path

Closes gh-21392
 2020-05-25 13:48:24 +02:00
Jon Schneider f78f2d57e1 Fix uri tag for empty path 
See gh-21392
 2020-05-25 13:41:19 +02:00
Madhura Bhave 398c80fb69 Merge pull request #21485 from FrontierPsychiatrist 
* pr/21485:
  Fix typo in section 4.30.6

Closes gh-21485
 2020-05-20 17:42:08 -07:00
Moritz do Rio Schulze 1e168a2145 Fix typo in section 4.30.6 
See gh-21485
 2020-05-20 17:41:50 -07:00
Madhura Bhave 831bb1f206 Merge branch '2.1.x' into 2.2.x 
Closes gh-21526
 2020-05-20 15:29:50 -07:00
Madhura Bhave bce48ea745 Upgrade CI to Docker 19.03.9 
Closes gh-21525
 2020-05-20 15:29:02 -07:00
Madhura Bhave 808cb98b98 Merge branch '2.1.x' into 2.2.x 
Closes gh-21527
 2020-05-20 14:35:27 -07:00
Madhura Bhave 7d197e6469 Don't add waiting-for-triage label for issues created by CI automation 
Closes gh-21282
 2020-05-20 14:32:48 -07:00
Scott Frederick 4a812fc29c Fix log name in ServletWebServerApplicationContext 
Fixes gh-21354
 2020-05-20 12:59:13 -05:00
Andy Wilkinson 4a896f2272 Merge branch '2.1.x' into 2.2.x 
Closes gh-21471
 2020-05-15 16:20:23 +01:00