root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
37,420 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

37420 Commits

Author SHA1 Message Date
Stephane Nicoll 048ca9fc3c Merge pull request #30693 from marcingrzejszczak 
* pr/30693:
  Polish "Start building against Micrometer 1.10.0 snapshots"
  Start building against Micrometer 1.10.0 snapshots

Closes gh-30693
 2022-04-15 15:59:53 +02:00
Stephane Nicoll 8c68b33240 Polish "Start building against Micrometer 1.10.0 snapshots" 
See gh-30693
 2022-04-15 15:59:24 +02:00
Marcin Grzejszczak 87991d93a5 Start building against Micrometer 1.10.0 snapshots 
See gh-30693
 2022-04-15 14:16:16 +02:00
Stephane Nicoll aecb035e99 Merge branch '2.7.x' 2022-04-15 09:11:10 +02:00
Stephane Nicoll 8969f7f8f1 Merge branch '2.6.x' into 2.7.x 2022-04-15 09:11:02 +02:00
Stephane Nicoll f6a8c63e31 Merge branch '2.5.x' into 2.6.x 2022-04-15 09:10:50 +02:00
Stephane Nicoll af7c20491b Upgrade to Undertow 2.2.17.Final 
Closes gh-30690
 2022-04-15 08:29:10 +02:00
Stephane Nicoll 5fa96dee78 Upgrade to Tomcat 9.0.62 
Closes gh-30689
 2022-04-15 08:29:08 +02:00
Stephane Nicoll 7d8128adc8 Upgrade to RSocket 1.1.2 
Closes gh-30688
 2022-04-15 08:29:05 +02:00
Stephane Nicoll aa76f451e3 Upgrade to Pooled JMS 1.2.4 
Closes gh-30687
 2022-04-15 08:29:03 +02:00
Stephane Nicoll 5d430b4267 Upgrade to Netty 4.1.76.Final 
Closes gh-30686
 2022-04-15 08:29:01 +02:00
Stephane Nicoll 1d6df5181c Upgrade to Kotlin 1.6.20 
Closes gh-30685
 2022-04-15 08:28:59 +02:00
Stephane Nicoll 9a89e83be4 Upgrade to Jetty 9.4.46.v20220331 
Closes gh-30684
 2022-04-15 08:28:57 +02:00
Stephane Nicoll aa629c8510 Upgrade to Hibernate 5.6.8.Final 
Closes gh-30683
 2022-04-15 08:28:54 +02:00
Stephane Nicoll be5c168e8c Upgrade to AppEngine SDK 1.9.96 
Closes gh-30682
 2022-04-15 08:28:52 +02:00
Stephane Nicoll 1be434e0a3 Upgrade to Spring Retry 1.3.3 
Closes gh-30599
 2022-04-15 08:26:19 +02:00
Stephane Nicoll 9299329256 Upgrade to Spring Retry 1.3.3 
Closes gh-30590
 2022-04-15 08:25:42 +02:00
Stephane Nicoll be2b70452e Upgrade to Undertow 2.2.17.Final 
Closes gh-30681
 2022-04-15 07:49:53 +02:00
Stephane Nicoll 8199ffd4ed Upgrade to Tomcat 9.0.62 
Closes gh-30680
 2022-04-15 07:49:51 +02:00
Stephane Nicoll ded1810bd1 Upgrade to RSocket 1.1.2 
Closes gh-30679
 2022-04-15 07:49:49 +02:00
Stephane Nicoll a913e4fdd5 Upgrade to Pooled JMS 1.2.4 
Closes gh-30678
 2022-04-15 07:49:46 +02:00
Stephane Nicoll 0389bc84db Upgrade to Netty 4.1.76.Final 
Closes gh-30677
 2022-04-15 07:49:44 +02:00
Stephane Nicoll a245028b05 Upgrade to Jetty 9.4.46.v20220331 
Closes gh-30676
 2022-04-15 07:49:42 +02:00
Stephane Nicoll c6473bb5b5 Upgrade to AppEngine SDK 1.9.96 
Closes gh-30675
 2022-04-15 07:49:40 +02:00
Stephane Nicoll 4d7cbce40e Merge branch '2.7.x' 2022-04-15 07:46:48 +02:00
Stephane Nicoll 07669aa514 Merge branch '2.6.x' into 2.7.x 2022-04-15 07:46:41 +02:00
Stephane Nicoll 513aa2cba9 Merge branch '2.5.x' into 2.6.x 2022-04-15 07:46:30 +02:00
Stephane Nicoll 2fd04d9711 Upgrade to Micrometer 1.8.5 
Closes gh-30597
 2022-04-15 07:46:20 +02:00
Stephane Nicoll 5661c18d26 Upgrade to Micrometer 1.7.11 
Closes gh-30588
 2022-04-15 07:45:32 +02:00
Andy Wilkinson 4a401bfa16 Adapt to breaking changes in Spring Session Data Redis 
See gh-30639
 2022-04-14 20:41:20 +01:00
Brian Clozel 3dc8848d3a Merge branch '2.7.x' 2022-04-14 19:56:26 +02:00
Brian Clozel eddb2b16ff Configure RSocket server support in GraphQL 
This commit adds the RSocket server auto-configuration for GraphQL.

See gh-30453
 2022-04-14 19:54:40 +02:00
Andy Wilkinson 7e97073994 Merge branch '2.7.x' 2022-04-14 18:38:26 +01:00
Andy Wilkinson 74494f1d37 Merge branch '2.6.x' into 2.7.x 
Closes gh-30671
 2022-04-14 18:38:09 +01:00
Andy Wilkinson 1720290234 Merge branch '2.5.x' into 2.6.x 
Closes gh-30670
 2022-04-14 18:37:55 +01:00
Andy Wilkinson f7d181e65b Handle null additional properties more gracefully 
Closes gh-30654
 2022-04-14 18:36:15 +01:00
Andy Wilkinson 9658661bd4 Merge branch '2.7.x' 2022-04-14 14:53:40 +01:00
Andy Wilkinson 7789a18d23 Merge branch '2.6.x' into 2.7.x 
Closes gh-30667
 2022-04-14 14:51:22 +01:00
Andy Wilkinson d4348279a7 Merge branch '2.5.x' into 2.6.x 
Closes gh-30666
 2022-04-14 14:51:09 +01:00
Andy Wilkinson 8f1b8622ba Ensure that webEnvironment=NONE creates non-web context 
Previously, if spring.main.web-application-type was configured in
application.properties to servlet or reactive, setting
webEnvironment=NONE on @SpringBootTest would not work correctly and
a servlet or reactive web application context would be created
based on the value of spring.main.web-application-type.

This commit updates the test context bootstapper to set
spring.main.web-application-type to none when webEnvironment has been
set to none. This is done in the merged context configuration's
property source properties which are applied to the environment in a
high-precedence test property source that will override configuration
in application.properties.

Closes gh-29695
 2022-04-14 14:44:30 +01:00
Andy Wilkinson 21ccd58f67 Merge branch '2.7.x' 2022-04-14 13:29:08 +01:00
Andy Wilkinson 4545d39603 Merge branch '2.6.x' into 2.7.x 
Closes gh-30665
 2022-04-14 13:28:39 +01:00
Andy Wilkinson 887fa4a13f Merge branch '2.5.x' into 2.6.x 
Closes gh-30664
 2022-04-14 12:40:29 +01:00
Andy Wilkinson c8de843d85 Honor final web application type when creating context in tests 
Previously, SpringBootContextLoader would configure its
SpringApplication with an ApplicationContextFactory that ignores
the WebApplicationType with which its called and instead returns a
hard-coded type of context based on the type of the
MergedContextConfiguration. This hard-coding would result in the
wrong type of context being used if a subsequent change was made to
the application's WebApplicationType, for example due to binding of
the spring.main.web-application-type configuration property.

This commit updates SpringBootContextLoader to configure
SpringApplication with an ApplicationContextFactory that takes the
WebApplicationType with which it is called into consideration.

Fixes gh-29170
 2022-04-14 12:26:07 +01:00
Stephane Nicoll b0fb212836 Merge pull request #30572 from pruidong 
* pr/30572:
  Polish "Add link to @Order annotation"
  Add link to @Order annotation

Closes gh-30572
 2022-04-14 10:44:59 +02:00
Stephane Nicoll c654638654 Polish "Add link to @Order annotation" 
See gh-30572
 2022-04-14 10:39:22 +02:00
prd c72f3d79af Add link to @Order annotation 
See gh-30572
 2022-04-14 10:36:33 +02:00
Moritz Halbritter 3860eb211a Implement auto-configurations for Brave and OpenTelemetry 
- Configure Zipkin
- Configure Wavefront
- Configure Brave
- Configure OpenTelemetry
- Configure Micrometer Tracing bridges for OpenTelemetry and Brave
- Create the ObservationHandler for tracing with Micrometer

Closes gh-30156
 2022-04-14 09:14:44 +02:00
Scott Frederick f5f7fc8e9a Merge branch '2.7.x' 2022-04-13 16:29:00 -05:00
Scott Frederick d387b3fa81 Support configuration of web SSL using PEM-encoded certificates 
This commit adds the ability to configure SSL in embedded web containers
using PEM-encoded certificate and private key files, as an alternative
to configuring SSL with Java KeyStore files.

Closes gh-29273
 2022-04-13 16:28:04 -05:00