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
14,669 Commits 24 Branches 353 Tags 292 MiB
Commit Graph

14669 Commits

Author SHA1 Message Date
Andy Wilkinson bac21e2ee6 Merge branch '1.5.x' 2018-01-03 09:57:13 +00:00
Andy Wilkinson 77edcaab86 Merge branch '1.5.x' 2018-01-03 09:54:18 +00:00
Andy Wilkinson 451a4dfc7f Make management web security back off without spring-security-web 
Closes gh-11474
 2018-01-03 09:51:33 +00:00
Andy Wilkinson 70e14edaf7 Work around incorrect layout of generated epub archive 
Previously, the Docbook Maven plugin would generate an epub archive
with the majority of contents in OEBPS/, including content.opf, while
the META-INF/container.xml file reference to content.opf in the root
of the archive.

This commit overrides the epub.oebps.dir variable to move the content
into the root of the archive where it's expected to be. Implementing
this override highlighted that our customization stylesheet was not
being applied as the configuration property was incorrect (it was
epubCustomnization rather than the required epub3Customization). This
has been corrected along with a problem with missing images that
fixing it revealed.

Closes gh-11470
 2018-01-02 17:50:15 +00:00
Brian Clozel 366d1122f0 Upgrade to Animal Sniffer 1.16 
This version is compatible with JDK9 libraries; this is now required
since Jetty introduced a dependency on ASM 6.0 in gh-11469.
 2018-01-02 17:40:34 +01:00
Brian Clozel 8286cbc9f3 Merge branch '1.5.x' 2018-01-02 16:13:11 +01:00
Brian Clozel 88b15baf20 Upgrade to Jetty 9.4.8.v20171121 
Closes gh-11469
 2018-01-02 16:06:45 +01:00
Stephane Nicoll f0b210c751 Merge branch '1.5.x' 2018-01-02 15:58:49 +01:00
Stephane Nicoll e187aac93d Mention that a custom starter must bring the core starter 
Closes gh-11455
 2018-01-02 15:56:46 +01:00
Stephane Nicoll 397d3e85e8 Fix Windows build 
Closes gh-11459
 2018-01-02 15:45:43 +01:00
Stephane Nicoll 6277d0ceb7 Update copyright header 2018-01-02 15:02:29 +01:00
Stephane Nicoll 87dfa07070 Merge pull request #11460 from dreis2211:fix-more-typos 
* pr/11460:
  Fix typos
 2018-01-02 15:01:36 +01:00
dreis2211 eb1ae2dd79 Fix typos 
Closes gh-11460
 2018-01-02 15:01:16 +01:00
Andy Wilkinson b545330d8e Fix reusable archive creation with Gradle 4.1 and later 
Closes gh-11468
 2018-01-02 12:56:55 +00:00
Stephane Nicoll a6c301edb4 Merge pull request #11451 from izeye:logging-pattern-dateformat 
* pr/11451:
  Polish
 2018-01-01 08:41:25 +01:00
Johnny Lim a462255383 Polish 
Closes gh-11451
 2018-01-01 08:41:09 +01:00
Stephane Nicoll 0b02415943 Merge pull request #11450 from dreis2211:fix-typos 
* pr/11450:
  Fix typos
 2018-01-01 08:38:08 +01:00
dreis2211 67a84cd4f9 Fix typos 
Closes gh-11450
 2018-01-01 08:37:42 +01:00
Stephane Nicoll edc43f75cb Merge branch '1.5.x' 2018-01-01 08:30:03 +01:00
Stephane Nicoll abfee97843 Merge pull request #11456 from rajadilipkolli:patch-1 
* pr/11456:
  Update copyright header
 2018-01-01 08:29:50 +01:00
Raja Kolli e6eca2b2c9 Update copyright header 
Closes gh-11456
 2018-01-01 08:29:14 +01:00
Stephane Nicoll 7d34a58d10 Merge pull request #11448 from izeye:polish-20171230 
* pr/11448:
  Polish
 2017-12-30 17:21:31 +01:00
Johnny Lim 24b5a78e39 Polish 
Closes gh-11448
 2017-12-30 17:21:13 +01:00
Madhura Bhave a46d1416ee Reinstate required parameter 2017-12-29 13:16:26 -08:00
Madhura Bhave 8102dc78cb Remove redundant throws declarations 2017-12-29 12:10:13 -08:00
Stephane Nicoll 1ab5b833af Add reference to liquigraph 2017-12-29 16:57:18 +01:00
Stephane Nicoll 106642a8d4 Polish 2017-12-29 14:48:24 +01:00
Stephane Nicoll f036a89c77 Merge pull request #11443 from izeye:fix-property-names 
* pr/11443:
  Fix property names in MeterBindersConfiguration
 2017-12-29 14:43:39 +01:00
Johnny Lim 8ae2be6043 Fix property names in MeterBindersConfiguration 
Closes gh-11443
 2017-12-29 14:36:56 +01:00
Madhura Bhave be9291a365 Match trailing slash in actuator endpoints 
Fixes gh-11024
 2017-12-28 13:13:23 -08:00
Madhura Bhave c29fe05708 Remove redundant property from tests 2017-12-28 12:45:51 -08:00
Stephane Nicoll 38d44409c8 Merge pull request #11403 from marceloverdijk:set_one_indexed_parameters 
* pr/11403:
  Polish "Improve Spring Data Web configuration properties"
  Improve Spring Data Web configuration properties
 2017-12-28 15:25:41 +01:00
Stephane Nicoll cfa3cab988 Polish "Improve Spring Data Web configuration properties" 
Closes gh-11403
 2017-12-28 15:22:47 +01:00
Marcel Overdijk be93eabc6b Improve Spring Data Web configuration properties 
See gh-11403
 2017-12-28 15:04:23 +01:00
Stephane Nicoll 8d1bd7eb3c Polish 2017-12-28 14:57:49 +01:00
Stephane Nicoll 81af02fde7 Improve JVM metrics 
This commit adds GC and thread jvm metrics to the existing memory
metrics. All three are now managed by a unique
management.metrics.binders.jvm.enabled property.

Closes gh-11425
 2017-12-28 14:57:13 +01:00
Stephane Nicoll c5802c2950 Merge pull request #11235 from sdeleuze:kotlin-1.2 
* pr/11235:
  Upgrade to Kotlin 1.2
 2017-12-28 13:46:57 +01:00
sdeleuze 945ca00b5b Upgrade to Kotlin 1.2 
apiVersion and languageVersion options are set to 1.1
in order to avoid incompatibilities with Kotlin 1.1
based projects.

Closes gh-11235
 2017-12-28 13:44:22 +01:00
Stephane Nicoll 2bd8c2bfca Polish 
See gh-11181
 2017-12-28 12:52:40 +01:00
Stephane Nicoll bae6b3115e Merge pull request #11376 from izeye:customize 
* pr/11376:
  Polish "Apply customize() to createCredentialNetworkMongoClient()"
  Apply customize() to createCredentialNetworkMongoClient()
 2017-12-28 12:40:19 +01:00
Stephane Nicoll c709ff8e3b Polish "Apply customize() to createCredentialNetworkMongoClient()" 
Closes gh-11376
 2017-12-28 12:39:54 +01:00
Johnny Lim 90369996a9 Apply customize() to createCredentialNetworkMongoClient() 
See gh-11376
 2017-12-28 12:39:06 +01:00
Stephane Nicoll 601b5e4d9a Replace SystemProperties by TestPropertyValues 
Closes gh-9852
 2017-12-28 12:32:03 +01:00
Stephane Nicoll f0d94a46fd Polish 2017-12-28 12:09:27 +01:00
Stephane Nicoll afba8fed79 Harmonize management.server.context-path property 
This commit moves management.server.context-path to
management.server.servlet.context-path to align with the configuration
key for the application's main context path.

Closes gh-11359
 2017-12-28 12:08:51 +01:00
Stephane Nicoll 5328508421 Merge branch '1.5.x' 2017-12-28 11:27:25 +01:00
Stephane Nicoll 053982ae62 Merge pull request #11401 from douglascardoso:master 
* pr/11401:
  Log inaccessible file in RandomAccessDataFile
 2017-12-28 11:27:08 +01:00
Douglas Cardoso feecc27677 Log inaccessible file in RandomAccessDataFile 
Closes gh-11401
 2017-12-28 11:25:51 +01:00
Stephane Nicoll 3cbbef866f Merge pull request #11439 from izeye:cors-endpoint-properties 
* pr/11439:
  Polish "Move CorsEndpointProperties to the parent package"
  Move CorsEndpointProperties to the parent package
 2017-12-28 11:02:04 +01:00
Stephane Nicoll 2738147947 Polish "Move CorsEndpointProperties to the parent package" 
Closes gh-11439
 2017-12-28 11:01:14 +01:00