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
33,383 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

33383 Commits

Author SHA1 Message Date
Andy Wilkinson 3866f5f4d7 Merge branch '2.5.x' 
Closes gh-27440
 2021-07-22 08:28:11 +01:00
Andy Wilkinson ca9396d890 Merge branch '2.4.x' into 2.5.x 
Closes gh-27439
 2021-07-22 08:27:56 +01:00
Andy Wilkinson 79990a1b9c Upgrade to artifactory-resource 0.0.15 
Closes gh-27232
 2021-07-22 08:26:36 +01:00
Andy Wilkinson 37f690323f Polish 
Closes gh-27432
 2021-07-21 11:55:38 +01:00
Andy Wilkinson bb26b7bdf5 Polish 
Closes gh-27431
 2021-07-21 11:53:10 +01:00
Andy Wilkinson 14e23bf556 Merge pull request #27418 from izeye 
* gh-27418:
  Polish

Closes gh-27418
 2021-07-21 11:49:15 +01:00
izeye 734293d491 Polish 
See gh-27418
 2021-07-21 11:17:43 +01:00
Andy Wilkinson c211c971f1 Polishing 
Closes gh-27429
 2021-07-21 11:07:15 +01:00
Andy Wilkinson 4a533e14c3 Merge branch '2.4.x' into 2.5.x 
Closes gh-27428
 2021-07-21 11:06:40 +01:00
Andy Wilkinson c8c1452ced Merge pull request #27417 from dreis2211 
* gh-27417:
  Polishing

Closes gh-27417
 2021-07-21 11:06:30 +01:00
dreis2211 4d0c98011e Polishing 
See gh-27417
 2021-07-21 11:05:59 +01:00
Andy Wilkinson f34a2658b0 Merge branch '2.5.x' 
Closes gh-27427
 2021-07-21 11:02:44 +01:00
Andy Wilkinson bc9b34f031 Merge branch '2.4.x' into 2.5.x 
Closes gh-27426
 2021-07-21 11:02:34 +01:00
Andy Wilkinson dcced2561a Upgrade to Gradle Enterprise Conventions 0.0.8 
Closes gh-26115
 2021-07-21 11:02:15 +01:00
Andy Wilkinson 91579158c3 Merge branch '2.5.x' 
Closes gh-27425
 2021-07-21 10:58:27 +01:00
Andy Wilkinson 29c83bfd76 Instantiate detectors with ClassLoader that discovered them 
Fixes gh-27422
 2021-07-21 10:57:30 +01:00
Andy Wilkinson 7e0fdb74f5 Merge branch '2.5.x' 
Closes gh-27174
 2021-07-20 19:15:22 +01:00
Andy Wilkinson dfe91be885 Upgrade to Spring Integration 5.5.2 
Closes gh-27166
 2021-07-20 19:14:21 +01:00
Andy Wilkinson 289ebef7da Merge branch '2.5.x' 
Closes gh-27420
 2021-07-20 18:00:21 +01:00
Andy Wilkinson a5e95ef4c8 Merge branch '2.4.x' into 2.5.x 
Closes gh-27419
 2021-07-20 17:59:53 +01:00
Andy Wilkinson b5587b053d Use ClassLoader that will load Yaml to check if it's present 
Fixes gh-27133
 2021-07-20 17:59:40 +01:00
Andy Wilkinson a05da3ae14 Merge branch '2.5.x' 
Closes gh-27416
 2021-07-20 15:14:44 +01:00
Andy Wilkinson c2819d6c50 Merge pull request #26769 from dreis2211 
* gh-26769:
  Add Java 17 to JavaVersion enum

Closes gh-26769
 2021-07-20 15:13:30 +01:00
dreis2211 0ea3b9246a Add Java 17 to JavaVersion enum 
See gh-26769
 2021-07-20 15:12:50 +01:00
Andy Wilkinson 556d5683a9 Merge pull request #27376 from bono007 
* gh-27376:
  Polish "Make RabbitTemplateConfigurer's setters public"
  Make RabbitTemplateConfigurer's setters public

Closes gh-27376
 2021-07-20 15:00:37 +01:00
Andy Wilkinson 668f45f0e8 Polish "Make RabbitTemplateConfigurer's setters public" 
See gh-27376
 2021-07-20 14:59:24 +01:00
bono007 ce87928170 Make RabbitTemplateConfigurer's setters public 
See gh-27376
 2021-07-20 14:58:06 +01:00
Andy Wilkinson 6e7e72a481 Remove redundant deprecation suppressions 
Closes gh-27415
 2021-07-20 14:55:06 +01:00
Andy Wilkinson 6036cde7a3 Merge pull request #27409 from dreis2211 
* gh-27409:
  Remove redundant deprecation suppressions

Closes gh-27409
 2021-07-20 14:54:15 +01:00
dreis2211 f0df9671cd Remove redundant deprecation suppressions 
See gh-27409
 2021-07-20 14:53:28 +01:00
Andy Wilkinson 4b50938dd7 Merge branch '2.5.x' 2021-07-20 13:16:51 +01:00
Andy Wilkinson 5783caabd7 Upgrade to Spring AMQP 2.3.10 
Closes gh-27392
 2021-07-20 13:14:48 +01:00
Andy Wilkinson 47289de332 Upgrade to Spring Kafka 2.7.4 
Closes gh-27165
 2021-07-20 13:14:07 +01:00
Scott Frederick 9f001efa29 Adjust fat jar central directory to account for launch script 
An upgrade to Apache Commons Compress allows the build plugins to write
the launch script to the fat jar as a proper preamble, making the file
compatible with more jar and zip tooling.

Fixes gh-22336
 2021-07-19 15:02:42 -05:00
Andy Wilkinson b5ef5a2d90 Merge branch '2.5.x' 
Closes gh-27408
 2021-07-19 20:20:19 +01:00
Andy Wilkinson 9d2cb162e6 Configure initializer dependencies grouped by detector 
Previously, database initializers were detected and were configured
with dependencies based on their detection order. For example, if
detectors a, b, and c detected initializers a1, b1, b2, and c1,
c1 would depend on b2, b2 on b1, and b1 on a1:

------     ------     ------     ------
| c1 | --> | b2 | --> | b1 | --> | a1 |
------     ------     ------     ------

This could cause a dependency cycle in certain situations, for
example because the user had already configured b1 to depend on b2.

This commit reduces the risk of a cycle being created by batching
the initializers by their detector, with dependencies being
configured between each batch rather than between every initializer.
In the example above, this results in c1 depending on b1 and b2,
and b1 and b2 depending on a1:

           ------
------     | b1 |     ------
| c1 | --> |    | --> | a1 |
------     | b2 |     ------
           ------

As b1 and b2 were detected by the same detector, no dependency
between those initializers is defined.

Closes gh-27131
 2021-07-19 20:00:59 +01:00
Andy Wilkinson f7290b2714 Merge pull request #17924 from scottmf 
* gh-17924:
  Polish "Make dev tools' home directory configurable"
  Make dev tools' home directory configurable

Closes gh-17924
 2021-07-19 18:26:59 +01:00
Andy Wilkinson 8e7a6ceb44 Polish "Make dev tools' home directory configurable" 
See gh-17924
 2021-07-19 17:56:34 +01:00
sfeldstein b9dbfad473 Make dev tools' home directory configurable 
This allows separate projects to keep their own settings where common
settings such as spring.* or server.* don't conflict.

See gh-17924
 2021-07-19 17:56:34 +01:00
Andy Wilkinson 48db35bf8d Upgrade to Spring Kafka 2.8.0-M1 
Closes gh-27177
 2021-07-19 17:50:02 +01:00
Andy Wilkinson a1cf18a06a Upgrade to Spring AMQP 2.4.0-M1 
Closes gh-27171
 2021-07-19 17:49:28 +01:00
Andy Wilkinson f1e99649df Upgrade to Spring Security 5.6.0-M1 
Closes gh-27173
 2021-07-19 17:47:43 +01:00
Andy Wilkinson 7f490fbe8a Merge branch '2.5.x' 2021-07-19 17:47:09 +01:00
Andy Wilkinson cfed99dff5 Merge branch '2.4.x' into 2.5.x 2021-07-19 17:46:54 +01:00
Andy Wilkinson 9d64269552 Upgrade to Logback 1.2.4 
Closes gh-27380
 2021-07-19 17:16:28 +01:00
Andy Wilkinson 9973937af3 Upgrade to Spring AMQP 2.3.10 
Closes gh-27391
 2021-07-19 17:15:50 +01:00
Andy Wilkinson 26bedd6527 Upgrade to Spring Data 2021.1.0-M1 
See gh-27170
 2021-07-19 15:43:37 +01:00
Andy Wilkinson 894daa9ea6 Merge pull request #27371 from saraswathy-krish 
* gh-27371:
  Polish "Add idle timeout property for Reactor Netty"
  Add idle timeout property for Reactor Netty

Closes gh-27371
 2021-07-19 15:14:45 +01:00
Andy Wilkinson ed38ac6ff0 Polish "Add idle timeout property for Reactor Netty" 
See gh-27371
 2021-07-19 14:58:15 +01:00
Saraswathy Hariharakrishnan cbcd7b939b Add idle timeout property for Reactor Netty 
See gh-27371
 2021-07-19 14:49:08 +01:00