root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
30,403 Commits 23 Branches 348 Tags 292 MiB
Commit Graph

30403 Commits

Author SHA1 Message Date
Phillip Webb a6a7c06e55 Merge branch '2.3.x' into 2.4.x 2021-01-12 12:04:11 -08:00
Phillip Webb 9da0bd8523 Update copyright year of changed files 2021-01-12 12:02:57 -08:00
Phillip Webb 48e00fc7f4 Merge branch '2.4.x' 
Closes gh-24793
 2021-01-12 11:49:15 -08:00
Phillip Webb b6cb9c016f Detect bad properties in profile specific files 
Throw an `InvalidConfigDataPropertyException` if bad properties are
detected in profile specific files. The following properties will now
trigger an exception if used in a profile specific file:

	`spring.profiles.include`
	`spring.profiles.active`
	`spring.profiles.default`
	`spring.config.activate.on-profile`
	`spring.profiles`

Prior to this commit, profile based properties in a profile specific
file would be silently ignored, making them hard to find.

Fixes gh-24733
 2021-01-12 11:48:19 -08:00
Madhura Bhave 5d8b760996 Merge branch '2.4.x' 2021-01-12 11:00:23 -08:00
Madhura Bhave 5ed2b11e34 Fix typo 2021-01-12 10:59:59 -08:00
Andy Wilkinson 7527ac16ba Merge branch '2.4.x' 2021-01-12 16:21:19 +00:00
Andy Wilkinson 1cc9bd93ba Merge branch '2.3.x' into 2.4.x 2021-01-12 16:21:09 +00:00
Andy Wilkinson f650bc6281 Merge branch '2.2.x' into 2.3.x 2021-01-12 16:20:57 +00:00
Andy Wilkinson 434b8a7b9d Merge pull request #24789 from runningcode 
* gh-24789:
  Polish "Upgrade to Gradle Enterprise Maven Extension 1.8.1"
  Upgrade to Gradle Enterprise Maven Extension 1.8.1

Closes gh-24789
 2021-01-12 16:20:50 +00:00
Andy Wilkinson d6a43ec22b Polish "Upgrade to Gradle Enterprise Maven Extension 1.8.1" 
See gh-24789
 2021-01-12 16:20:40 +00:00
Nelson Osacky 479f71f2b2 Upgrade to Gradle Enterprise Maven Extension 1.8.1 
See gh-24789
 2021-01-12 16:20:18 +00:00
Andy Wilkinson 31fe24c451 Merge branch '2.4.x' 
Closes gh-24791
 2021-01-12 16:04:04 +00:00
Andy Wilkinson 5cae1a2842 Merge branch '2.3.x' into 2.4.x 
Closes gh-24790
 2021-01-12 16:03:48 +00:00
Andy Wilkinson 7b1d07fa98 Use SpringSessionDataSource-annotated DataSource when one is available 
Fixes gh-24624
 2021-01-12 15:47:33 +00:00
Andy Wilkinson c1d169b53b Merge branch '2.4.x' 
Closes gh-24788
 2021-01-12 14:31:40 +00:00
Andy Wilkinson afa9ccba71 Merge branch '2.3.x' into 2.4.x 
Closes gh-24787
 2021-01-12 14:31:29 +00:00
Andy Wilkinson 22ff229d80 Merge pull request #24767 from runningcode 
* gh-24767:
  Upgrade to Gradle Enterprise Gradle Plugin 3.5.1

Closes gh-24767
 2021-01-12 14:31:20 +00:00
Nelson Osacky 74ffc3e0fa Upgrade to Gradle Enterprise Gradle Plugin 3.5.1 
See gh-24767
 2021-01-12 14:30:47 +00:00
Andy Wilkinson 067f5a52cc Merge branch '2.4.x' 
Closes gh-24784
 2021-01-12 14:17:39 +00:00
Andy Wilkinson 139152ccce Merge branch '2.3.x' into 2.4.x 
Closes gh-24783
 2021-01-12 14:17:24 +00:00
Andy Wilkinson 5a02996eca Fix release train version's comparison with other version types 
Fixes gh-24782
 2021-01-12 14:16:13 +00:00
Stephane Nicoll 68f0304833 Merge branch '2.4.x' 2021-01-12 15:01:26 +01:00
Stephane Nicoll a5dbe3091b Merge branch '2.3.x' into 2.4.x 2021-01-12 15:01:10 +01:00
Stephane Nicoll c5d4ca933b Upgrade to Reactor Dysprosium-SR16 
Closes gh-24765
 2021-01-12 15:00:11 +01:00
Stephane Nicoll 09d417fe74 Merge branch '2.2.x' into 2.3.x 2021-01-12 14:59:48 +01:00
Stephane Nicoll a0c5e35e04 Upgrade to Reactor Dysprosium-SR16 
Closes gh-24766
 2021-01-12 14:27:59 +01:00
Stephane Nicoll 60fa1b4754 Upgrade to Thymeleaf 3.0.12.RELEASE 
Closes gh-24781
 2021-01-12 14:18:39 +01:00
Stephane Nicoll 9c6133b090 Upgrade to Neo4j Ogm 3.2.19 
Closes gh-24780
 2021-01-12 14:18:38 +01:00
Stephane Nicoll 843577993c Upgrade to Hibernate Validator 6.0.22.Final 
Closes gh-24779
 2021-01-12 14:18:36 +01:00
Stephane Nicoll 6bbcdf4860 Upgrade to Hibernate 5.4.27.Final 
Closes gh-24778
 2021-01-12 14:18:35 +01:00
Stephane Nicoll 408c5cd1eb Upgrade to Johnzon Jsonb 1.2.9 
Closes gh-24777
 2021-01-12 14:18:34 +01:00
Stephane Nicoll f62f8811f9 Upgrade to Byte Buddy 1.10.19 
Closes gh-24776
 2021-01-12 14:18:33 +01:00
Stephane Nicoll 7aec55963c Upgrade to Joda Time 2.10.9 
Closes gh-24775
 2021-01-12 14:18:31 +01:00
Stephane Nicoll d567327ab8 Upgrade to Netty Tcnative 2.0.36.Final 
Closes gh-24774
 2021-01-12 14:18:30 +01:00
Stephane Nicoll c02fc18f9f Upgrade to Netty 4.1.56.Final 
Closes gh-24773
 2021-01-12 14:18:29 +01:00
Stephane Nicoll 13cd538df1 Upgrade to Dropwizard Metrics 4.1.17 
Closes gh-24772
 2021-01-12 14:18:27 +01:00
Stephane Nicoll 6bbe0029b5 Upgrade to Hazelcast 3.12.11 
Closes gh-24771
 2021-01-12 14:18:26 +01:00
Stephane Nicoll 4a890368b4 Upgrade to Appengine Sdk 1.9.84 
Closes gh-24770
 2021-01-12 14:18:25 +01:00
Andy Wilkinson 8281f404d1 Merge branch '2.4.x' 
Closes gh-24769
 2021-01-12 13:12:25 +00:00
Andy Wilkinson c3dfb9bd29 Merge branch '2.3.x' into 2.4.x 
Closes gh-24768
 2021-01-12 13:12:10 +00:00
Andy Wilkinson 997505005b Handle files larger than Integer.MAX_VALUE bytes in bootJar and bootWar 
Fixes gh-24618
 2021-01-12 13:11:46 +00:00
Stephane Nicoll 2655c1b1be Merge branch '2.4.x' 2021-01-12 10:10:40 +01:00
Stephane Nicoll b79b098264 Merge branch '2.3.x' into 2.4.x 2021-01-12 10:10:14 +01:00
Stephane Nicoll f02951fb17 Upgrade to Netty 4.1.56.Final 
Closes gh-24764
 2021-01-12 09:55:44 +01:00
Stephane Nicoll 2e69198f97 Upgrade to Neo4j OGM 3.2.19 
Closes gh-24763
 2021-01-12 09:55:43 +01:00
Stephane Nicoll 5fb1ca6043 Upgrade to Johnzon 1.2.9 
Closes gh-24762
 2021-01-12 09:55:41 +01:00
Stephane Nicoll 37f653121f Upgrade to Jetty Reactive HTTPClient 1.1.5 
Closes gh-24761
 2021-01-12 09:55:40 +01:00
Stephane Nicoll 3ae9639cbb Upgrade to Jackson Bom 2.11.4 
Closes gh-24760
 2021-01-12 09:55:38 +01:00
Stephane Nicoll 371e59cd80 Upgrade to Hibernate Validator 6.1.7.Final 
Closes gh-24759
 2021-01-12 09:55:37 +01:00