Commit Graph

33821 Commits (43f3d0dea0e28b53fc29c4ee001312462d85f0ac)
 

Author SHA1 Message Date
Andy Wilkinson a1a04ebf11 Merge branch '2.4.x' into 2.5.x 3 years ago
Spring Builds 9e9215d05a Next development version (v2.5.8-SNAPSHOT) 3 years ago
Spring Builds 54b11cb3fb Next development version (v2.4.14-SNAPSHOT) 3 years ago
Madhura Bhave 64270eca51 Convert environment used by SpringBootTestContextLoader
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.

The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.

Fixes gh-28530
3 years ago
Stephane Nicoll 7fbb9d471b Polish "Upgrade to Neo4j Java Driver 4.2.8"
See gh-28717
3 years ago
Stephane Nicoll 73cc23801a Merge branch '2.4.x' into 2.5.x 3 years ago
Stephane Nicoll f33c8f6fde Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28718
3 years ago
Stephane Nicoll 9dd599c9e3 Upgrade to Neo4j Java Driver 4.2.8
Closes gh-28717
3 years ago
Stephane Nicoll 1df04c46b5 Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28716
3 years ago
Andy Wilkinson d541dda6b9 Merge branch '2.4.x' into 2.5.x 3 years ago
Andy Wilkinson c6b2567156 Upgrade to Spring Batch 4.3.4
Closes gh-28230
3 years ago
Andy Wilkinson 416a133fd1 Merge branch '2.4.x' into 2.5.x
Closes gh-28250
3 years ago
Andy Wilkinson 838533ef0e Upgrade to Spring Batch 4.3.4
Closes gh-28230
3 years ago
Stephane Nicoll 663d5d4362 Merge pull request #28712 from vpavic
* pr/28712:
  Fix "Configure Two DataSources" example

Closes gh-28712
3 years ago
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
3 years ago
Stephane Nicoll de172a52e3 Merge branch '2.4.x' into 2.5.x 3 years ago
Stephane Nicoll 6325df2055 Upgrade to Spring Integration 5.5.6
Closes gh-28513
3 years ago
Stephane Nicoll 385e7dd612 Upgrade to Spring Integration 5.4.12
Closes gh-28612
3 years ago
Stephane Nicoll d3e9e9519c Merge branch '2.4.x' into 2.5.x 3 years ago
Stephane Nicoll b16b0c789f Upgrade to Tomcat 9.0.55
Closes gh-28696
3 years ago
Stephane Nicoll 4fcb772f37 Upgrade to Logback 1.2.7
Closes gh-28695
3 years ago
Stephane Nicoll c4eea99608 Upgrade to Kafka 2.7.2
Closes gh-28694
3 years ago
Stephane Nicoll 48ebd1bb4d Merge pull request #28671 from weixsun
* pr/28671:
  Polish "Fix yaml sample format"
  Fix yaml sample format

Closes gh-28671
3 years ago
Stephane Nicoll 9ed7674ab0 Polish "Fix yaml sample format"
See gh-28671
3 years ago
Weix Sun 7f1bd43c84 Fix yaml sample format
See gh-28671
3 years ago
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
3 years ago
Stephane Nicoll 6d79599d99 Polish "Fix yaml sample format in reference doc"
See gh-28670
3 years ago
Weix Sun 793a107d27 Fix yaml sample format in reference doc
See gh-28670
3 years ago
Stephane Nicoll 7f4c8aafdf Merge pull request #28683 from izeye
* pr/28683:
  Update URL for GraphQL Spring Boot starter

Closes gh-28683
3 years ago
izeye e56efc03f6 Update URL for GraphQL Spring Boot starter
See gh-28683
3 years ago
Stephane Nicoll db3a7db73d Upgrade to Tomcat 9.0.55
Closes gh-28690
3 years ago
Stephane Nicoll 38fd96e9c1 Upgrade to Logback 1.2.7
Closes gh-28689
3 years ago
Stephane Nicoll 826515a20f Upgrade to Kafka 2.6.3
Closes gh-28688
3 years ago
Stephane Nicoll 84d92b9504 Merge branch '2.4.x' into 2.5.x 3 years ago
Stephane Nicoll 882c58b1f1 Upgrade to Spring Kafka 2.7.9
Closes gh-28539
3 years ago
Stephane Nicoll d3c5563e60 Upgrade to Spring AMQP 2.3.12
Closes gh-28600
3 years ago
Stephane Nicoll a23b737443 Upgrade to Spring Kafka 2.6.12
Closes gh-28685
3 years ago
Stephane Nicoll 69da7b4188 Upgrade to Spring AMQP 2.3.12
Closes gh-28599
3 years ago
Andy Wilkinson 0aae9c26da Test our Gradle plugin against Gradle 7.3
Closes gh-28679
3 years ago
Andy Wilkinson 4cfbc0db36 Merge branch '2.4.x' into 2.5.x
Closes gh-28680
3 years ago
Andy Wilkinson 2e5f80edaa Merge pull request #28677 from polarbear567
* gh-28677:
  Fix @deprecated and @see in Archive's javadoc

Closes gh-28677
3 years ago
Leo Li 9de9983e25 Fix @deprecated and @see in Archive's javadoc
See gh-28677
3 years ago
Stephane Nicoll 4c193a1511 Merge branch '2.4.x' into 2.5.x
Closes gh-28672
3 years ago
Stephane Nicoll 9d02d9a07d Merge pull request #28532 from jzheaux
* pr/28532:
  Update copyright year of changed file
  Harmonize @ConditionalOnMissingBean definition

Closes gh-28532
3 years ago
Stephane Nicoll d21c48e474 Update copyright year of changed file
See gh-28532
3 years ago
Josh Cummings d817029575 Harmonize @ConditionalOnMissingBean definition
See gh-28532
3 years ago
Stephane Nicoll 8c90188661 Merge branch '2.4.x' into 2.5.x 3 years ago
Stephane Nicoll e396aa310f Upgrade to Spring Data 2021.0.7
Closes gh-28512
3 years ago
Stephane Nicoll 52098229c0 Upgrade to Spring HATEOAS 1.3.6
Closes gh-28609
3 years ago
Stephane Nicoll e7d62ffb01 Upgrade to Spring Data 2020.0.15
Closes gh-28508
3 years ago