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
33,760 Commits 23 Branches 345 Tags 270 MiB
Commit Graph

14364 Commits

Author SHA1 Message Date
Andy Wilkinson 416a133fd1 Merge branch '2.4.x' into 2.5.x 
Closes gh-28250
 2021-11-17 10:06:41 +00:00
Andy Wilkinson 838533ef0e Upgrade to Spring Batch 4.3.4 
Closes gh-28230
 2021-11-17 10:04:51 +00:00
Vedran Pavic c8dd0a584b Fix "Configure Two DataSources" example 
With the present example, the `secondDataSource` bean factory method
will use `firstDataSourceProperties` due to it being annotated with
`@Primary`.

This commit adds the `@Qualifier` needed to ensure `secondDataSource`
bean factory method uses `secondDataSourceProperties`.

See gh-28712
 2021-11-17 09:00:14 +01:00
Stephane Nicoll 6325df2055 Upgrade to Spring Integration 5.5.6 
Closes gh-28513
 2021-11-17 08:50:32 +01:00
Stephane Nicoll 4fcb772f37 Upgrade to Logback 1.2.7 
Closes gh-28695
 2021-11-16 09:08:15 +01:00
Stephane Nicoll c4eea99608 Upgrade to Kafka 2.7.2 
Closes gh-28694
 2021-11-16 09:08:14 +01:00
Stephane Nicoll 9ed7674ab0 Polish "Fix yaml sample format" 
See gh-28671
 2021-11-16 08:55:52 +01:00
Weix Sun 7f1bd43c84 Fix yaml sample format 
See gh-28671
 2021-11-16 08:53:42 +01:00
Stephane Nicoll 6d79599d99 Polish "Fix yaml sample format in reference doc" 
See gh-28670
 2021-11-16 08:50:24 +01:00
Weix Sun 793a107d27 Fix yaml sample format in reference doc 
See gh-28670
 2021-11-16 08:45:50 +01:00
izeye e56efc03f6 Update URL for GraphQL Spring Boot starter 
See gh-28683
 2021-11-16 08:33:56 +01:00
Stephane Nicoll 882c58b1f1 Upgrade to Spring Kafka 2.7.9 
Closes gh-28539
 2021-11-15 19:57:41 +01:00
Stephane Nicoll d3c5563e60 Upgrade to Spring AMQP 2.3.12 
Closes gh-28600
 2021-11-15 19:57:15 +01:00
Andy Wilkinson 0aae9c26da Test our Gradle plugin against Gradle 7.3 
Closes gh-28679
 2021-11-15 12:47:51 +00:00
Andy Wilkinson 4cfbc0db36 Merge branch '2.4.x' into 2.5.x 
Closes gh-28680
 2021-11-15 12:08:49 +00:00
Leo Li 9de9983e25 Fix @deprecated and @see in Archive's javadoc 
See gh-28677
 2021-11-15 12:07:22 +00:00
Stephane Nicoll 4c193a1511 Merge branch '2.4.x' into 2.5.x 
Closes gh-28672
 2021-11-14 08:24:48 +01:00
Stephane Nicoll d21c48e474 Update copyright year of changed file 
See gh-28532
 2021-11-14 08:23:32 +01:00
Josh Cummings d817029575 Harmonize @ConditionalOnMissingBean definition 
See gh-28532
 2021-11-14 08:19:43 +01:00
Stephane Nicoll e396aa310f Upgrade to Spring Data 2021.0.7 
Closes gh-28512
 2021-11-13 16:17:57 +01:00
Stephane Nicoll 52098229c0 Upgrade to Spring HATEOAS 1.3.6 
Closes gh-28609
 2021-11-13 16:17:35 +01:00
Stephane Nicoll e7d62ffb01 Upgrade to Spring Data 2020.0.15 
Closes gh-28508
 2021-11-13 16:16:51 +01:00
Stephane Nicoll f3e2a40424 Upgrade to Spring HATEOAS 1.2.11 
Closes gh-28608
 2021-11-13 16:16:17 +01:00
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x 
Closes gh-28661
 2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters 
Closes gh-28658
 2021-11-12 20:04:35 +00:00
Andy Wilkinson ef02db9ed1 Merge branch '2.4.x' into 2.5.x 
Closes gh-28659
 2021-11-12 20:03:53 +00:00
Andy Wilkinson 0889cdd516 Add dependency management for Glassfish JSTL 
To be used in place of javax.servlet:jstl

Closes gh-28657
 2021-11-12 20:03:15 +00:00
Andy Wilkinson 3b180f42b7 Polish 2021-11-11 10:34:04 +00:00
Andy Wilkinson 1d1ab21ac3 Start building against Spring HATEOAS 1.3.6 snapshots 
See gh-28609
 2021-11-11 10:00:37 +00:00
Andy Wilkinson ede3e4e6a0 Start building against Spring HATEOAS 1.2.11 snapshots 
See gh-28608
 2021-11-11 09:59:05 +00:00
Andy Wilkinson 23197c34c7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28606
 2021-11-11 09:55:21 +00:00
Andy Wilkinson c018788846 Test JTA auto-configured from JNDI 
Closes gh-28594
 2021-11-11 09:54:50 +00:00
Stephane Nicoll 0b808fdd3c Upgrade to Micrometer 1.7.6 
Closes gh-28511
 2021-11-11 09:59:21 +01:00
Stephane Nicoll f969b60031 Upgrade to Spring Framework 5.3.13 
Closes gh-28510
 2021-11-11 09:57:53 +01:00
Stephane Nicoll 24c578e3ad Upgrade to Micrometer 1.6.13 
Closes gh-28507
 2021-11-11 09:57:22 +01:00
Stephane Nicoll c8d9f94821 Upgrade to Spring Framework 5.3.13 
Closes gh-28506
 2021-11-11 09:56:52 +01:00
Andy Wilkinson b5653ad551 Merge branch '2.4.x' into 2.5.x 2021-11-10 20:17:36 +00:00
Andy Wilkinson f3b5e6bb3e Adapt to removal of static resource location filtering 
See gh-28506
 2021-11-10 20:15:56 +00:00
Stephane Nicoll 4229039ba4 Start building against Spring AMQP 2.3.12 snapshots 
See gh-28600
 2021-11-10 19:51:53 +01:00
Stephane Nicoll 85e06438e3 Start building against Spring AMQP 2.3.12 snapshots 
See gh-28599
 2021-11-10 19:50:24 +01:00
Stephane Nicoll e5b168a227 Upgrade to Reactor 2020.0.13 
Closes gh-28505
 2021-11-09 19:43:48 +01:00
Stephane Nicoll ab1748f06f Upgrade to Reactor 2020.0.13 
Closes gh-28505
 2021-11-09 19:42:57 +01:00
Phillip Webb ddd38a7ac3 Merge branch '2.4.x' into 2.5.x 2021-11-08 13:14:35 -08:00
Phillip Webb 75bf430eb1 Polish ImportsContextCustomizerTests 
Update the test classes to include an `@Import` annotation. Without this
the tests would not fail even if the filter is missing.
 2021-11-08 13:13:04 -08:00
Phillip Webb 6406ee5609 Merge branch '2.4.x' into 2.5.x 
Closes gh-28565
 2021-11-08 13:08:52 -08:00
Phillip Webb 8a14e1e2e9 Polish 'Ignore JUnit annotations when caching test contexts' 
See gh-28563
 2021-11-08 13:07:26 -08:00
Loïc Ledoyen 23876d8a32 Ignore JUnit annotations when caching test contexts 
Update `ImportsContextCustomizer` to ignore JUnit annotations.

See gh-28563
 2021-11-08 13:06:23 -08:00
Stephane Nicoll f37406f7b1 Upgrade to Netty tcNative 2.0.45.Final 
Closes gh-28561
 2021-11-08 08:59:23 +01:00
Stephane Nicoll 4c8dbd7469 Upgrade to Netty 4.1.70.Final 
Closes gh-28560
 2021-11-08 08:59:22 +01:00
Stephane Nicoll 92193caff6 Upgrade to Johnzon 1.2.15 
Closes gh-28559
 2021-11-08 08:59:21 +01:00