spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-27 12:39:03 +00:00
Code Issues Projects Releases Wiki Activity
25,138 Commits 28 Branches 395 Tags
5fed25bb43a337eac367f347ac893f054844fa5e
Commit Graph
25138 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson 5fed25bb43 Upgrade to Spring HATEOAS 1.1.0.M2 
Closes gh-20142
 2020-02-12 14:09:07 +00:00
Stephane Nicoll 1b4a3dfa77 Merge pull request #20141 from dreis2211 
* pr/20141:
  Exclude jcl-over-slf4j also on Reactive Cassandra starter

Closes gh-20141
 2020-02-12 14:58:05 +01:00
dreis2211 450ef36c72 Exclude jcl-over-slf4j also on Reactive Cassandra starter 
See gh-20141
 2020-02-12 14:57:39 +01:00
Stephane Nicoll d19920ae39 Upgrade to Cassandra Driver 4.4.0 
Closes gh-20064
 2020-02-12 12:54:02 +01:00
Madhura Bhave fe325c06c2 Merge branch '2.2.x' 2020-02-11 19:43:42 -08:00
Madhura Bhave 4eb71fc424 Merge branch '2.1.x' into 2.2.x 2020-02-11 19:43:19 -08:00
Madhura Bhave 97ac6c9de7 Polish 2020-02-11 19:41:54 -08:00
Madhura Bhave 8d9b1d2988 Merge branch '2.2.x' 
Closes gh-20133
 2020-02-11 19:04:12 -08:00
Madhura Bhave 98a657fedb Merge branch '2.1.x' into 2.2.x 
Closes gh-20132
 2020-02-11 19:02:19 -08:00
Madhura Bhave 8bce270445 Merge pull request #19202 from bono007 
* pr/19202:
  Polish "Verify ssl key alias on server startup"
  Verify ssl key alias on server startup

Closes gh-19202
 2020-02-11 17:09:05 -08:00
Madhura Bhave ac91f14f05 Polish "Verify ssl key alias on server startup" 
See gh-19202
 2020-02-11 17:08:59 -08:00
cbono e351605962 Verify ssl key alias on server startup 
See gh-19202
 2020-02-11 17:04:31 -08:00
Madhura Bhave a5a2d52ee3 Merge branch '2.2.x' 2020-02-11 14:58:06 -08:00
Madhura Bhave 3bdd91a119 Merge branch '2.1.x' into 2.2.x 2020-02-11 14:57:49 -08:00
Madhura Bhave 747eab020d Update copyright of changed files 2020-02-11 14:57:17 -08:00
Madhura Bhave c5ffe198af Merge branch '2.2.x' 
Closes gh-20130
 2020-02-11 14:54:27 -08:00
Madhura Bhave d1c7699539 Merge branch '2.1.x' into 2.2.x 
Closes gh-20129
 2020-02-11 14:53:30 -08:00
Madhura Bhave 3917968d2a Merge pull request #18915 from schulzh 
* pr/18915:
  Polish contribution
  Handle JSON keys containing a dot from CF environment as a single path segment

Closes gh-18915
 2020-02-11 14:51:37 -08:00
Madhura Bhave 544dca7f1b Polish contribution 
Along with surrounding map keys with dot from VCAP_SERVICES with `[ ]`,
this commit also does that for non-alphanumeric and `-` characters so that
they are not stripped off later.

See gh-18915
 2020-02-11 14:50:55 -08:00
Hans Schulz 6828a15d31 Handle JSON keys containing a dot from CF environment as a single path segment 
See gh-18915
 2020-02-11 14:50:04 -08:00
Stephane Nicoll 00b10e655e Merge branch '2.2.x' 
Closes gh-20125
 2020-02-11 16:27:33 +01:00
Stephane Nicoll 8f06d819e4 Harmonize JMS connection factory bean names 
This commit restores consistent naming for the auto-configured
connection factory.

Closes gh-19565
 2020-02-11 16:23:56 +01:00
Stephane Nicoll b21a41cde1 Merge branch '2.2.x' 
Closes gh-20124
 2020-02-11 14:27:33 +01:00
Stephane Nicoll d1f4a1821c Merge branch '2.1.x' into 2.2.x 
Closes gh-20123
 2020-02-11 14:26:57 +01:00
Stephane Nicoll b0aba9ed67 Document how to register a blocking health contributor with reactive 
Closes gh-19707
 2020-02-11 14:22:16 +01:00
Stephane Nicoll a21dc3052d Merge branch '2.2.x' 2020-02-11 14:01:43 +01:00
Stephane Nicoll fe6b96174e Merge branch '2.1.x' into 2.2.x 
Closes gh-20122
 2020-02-11 14:00:30 +01:00
Stephane Nicoll 06e5b0e912 Upgrade CI to Artifactory Resource 0.0.11 
Closes gh-19629
 2020-02-11 13:59:37 +01:00
Stephane Nicoll c22ea8c937 Merge pull request #20113 from dreis2211 
* pr/20113:
  Remove redundant jar task configuration

Closes gh-20113
 2020-02-11 13:55:24 +01:00
dreis2211 cfc16c2589 Remove redundant jar task configuration 
See gh-20113
 2020-02-11 13:54:57 +01:00
Stephane Nicoll 3229142188 Merge branch '2.2.x' 
Closes gh-20121
 2020-02-11 13:50:54 +01:00
Stephane Nicoll 765b2178d1 Document spring-boot.run.arguments behaviour with multiple arguments 
Closes gh-19998
 2020-02-11 13:39:10 +01:00
Stephane Nicoll 5f584101c6 Merge branch '2.1.x' into 2.2.x 2020-02-11 13:38:05 +01:00
Stephane Nicoll 2a90c3dea4 Fix broken smoke test 
See gh-19926
 2020-02-11 13:32:31 +01:00
Stephane Nicoll 1306c9b77e Merge branch '2.2.x' 2020-02-11 11:57:27 +01:00
Stephane Nicoll 1e43537212 Fix broken smoke test 
See gh-19926
 2020-02-11 11:56:52 +01:00
Stephane Nicoll 25e87620d3 Fix broken smoke test 
See gh-19926
 2020-02-11 11:23:19 +01:00
Stephane Nicoll 466c1ba251 Merge branch '2.2.x' 
Closes gh-20118
 2020-02-11 10:31:03 +01:00
Stephane Nicoll a425cc1b46 Merge branch '2.1.x' into 2.2.x 
Closes gh-20117
 2020-02-11 10:30:19 +01:00
Stephane Nicoll 4c0c0aeb42 Merge pull request #19926 from xak2000 
* pr/19926:
  Polish "Remove unnecessary leading slash in changelog locations"
  Remove unnecessary leading slash in changelog locations

Closes gh-19926
 2020-02-11 10:29:50 +01:00
Stephane Nicoll ec14e82312 Polish "Remove unnecessary leading slash in changelog locations" 
See gh-19926
 2020-02-11 10:29:34 +01:00
Ruslan Stelmachenko 5f7e1ac4f2 Remove unnecessary leading slash in changelog locations 
See gh-19926
 2020-02-11 10:14:49 +01:00
Stephane Nicoll 32bd845a7d Merge branch '2.2.x' 
Closes gh-20116
 2020-02-11 09:31:03 +01:00
Stephane Nicoll b4d118e041 Merge pull request #19948 from jcordoba95 
* pr/19948:
  Polish "Fix condition source in OnBeanCondition"
  Fix condition source in OnBeanCondition

Closes gh-19948
 2020-02-11 09:29:54 +01:00
Stephane Nicoll 66809c6c1e Polish "Fix condition source in OnBeanCondition" 
See gh-19948
 2020-02-11 09:27:59 +01:00
Jorge Cordoba 547fc30ead Fix condition source in OnBeanCondition 
See gh-19948
 2020-02-11 09:10:07 +01:00
Stephane Nicoll 85eb279b30 Reintroduce "Add Gradle Wrapper Validation GitHub Action" 
Closes gh-19762
 2020-02-11 08:51:13 +01:00
Madhura Bhave 19b7dc8e4f Merge branch '2.2.x' 
Closes gh-20114
 2020-02-10 17:11:33 -08:00
Madhura Bhave d485708f68 Fix 404 when composite contributor is added to a group 
Fixes gh-19974
 2020-02-10 17:09:01 -08:00
Madhura Bhave ec42dcd173 Fix typo 2020-02-10 15:22:13 -08:00