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

33767 Commits

Author SHA1 Message Date
Stephane Nicoll 7fbb9d471b Polish "Upgrade to Neo4j Java Driver 4.2.8" 
See gh-28717
 2021-11-17 16:14:25 +01:00
Stephane Nicoll 73cc23801a Merge branch '2.4.x' into 2.5.x 2021-11-17 15:24:05 +01:00
Stephane Nicoll f33c8f6fde Upgrade to Netty tcNative 2.0.46.Final 
Closes gh-28718
 2021-11-17 15:02:27 +01:00
Stephane Nicoll 9dd599c9e3 Upgrade to Neo4j Java Driver 4.2.8 
Closes gh-28717
 2021-11-17 15:02:25 +01:00
Stephane Nicoll 1df04c46b5 Upgrade to Netty tcNative 2.0.46.Final 
Closes gh-28716
 2021-11-17 14:59:51 +01:00
Andy Wilkinson d541dda6b9 Merge branch '2.4.x' into 2.5.x 2021-11-17 10:08:33 +00:00
Andy Wilkinson c6b2567156 Upgrade to Spring Batch 4.3.4 
Closes gh-28230
 2021-11-17 10:08:27 +00:00
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
Stephane Nicoll 663d5d4362 Merge pull request #28712 from vpavic 
* pr/28712:
  Fix "Configure Two DataSources" example

Closes gh-28712
 2021-11-17 09:01:45 +01: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 de172a52e3 Merge branch '2.4.x' into 2.5.x 2021-11-17 08:50:48 +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 385e7dd612 Upgrade to Spring Integration 5.4.12 
Closes gh-28612
 2021-11-17 08:48:53 +01:00
Stephane Nicoll d3e9e9519c Merge branch '2.4.x' into 2.5.x 2021-11-16 09:34:32 +01:00
Stephane Nicoll b16b0c789f Upgrade to Tomcat 9.0.55 
Closes gh-28696
 2021-11-16 09:08:16 +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 48ebd1bb4d Merge pull request #28671 from weixsun 
* pr/28671:
  Polish "Fix yaml sample format"
  Fix yaml sample format

Closes gh-28671
 2021-11-16 08:59:45 +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 ea064ce036 Merge pull request #28670 from weixsun 
* pr/28670:
  Polish "Fix yaml sample format in reference doc"
  Fix yaml sample format in reference doc

Closes gh-28670
 2021-11-16 08:50:44 +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
Stephane Nicoll 7f4c8aafdf Merge pull request #28683 from izeye 
* pr/28683:
  Update URL for GraphQL Spring Boot starter

Closes gh-28683
 2021-11-16 08:34:33 +01:00
izeye e56efc03f6 Update URL for GraphQL Spring Boot starter 
See gh-28683
 2021-11-16 08:33:56 +01:00
Stephane Nicoll db3a7db73d Upgrade to Tomcat 9.0.55 
Closes gh-28690
 2021-11-16 08:14:40 +01:00
Stephane Nicoll 38fd96e9c1 Upgrade to Logback 1.2.7 
Closes gh-28689
 2021-11-16 08:14:39 +01:00
Stephane Nicoll 826515a20f Upgrade to Kafka 2.6.3 
Closes gh-28688
 2021-11-16 08:14:38 +01:00
Stephane Nicoll 84d92b9504 Merge branch '2.4.x' into 2.5.x 2021-11-15 19:57:52 +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
Stephane Nicoll a23b737443 Upgrade to Spring Kafka 2.6.12 
Closes gh-28685
 2021-11-15 19:56:26 +01:00
Stephane Nicoll 69da7b4188 Upgrade to Spring AMQP 2.3.12 
Closes gh-28599
 2021-11-15 19:56:04 +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
Andy Wilkinson 2e5f80edaa Merge pull request #28677 from polarbear567 
* gh-28677:
  Fix @deprecated and @see in Archive's javadoc

Closes gh-28677
 2021-11-15 12:07: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 9d02d9a07d Merge pull request #28532 from jzheaux 
* pr/28532:
  Update copyright year of changed file
  Harmonize @ConditionalOnMissingBean definition

Closes gh-28532
 2021-11-14 08:24:36 +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 8c90188661 Merge branch '2.4.x' into 2.5.x 2021-11-13 16:18:39 +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