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,781 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

33781 Commits

Author SHA1 Message Date
Andy Wilkinson c68e66c63f Merge pull request #28747 from jprinet 
* gh-28747:
  Upgrade Gradle Enterprise plugin to 3.7.2

Closes gh-28747
 2021-11-19 13:43:19 +00:00
Jerome Prinet 80e6bb2939 Upgrade Gradle Enterprise plugin to 3.7.2 
See gh-28747
 2021-11-19 13:42:47 +00:00
Andy Wilkinson 8f0e12dc34 Revert accidentally committed changes 
This partially reverts commit c083e0b049.
 2021-11-19 13:39:22 +00:00
Andy Wilkinson c083e0b049 Avoid using temp before @TempDir has initialized it 
Closes gh-28748
 2021-11-19 13:35:30 +00:00
Andy Wilkinson f2b959b0a5 Add <type>zip</type> to Elasticsearch dist in dependencies bom 
Fixes gh-28725
 2021-11-19 10:13:14 +00:00
Andy Wilkinson c4e2252c6d Merge branch '2.4.x' into 2.5.x 
Closes gh-28737
 2021-11-18 13:58:35 +00:00
Andy Wilkinson da8261921a Upgrade to concourse/oci-build-task 0.9.1 
Closes gh-28736
 2021-11-18 13:58:09 +00:00
Andy Wilkinson 88457d9cfa Merge branch '2.4.x' into 2.5.x 
Closes gh-28734
 2021-11-18 12:20:50 +00:00
Andy Wilkinson 7d19ea4ca1 Limit log output produced by spring-boot-deployment-tests:intTest 
Closes gh-28730
 2021-11-18 12:18:34 +00:00
Andy Wilkinson 5ccd70c73a Update LATEST_GA settings in preparation for 2.6.0 
Closes gh-28729
 2021-11-18 12:02:00 +00:00
Andy Wilkinson a1a04ebf11 Merge branch '2.4.x' into 2.5.x 2021-11-18 11:35:16 +00:00
Spring Builds 9e9215d05a Next development version (v2.5.8-SNAPSHOT) 2021-11-18 11:03:25 +00:00
Spring Builds 54b11cb3fb Next development version (v2.4.14-SNAPSHOT) 2021-11-18 08:02:52 +00:00
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
 2021-11-17 16:40:53 -08:00
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