Commit Graph

34970 Commits (dfab6ee30727c92597c139a4d5a1f0c4b9fab37a)
 

Author SHA1 Message Date
Andy Wilkinson 8f0e12dc34 Revert accidentally committed changes
This partially reverts commit c083e0b049.
3 years ago
Andy Wilkinson c0d90dfa8f Merge branch '2.5.x'
Closes gh-28749
3 years ago
Andy Wilkinson c083e0b049 Avoid using temp before @TempDir has initialized it
Closes gh-28748
3 years ago
Andy Wilkinson 4a0fa62d2e Polish "Replace "you're""
See gh-28710
3 years ago
Jay Bryant e629e77b29 Replace "you're"
This commit replaces "you're" with some other structure, often
simplifying the sentence in the process.

Also checked for words that end with "'ll" and "n't" but did not find
any.

See gh-28710
3 years ago
Andy Wilkinson 00fa0fb769 Merge branch '2.5.x'
Closes gh-28746
3 years ago
Andy Wilkinson f2b959b0a5 Add <type>zip</type> to Elasticsearch dist in dependencies bom
Fixes gh-28725
3 years ago
Spring Builds 96eaef4290 Next development version (v2.6.1-SNAPSHOT) 3 years ago
Phillip Webb e9beac6fd6 Drop CI registry mirror settings 3 years ago
Phillip Webb b6d0b44703 Fix @SuppressWarnings 3 years ago
Madhura Bhave dd1d1482dc Deny unauthorized access to the error page
Fixes gh-26356

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
3 years ago
Andy Wilkinson 8bd3d53085 Merge branch '2.5.x'
Closes gh-28738
3 years ago
Andy Wilkinson c4e2252c6d Merge branch '2.4.x' into 2.5.x
Closes gh-28737
3 years ago
Andy Wilkinson da8261921a Upgrade to concourse/oci-build-task 0.9.1
Closes gh-28736
3 years ago
Andy Wilkinson 7ed19a3b59 Merge branch '2.5.x'
Closes gh-28735
3 years ago
Andy Wilkinson 88457d9cfa Merge branch '2.4.x' into 2.5.x
Closes gh-28734
3 years ago
Andy Wilkinson 7d19ea4ca1 Limit log output produced by spring-boot-deployment-tests:intTest
Closes gh-28730
3 years ago
Andy Wilkinson 11e1916766 Merge branch '2.5.x'
Closes gh-28733
3 years ago
Andy Wilkinson 5ccd70c73a Update LATEST_GA settings in preparation for 2.6.0
Closes gh-28729
3 years ago
Andy Wilkinson 29725ec68a Update links to Spring Security's reference docs
Closes gh-28618
3 years ago
Andy Wilkinson 5f52f1cc81 Merge branch '2.5.x' 3 years ago
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 6b79d2860f Merge branch '2.5.x' into main
Closes gh-28724
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 e17461ed8b Merge branch '2.5.x' 3 years ago
Stephane Nicoll 7fbb9d471b Polish "Upgrade to Neo4j Java Driver 4.2.8"
See gh-28717
3 years ago
Stephane Nicoll 1b8d8cfefc Merge branch '2.5.x' 3 years ago
Stephane Nicoll 73cc23801a Merge branch '2.4.x' into 2.5.x 3 years ago
Stephane Nicoll a6163f6acf Upgrade to Netty tcNative 2.0.46.Final
Closes gh-28720
3 years ago
Stephane Nicoll fc69be302a Upgrade to HttpClient5 5.1.2
Closes gh-28719
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
Stephane Nicoll ba3d0d7771 Upgrade to Spring Session 2021.1.0
Closes gh-28522
3 years ago
Andy Wilkinson 313470ac9d Merge branch '2.5.x' 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 ea0613c7d7 Merge branch '2.5.x'
Closes gh-28261
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 afa006986b Merge branch '2.5.x'
Closes gh-28713
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 d88658d47a Remove dependencies on micrometer-jersey2
Closes gh-28706
3 years ago
Stephane Nicoll a02be1b9a2 Merge branch '2.5.x' 3 years ago
Stephane Nicoll 37864f6e66 Upgrade to Spring Integration 5.5.6
Closes gh-28521
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