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
29,954 Commits 23 Branches 345 Tags 278 MiB
Commit Graph

29954 Commits

Author SHA1 Message Date
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
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
Stephane Nicoll 18e2ce1682 Upgrade to Spring Batch 4.2.5 
Closes gh-24290
 2020-12-10 08:59:47 +01:00
Stephane Nicoll c08310ca35 Upgrade to Spring AMQP 2.2.13 
Closes gh-24287
 2020-12-10 08:56:38 +01:00
Stephane Nicoll 388f00612e Upgrade to Micrometer 1.5.9 
Closes gh-24427
 2020-12-10 08:55:51 +01:00
Stephane Nicoll 0dd3315ab8 Merge branch '2.2.x' into 2.3.x 2020-12-10 08:55:10 +01:00
Stephane Nicoll 7f9d0d2d7c Upgrade to Tomcat 9.0.41 
Closes gh-24435
 2020-12-10 08:20:55 +01:00
Stephane Nicoll 1094b7c10c Upgrade to Activemq 5.15.14 
Closes gh-24434
 2020-12-10 08:20:54 +01:00
Stephane Nicoll b8c68ef374 Upgrade to Undertow 2.0.33.Final 
Closes gh-24433
 2020-12-10 08:20:53 +01:00
Stephane Nicoll a9924c3576 Upgrade to Netty Tcnative 2.0.35.Final 
Closes gh-24432
 2020-12-10 08:20:51 +01:00
Stephane Nicoll 55b680e452 Upgrade to Netty 4.1.55.Final 
Closes gh-24431
 2020-12-10 08:20:50 +01:00
Stephane Nicoll 6d5e3b2c0d Upgrade to Caffeine 2.8.8 
Closes gh-24430
 2020-12-10 08:20:49 +01:00
Stephane Nicoll 60e69c2c3e Upgrade to Spring Kafka 2.3.13 
Closes gh-24292
 2020-12-10 08:19:26 +01:00
Stephane Nicoll 520b4bba9c Upgrade to Spring Batch 4.2.5 
Closes gh-24289
 2020-12-10 08:18:45 +01:00
Stephane Nicoll 317ec32458 Upgrade to Spring Integration 5.2.10 
Closes gh-24429
 2020-12-10 08:18:17 +01:00
Stephane Nicoll 241730bf10 Upgrade to Spring AMQP 2.2.13 
Closes gh-24286
 2020-12-10 08:17:25 +01:00
Phillip Webb 112503058a Merge branch '2.3.x' 
Closes gh-24425
 2020-12-09 18:24:22 -08:00
Phillip Webb 0bfa9cf107 Merge branch '2.2.x' into 2.3.x 
Closes gh-24424
 2020-12-09 18:19:28 -08:00
Phillip Webb 869141766b Use deterministic ordering of JavaBean methods 
Update `JavaBeanBinder` so that methods and fields are sorted before
being processed. This ensures that setters are called in a deterministic
order, rather than the unspecified and variable order that reflection
provides.

Fixes gh-24068
 2020-12-09 18:19:07 -08:00
Scott Frederick 1f26afffba Merge branch '2.3.x' 
Closes gh-24422
 2020-12-09 16:20:15 -06:00