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

32018 Commits

Author SHA1 Message Date
Andy Wilkinson ad968a2640 Merge branch '2.4.x' 
Closes gh-26273
 2021-04-28 12:28:33 +01:00
Andy Wilkinson cf1b29ebd4 Merge branch '2.3.x' into 2.4.x 
Closes gh-26272
 2021-04-28 12:28:10 +01:00
Andy Wilkinson e4d93b3624 Merge pull request #26264 from dreis2211 
* gh-26264:
  Rename nohttp whitelist to allowlist

Closes gh-26264
 2021-04-28 12:27:53 +01:00
dreis2211 9b1b47ae5d Rename nohttp whitelist to allowlist 
See gh-26264
 2021-04-28 11:39:52 +01:00
Andy Wilkinson e7c1c8937d Merge branch '2.4.x' 
Closes gh-26261
 2021-04-27 17:34:52 +01:00
Andy Wilkinson 79d27344e0 Merge branch '2.3.x' into 2.4.x 
Closes gh-26260
 2021-04-27 17:32:49 +01:00
Andy Wilkinson 912c82e50d Work around https://bugs.openjdk.java.net/browse/JDK-8156584 
sun.security.x509.AlgorithmId.get(String) isn't thread-safe and can
lead to null be returned for an algorithm that should be present.

This commit aims to work around this problem by avoiding the call
to AlgorithmId.get(String). It does so by configuring the
PKCS12 key protection algorithm to one that starts with
pbewithhmacsha (case insensitive). This short-circuits the logic
in PKCS12KeyStore.mapPBEAlgorithmToOID(String) and avoids the call to
AlgorithmId.get(String). Thanks again to @dreis2211 for the
suggestion.

The work around is only used when building with Java 8 as the problem
was fixed in Java 9.

Closes gh-26252
 2021-04-27 17:27:28 +01:00
Andy Wilkinson fa49ed05c8 Merge pull request #26253 from dreis2211 
* gh-26253:
  Fix GitHub tag determination following main branch rename

Closes gh-26253
 2021-04-27 15:27:17 +01:00
dreis2211 5219697eb7 Fix GitHub tag determination following main branch rename 
See gh-26253
 2021-04-27 15:26:26 +01:00
Andy Wilkinson 6953da2013 Merge branch '2.4.x' 
Closes gh-26257
 2021-04-27 15:19:04 +01:00
Andy Wilkinson a1138efc5f Merge branch '2.3.x' into 2.4.x 
Closes gh-26256
 2021-04-27 15:18:23 +01:00
Andy Wilkinson a470c1af3a Align documentation with main default branch name 
Closes gh-26255
 2021-04-27 15:18:00 +01:00
Andy Wilkinson c191009183 Merge branch '2.4.x' 2021-04-27 11:57:53 +01:00
Andy Wilkinson 4743ccc261 Merge branch '2.3.x' into 2.4.x 2021-04-27 11:57:42 +01:00
Andy Wilkinson 2ab679aceb Update prepare-forward-merge following master->main rename 
See gh-26248
 2021-04-27 11:57:27 +01:00
Andy Wilkinson 31b650093d Merge branch '2.4.x' 
Closes gh-26251
 2021-04-27 11:56:48 +01:00
Andy Wilkinson 258ae73aa4 Update prepare-forward-merge following master->main rename 
See gh-26248
 2021-04-27 11:56:10 +01:00
Andy Wilkinson ffc06e1e30 Merge branch '2.3.x' into 2.4.x 
Closes gh-26250
 2021-04-27 11:51:29 +01:00
Andy Wilkinson 715c4febf9 Update maformed address to one that should fail on CI 
Closes gh-26247
 2021-04-27 11:50:52 +01:00
Andy Wilkinson 091907f762 Rename default branch to main 
Closes gh-26248
 2021-04-27 11:27:37 +01:00
Andy Wilkinson 47516b50c3 Merge branch '2.4.x' 
Closes gh-26246
 2021-04-27 10:39:54 +01:00
Andy Wilkinson b1c32f2a8a Merge branch '2.3.x' into 2.4.x 
Closes gh-26245
 2021-04-27 10:39:36 +01:00
Andy Wilkinson ad67c3d50f Avoid using yum (which requires http:// access) in launch script tests 
Fixes gh-26240
 2021-04-27 10:39:19 +01:00
Phillip Webb d42ad237f5 Merge branch '2.4.x' 
Closes gh-26242
 2021-04-26 17:44:26 -07:00
Phillip Webb 94a70d6837 Merge branch '2.3.x' into 2.4.x 
Closes gh-26241
 2021-04-26 17:42:00 -07:00
Phillip Webb 1e0a3a946d Fix binding random properties test 
See gh-26201
 2021-04-26 17:36:58 -07:00
Phillip Webb f82b33698d Add missing asciidoctor heading anchors 
Closes gh-26239
 2021-04-26 17:35:14 -07:00
Phillip Webb ba5b36d733 Restore support for binding random properties 
Revert 0588e989af so that `@ConfigurationProperties` can again be
bound using values from the `RandomValuePropertySource`.

Fixes gh-26201
 2021-04-26 15:42:15 -07:00
Phillip Webb 5e8f383947 Extract code samples from docs 
See gh-6313
 2021-04-26 14:01:37 -07:00
Andy Wilkinson 6de10ff791 Merge branch '2.4.x' 
Closes gh-26237
 2021-04-26 15:53:37 +01:00
Andy Wilkinson 11fa850b97 Merge branch '2.3.x' into 2.4.x 
Closes gh-26236
 2021-04-26 15:53:18 +01:00
Andy Wilkinson 4a990f3ed2 Use bean class loader when importing auto-configuration 
Fixes gh-26234
 2021-04-26 15:38:01 +01:00
Brian Clozel 1732d8ccf7 Merge branch '2.4.x' 
Closes gh-26233
 2021-04-26 11:37:20 +02:00
Brian Clozel 7be9c268b8 Fix ignored use-last-modified property in Spring MVC 
Prior to this commit, the `spring.web.resources.cache.use-last-modified`
configuration property support was lost during a merge operation right
before 2.4.2.

This is due to an invalid test that missed this unintended change. This
commit fixes both problems.

Fixes gh-26212
 2021-04-26 11:34:47 +02:00
Phillip Webb 32a87fcbda Extract code samples from docs 
See gh-6313
 2021-04-25 16:07:26 -07:00
Phillip Webb 2f852fa256 Update copyright year of changed files 2021-04-23 23:42:14 -07:00
Phillip Webb f30d48e3b3 Extract code samples from docs 
See gh-6313
 2021-04-23 23:41:06 -07:00
Phillip Webb 02cc778911 Extract code samples from docs 
See gh-6313
 2021-04-23 19:10:09 -07:00
Phillip Webb 3075ac0f54 Formatting 2021-04-23 11:17:49 -07:00
Stephane Nicoll a654380552 Merge pull request #26200 from slawekjaranowski 
* pr/26200:
  Test Maven plugin against latest Maven versions

Closes gh-26200
 2021-04-22 15:26:30 +02:00
Slawomir Jaranowski 50118f67fd Test Maven plugin against latest Maven versions 
See gh-26200
 2021-04-22 14:59:16 +02:00
Stephane Nicoll a7b0f90609 Merge branch '2.4.x' 
Closes gh-26211
 2021-04-22 14:48:30 +02:00
Stephane Nicoll e424c1c4b4 Merge branch '2.3.x' into 2.4.x 
Closes gh-26210
 2021-04-22 14:48:15 +02:00
Stephane Nicoll 1d88e8fa65 Merge pull request #26209 from zoosm3 
* pr/26209:
  Align Maven version in system requirements with what is actually tested

Closes gh-26209
 2021-04-22 14:48:06 +02:00
Shimizu, Yuko 474e460d5e Align Maven version in system requirements with what is actually tested 
See gh-26209
 2021-04-22 14:47:29 +02:00
Stephane Nicoll f1aeb8daf5 Merge branch '2.4.x' 2021-04-22 14:25:31 +02:00
Stephane Nicoll 65a7422a45 Upgrade to Kafka 2.6.2 
Closes gh-24247
 2021-04-22 14:12:55 +02:00
Stephane Nicoll 0c8f4e5ab3 Merge branch '2.4.x' 2021-04-22 11:11:51 +02:00
Stephane Nicoll 5aaca2b734 Upgrade Java 11 version in CI image 
Closes gh-26193
 2021-04-22 11:11:43 +02:00
Stephane Nicoll a712d9d089 Upgrade Java 8 version in CI image 
Closes gh-26196
 2021-04-22 11:10:34 +02:00