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

21330 Commits

Author SHA1 Message Date
hengyunabc c1b34d0307 Prefer file: to jar:file: URLs in launcher 
See gh-16248
 2019-04-29 14:39:20 +01:00
Stephane Nicoll 84530ce3c4 Merge pull request #16632 from leszko 
* pr/16632:
  Polish "Add support for Hazelcast YAML configuration"
  Add support for Hazelcast YAML configuration
 2019-04-29 15:17:54 +02: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
Stephane Nicoll 85c1e104f0 Merge branch '2.0.x' into 2.1.x 2019-04-26 11:50:15 +03:00
Stephane Nicoll 5963542f18 Merge branch '1.5.x' into 2.0.x 2019-04-26 11:49:26 +03:00
Stephane Nicoll 0552113c98 Merge pull request #16666 from Tetsuya3850 
* pr/16666:
  Fix broken link
 2019-04-26 11:44:51 +03:00
Tetsuya Hasegawa 5b3e53835e Fix broken link 
Closes gh-16666
 2019-04-26 11:44:02 +03:00
Phillip Webb 837f323e29 Merge pull request #16662 from dreis2211 
* pr/16662:
  Fix typo in issue template
 2019-04-25 16:39:21 -07:00
dreis2211 309a63493d Fix typo in issue template 2019-04-25 23:38:28 +02:00
Phillip Webb f6b5a07561 Update the issue template with more help 2019-04-25 11:12:32 -07:00
Andy Wilkinson ed8a10b2fb Merge pull request #16658 from Christoph Dreis 
* gh-16658:
  Optimize ConfigurationPropertyName.buildToString()

Closes gh-16658
 2019-04-25 17:19:22 +01: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 7302974751 Merge pull request #16629 from dberrueta-atlassian 
Closes gh-16629:
 2019-04-24 19:46:12 -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 4fc813b246 Merge pull request #16221 from Johnny Lim 
* gh-16221:
  Polish "Prevent double update of metrics when CompositeMeterRegistry exists"
  Prevent double update of metrics when CompositeMeterRegistry exists

Closes gh-16221
 2019-04-24 15:08:09 +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 6ae7274289 Merge pull request #16618 from Joshua Jeme 
* gh-16618:
  Polish "Polish Maven Plugin's tests"
  Polish Maven Plugin's tests

Closes gh-16618
 2019-04-24 10:45:43 +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 d182ee2246 Merge branch '2.1.x' 
Closes gh-16637
 2019-04-24 10:19:31 +01:00
Andy Wilkinson ed85735822 Merge branch '2.0.x' into 2.1.x 
Closes gh-16636
 2019-04-24 10:10:01 +01:00
Andy Wilkinson 3e3d7545cc Merge branch '1.5.x' into 2.0.x 2019-04-24 10:01:50 +01:00
Andy Wilkinson de0e065da2 Use AdoptOpenJDK for Ubuntu launch script integration tests 
Closes gh-16633
 2019-04-24 09:59:43 +01:00
Phillip Webb 86b5b226ec Add resource icons to CI pipeline 2019-04-23 12:00:07 -07: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 27990180ab Merge branch '2.1.x' 
Closes gh-16626
 2019-04-23 14:30:21 +01:00
Andy Wilkinson 73704c84e1 Use latest Docker Java and a compatible version of Jersey 
Closes gh-16625
 2019-04-23 14:29:32 +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 f908e3ae52 Merge pull request #16584 from SergeyHydra 
* pr/16584:
  Polish "Apply server customizer beans automatically"
  Apply server customizer beans automatically
 2019-04-22 15:20:48 -07:00