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

30272 Commits

Author SHA1 Message Date
Phillip Webb 743fedc0ea Merge branch '2.2.x' into 2.3.x 2020-12-10 18:52:31 -08:00
Phillip Webb ff124c0902 Use GitHub token rather than password 
See gh-24458
 2020-12-10 18:51:47 -08:00
Phillip Webb c45600e289 Merge branch '2.3.x' 2020-12-10 18:26:50 -08:00
Phillip Webb 305694e162 Merge branch '2.2.x' into 2.3.x 2020-12-10 18:22:35 -08:00
Phillip Webb babae118fc Attempt to fix oci-build-task config 
See gh-24197
 2020-12-10 16:40:44 -08:00
Phillip Webb b953c41a5f Attempt to fix oci-build-task config 
See gh-24197
 2020-12-10 16:31:37 -08:00
Phillip Webb 398c6b3603 Attempt to fix oci-build-task config 
See gh-24197
 2020-12-10 16:20:37 -08:00
Phillip Webb 615d054dec Attempt to fix oci-build-task config 
See gh-24197
 2020-12-10 15:58:19 -08:00
Phillip Webb 6990fff27a Attempt to fix oci-build-task config 
See gh-24197
 2020-12-10 14:35:04 -08:00
Phillip Webb cae5ed81cd Fix README 2020-12-10 14:13:05 -08:00
Phillip Webb c14be4e84b Generate CI images with oci-build-task 
Update CI to generate images using an `oci-build-task` since
the `registry-image` resource cannot perform actual image builds.

See gh-24197
 2020-12-10 14:10:17 -08:00
Phillip Webb fa44a1d0c5 Migrate to registry-image in task yaml 
See gh-24197
 2020-12-10 14:09:55 -08:00
Madhura Bhave f20c3e17f1 Merge branch '2.3.x' 2020-12-10 12:38:59 -08:00
Madhura Bhave aa24d623fe Merge branch '2.2.x' into 2.3.x 2020-12-10 12:37:16 -08:00
Madhura Bhave 5cab547fe4 Fix SDKMAN automation 2020-12-10 12:36:22 -08:00
Phillip Webb 72d36e0c07 Update copyright year of changed files 2020-12-10 10:46:04 -08:00
Phillip Webb 14816a6b6c Support @Name meta-annotations with Kotlin binding 
Update `ValueObjectBinder` Kotlin support to meta-annotations of
`@Named`.

See gh-24379
 2020-12-10 10:44:15 -08:00
Andy Wilkinson 32e1289bbc Use unique names for wildcard property sources 
Update `StandardConfigDataLoader` to use unique names for property
sources imported from a wildcard location.

Prior to this commit, all the property sources created from the same
wildcard location would have the same name. Each time a property source
that is equal to an existing property source is added, it replaces the
existing property source. Property source equality is name-based so this
resulted in the last property sources from the wildcard location
winning.

This commit updates `StandardConfigDataLoader` to use the resolved
Resource rather than the wildcard location in which it was discovered
in the name of the property source that it creates, ensuring that each
is property source from a wildcard location is uniquely named.

Fixes gh-24428
 2020-12-10 10:43:34 -08:00
Madhura Bhave 5da22b5bff Fix syntax in bash script 2020-12-10 10:42:12 -08:00
Madhura Bhave 2e8d26150b Add git-repo as input to sdkman 2020-12-10 10:33:00 -08:00
Stephane Nicoll aaaed07735 Merge branch '2.3.x' 2020-12-10 18:31:53 +01:00
Stephane Nicoll 360013cba4 Merge branch '2.2.x' into 2.3.x 2020-12-10 18:31:32 +01:00
Stephane Nicoll 793bfff2c8 Polish 
See gh-21903
 2020-12-10 18:20:33 +01:00
Spring Buildmaster cab98450e5 Next development version (v2.2.13.BUILD-SNAPSHOT) 2020-12-10 16:19:46 +00:00
Stephane Nicoll 806cc479cd Merge branch '2.3.x' 
Closes gh-24451
 2020-12-10 15:47:06 +01:00
Stephane Nicoll 5b88a1908a Upgrade to Gradle 6.7.1 
Closes gh-24450
 2020-12-10 15:46:42 +01:00
Stephane Nicoll e2435117e1 Merge branch '2.2.x' into 2.3.x 2020-12-10 15:44:30 +01:00
Stephane Nicoll 0533ac58fb Test the Gradle plugin against 6.7.1 
Closes gh-24449
 2020-12-10 15:33:37 +01:00
Stephane Nicoll 3f58eff466 Merge pull request #24418 from izeye 
* pr/24418:
  Polish

Closes gh-24418
 2020-12-10 13:53:28 +01:00
izeye 0eae6b4f72 Polish 
See gh-24418
 2020-12-10 13:53:06 +01:00
Stephane Nicoll 105cf591bf Merge branch '2.3.x' 
See gh-24418
 2020-12-10 13:52:49 +01:00
Stephane Nicoll ab99de4349 Polish 
See gh-24418
 2020-12-10 13:52:11 +01:00
Stephane Nicoll 6b858f3b84 Upgrade to Tomcat 9.0.41 
Closes gh-24447
 2020-12-10 09:30:36 +01:00
Stephane Nicoll dec085fa3c Upgrade to SQLite JDBC 3.32.3.3 
Closes gh-24446
 2020-12-10 09:30:35 +01:00
Stephane Nicoll 9091161cf9 Upgrade to Netty tcNative 2.0.35.Final 
Closes gh-24445
 2020-12-10 09:30:33 +01:00
Stephane Nicoll 9d5ea3da29 Upgrade to Netty 4.1.55.Final 
Closes gh-24444
 2020-12-10 09:30:32 +01:00
Stephane Nicoll 37f79f83ad Upgrade to Caffeine 2.8.8 
Closes gh-24443
 2020-12-10 09:30:31 +01:00
Stephane Nicoll ba87a0f23a Upgrade to Spring Kafka 2.6.4 
Closes gh-24294
 2020-12-10 09:28:58 +01:00
Stephane Nicoll 7d032330d2 Upgrade to Spring Batch 4.3.1 
Closes gh-24291
 2020-12-10 09:27:18 +01:00
Stephane Nicoll 2786b3dd66 Upgrade to Spring Integration 5.4.2 
Closes gh-24442
 2020-12-10 09:25:36 +01:00
Stephane Nicoll b06e0b50b4 Upgrade to Spring AMQP 2.3.2 
Closes gh-24288
 2020-12-10 09:24:31 +01:00
Stephane Nicoll d339cb1513 Upgrade to Micrometer 1.6.2 
Closes gh-24281
 2020-12-10 09:23:41 +01:00
Stephane Nicoll ee7c50b757 Merge branch '2.3.x' 2020-12-10 09:21:16 +01:00
Stephane Nicoll 94b6b62077 Upgrade to Undertow 2.1.5.Final 
Closes gh-24441
 2020-12-10 09:03:03 +01:00
Stephane Nicoll 30748b8dd0 Upgrade to Tomcat 9.0.41 
Closes gh-24440
 2020-12-10 09:03:02 +01:00
Stephane Nicoll 264cd83f4b Upgrade to Netty tcNative 2.0.35.Final 
Closes gh-24439
 2020-12-10 09:03:01 +01:00
Stephane Nicoll 1c720a56b2 Upgrade to Netty 4.1.55.Final 
Closes gh-24438
 2020-12-10 09:03:00 +01:00
Stephane Nicoll b6b046702f Upgrade to Caffeine 2.8.8 
Closes gh-24437
 2020-12-10 09:02:58 +01:00
Stephane Nicoll fd91daaf21 Upgrade to ActiveMQ 5.15.14 
Closes gh-24436
 2020-12-10 09:02:57 +01:00
Stephane Nicoll 5f8900ea0e Upgrade to Spring Kafka 2.5.10 
Closes gh-24293
 2020-12-10 09:00:35 +01:00