Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,613 Commits 23 Branches 0 Tags
38d96aabef94debe6ae5647802e61b9510d88a67
Commit Graph

26227 Commits

Author SHA1 Message Date
dreis2211
5b63b807ad Separate compound properties in appendices 2019-04-30 15:25:39 +02:00
Stephane Nicoll
922ceed63a Polish "Auto-configure ReactiveStringRedisTemplate if necessary" 
Closes gh-16604
 2019-04-30 14:51:47 +02:00
Qiang Lee
866233bd2f Auto-configure ReactiveStringRedisTemplate if necessary 
See gh-16604
 2019-04-30 14:43:35 +02:00
Stephane Nicoll
81543873d4 Merge branch '2.1.x' 2019-04-30 14:33:12 +02:00
ielatif
3ffbe256f1 Exclude HikariCP specific dependency from Quartz 
Closes gh-16628
 2019-04-30 14:31:17 +02:00
Tetsuya Hasegawa
56c769f05c Remove redundant info 
Closes gh-16668
 2019-04-30 09:05:48 +02:00
Stephane Nicoll
05957689f4 Polish "Add jOOQ to SQL logging group" 
Closes gh-16678
 2019-04-30 08:57:32 +02:00
Maciej Walkowiak
d7722e328a Add jOOQ to SQL logging group 
See gh-16678
 2019-04-30 08:55:07 +02:00
Toshiaki Maki
e203f6a5f5 Fix typo 
Closes gh-16684
 2019-04-30 08:40:35 +02:00
Johnny Lim
e22c2e5687 Polish 
Closes gh-16685
 2019-04-30 08:24:18 +02:00
Madhura Bhave
a0d425332d Use ImportBeanDefintionRegistrar directly instead of import selector 
Closes gh-16679
 2019-04-29 18:01:31 -07:00
Andy Wilkinson
5639685770 Polish "Prefer file: to jar:file: URLs in launcher" 
See gh-16248
 2019-04-29 14:41:03 +01:00
hengyunabc
c1b34d0307 Prefer file: to jar:file: URLs in launcher 
See gh-16248
 2019-04-29 14:39:20 +01:00
Stephane Nicoll
704da1750b Polish "Add support for Hazelcast YAML configuration" 
Closes gh-16632
 2019-04-29 15:16:43 +02:00
Rafal Leszko
82e18ae88f Add support for Hazelcast YAML configuration 
Since Hazlecast 3.12, YAML configuration format is supported in
addition to XML. Therefore, this change makes Spring Boot automatically
discover not only `hazelcast.xml` (and `hazelcast-client.xml`), but also
`hazelcast.yaml` (and `hazelcast-client.yaml`).

See gh-16632
 2019-04-29 14:19:10 +02:00
Brian Clozel
b527d364dc Reinstate single page reference documentation 
This commit reinstates the single-page variant for the Spring Boot
reference documentation.

Now the single and multi-page variants are hosted under the same
`"html"` folder, as `"index.html"` and `"single-index.html"`.
Note that files ending in `"index.html`" are treated as index files by
the spring-doc-resources project and their table of contents do not
display a "Back to index" link.

Fixes gh-16295
 2019-04-29 09:04:36 +02:00
Stephane Nicoll
9cde736b59 Merge branch '2.1.x' 2019-04-26 12:01:11 +03:00
Stephane Nicoll
3c5ec8a04c Merge branch '2.0.x' into 2.1.x 2019-04-26 11:53:02 +03:00
Stephane Nicoll
ac9ee952c7 Properly merge fix 
See gh-16666
 2019-04-26 11:52:25 +03:00
dreis2211
cf05959375 Optimize ConfigurationPropertyName.buildToString() 
See gh-16658
 2019-04-25 17:18:55 +01:00
Phillip Webb
32040e355b Merge branch '2.1.x' 
Closes gh-16649
 2019-04-24 19:50:41 -07:00
Phillip Webb
d4151e0b51 Polish "Use Jackson configuration with JsonPath" 
Polish contribution to use a factory method in `AbstractJsonMarshalTester`
rather than additional constructor arguments.

Also change the `JsonContent` tests so that the `Configuration` constructor
is package private. This keeps JsonPath classes out of our public API, at
the expense of limiting custom JsonPath configurations to just our code.

See gh-16629
 2019-04-24 19:45:43 -07:00
Phillip Webb
17aaf26590 Use consistent javadoc style for annotation links 
Closes gh-13920
 2019-04-24 19:37:59 -07:00
Phillip Webb
1e44aba772 Fix compiler warnings and polish 
Fix various compiler warnings and apply a little polish.
 2019-04-24 19:37:42 -07:00
Diego Berrueta
756a7f12a3 Use Jackson configuration with JsonPath 
Update `JacksonTester` so that the JsonPath instance is explicitly configured
with both a `JacksonJsonProvider` and a `JacksonMappingProvider`.

Prior to this commit, the handling of special characters was not symmetrical
between the serialization (handled via the JacksonTester) and the parsing (handled
via JsonPath) due to the fact that JsonPath used `SimpleJson` as its parser.

See gh-16629
 2019-04-24 18:15:46 -07:00
Andy Wilkinson
4754386361 Merge branch '2.1.x' 
Closes gh-16644
 2019-04-24 15:09:41 +01:00
Andy Wilkinson
6b20d13b3d Polish "Prevent double update of metrics when CompositeMeterRegistry exists" 
See gh-16221
 2019-04-24 15:02:58 +01:00
Johnny Lim
cc285d92dd Prevent double update of metrics when CompositeMeterRegistry exists 
See gh-16221
 2019-04-24 14:54:30 +01:00
Andy Wilkinson
b39fdea508 Merge pull request #16474 from Christoph Dreis 
* gh-16474:
  Speed up element equality checks in ConfigurationPropertyName

Closes gh-16474
 2019-04-24 14:00:46 +01:00
dreis2211
3786dbc869 Speed up element equality checks in ConfigurationPropertyName 
See gh-16474
 2019-04-24 13:59:53 +01:00
Andy Wilkinson
a0999dadb7 Merge branch '2.1.x' 
Closes gh-16642
 2019-04-24 13:57:52 +01:00
Andy Wilkinson
ba0279be14 Remove race condition in TaskSchedulingAutoConfigurationTests 
Closes gh-16640
 2019-04-24 11:55:41 +01:00
Andy Wilkinson
eb0b852e99 Merge branch '2.1.x' 
Closes gh-16639
 2019-04-24 10:47:08 +01:00
Andy Wilkinson
5d77b48aed Polish "Polish Maven Plugin's tests" 
See gh-16618
 2019-04-24 10:40:13 +01:00
daonan.zhan
52c2c534db Polish Maven Plugin's tests 
See gh-16618
 2019-04-24 10:40:05 +01:00
Andy Wilkinson
d0b4dab1c8 Merge pull request #16620 from Christoph Dreis 
* gh-16620:
  Optimize JarEntry construction

Closes gh-16620
 2019-04-23 15:28:26 +01:00
dreis2211
f40b086ef5 Optimize JarEntry construction 
This commit avoids calling the underlying ZipEntry.setExtra() method
that is not very inline friendly in cases where there is no extra
information to be set.

See gh-16620
 2019-04-23 15:25:56 +01:00
Andy Wilkinson
915bde0e62 Use MIME decoder to read OAuth2 resource server public key 
Fixes gh-16624
 2019-04-23 12:30:39 +01:00
Andy Wilkinson
dc39540def Merge branch '2.1.x' 
Closes gh-16623
 2019-04-23 09:52:40 +01:00
Andy Wilkinson
e8955852a3 Add missing GlassFish JAXB dependency management 
Closes gh-16619
 2019-04-23 09:50:46 +01:00
Madhura Bhave
5c2a7e61d0 Fix tests 2019-04-22 22:40:11 -07:00
Madhura Bhave
9fb65e57c0 ConfigurationPropertiesScan should account for conditions 
Fixes gh-16612
 2019-04-22 18:37:29 -07:00
Madhura Bhave
23cf8565b1 Polish "Apply server customizer beans automatically" 
Closes gh-16584
 2019-04-22 15:19:42 -07:00
Sergey Serdyuk
8ff78ed4c3 Apply server customizer beans automatically 
See gh-16584
 2019-04-22 15:19:34 -07:00
Stephane Nicoll
fd14cd0bd0 Merge branch '2.1.x' 2019-04-22 10:00:28 +02:00
Stephane Nicoll
1f656e75fc Polish "Fix UndertowWebServer's logger name" 
Closes gh-16613
 2019-04-22 09:59:24 +02:00
liaozan
360da66333 Fix UndertowWebServer's logger name 
See gh-16613
 2019-04-22 09:58:59 +02:00
ForeverHex
124d969b2d Fix checkstyle violation 
Closes gh-16616
 2019-04-21 20:28:16 +02:00
Phillip Webb
1f893d9376 Log warning on slow host resolution 
Update `StartupInfoLogger` so that if the `InetAddress` call takes
more than 200ms a warning is logged.

Closes gh-7087
 2019-04-19 15:11:22 -07:00
Phillip Webb
405135d5a8 Polish StartupInfoLogger message creation 
Rework some of the internals of `StartupInfoLogger` so that fewer
strings are created.
 2019-04-19 15:11:22 -07:00