spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-23 09:49:01 +00:00
Code Issues Projects Releases Wiki Activity
20,969 Commits 28 Branches 394 Tags
ab6c6972b7e28d2ef2bca9908fefa84154a41bc7
Commit Graph
20969 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson ab6c6972b7 Merge branch '2.1.x' 2019-04-02 09:27:04 +01:00
Andy Wilkinson ada72ba3da Merge branch '2.0.x' into 2.1.x 2019-04-02 09:26:49 +01:00
Andy Wilkinson eca9af6d86 Merge branch '1.5.x' into 2.0.x 2019-04-02 09:26:38 +01:00
Andy Wilkinson 045b364906 Upgrade to Spring Data Ingalls-SR20 
Closes gh-16358
 2019-04-02 09:25:35 +01:00
Madhura Bhave 8daa8c48fb Merge branch '2.1.x' 2019-04-01 15:51:25 -07:00
Madhura Bhave 768aa5dfcc Ignore exception if ValidationAdapter can't get a MessageInterpolator 
Fixes gh-16177
 2019-04-01 15:48:32 -07:00
Madhura Bhave c592e71449 Override missing methods in FilteredClassLoader 
Closes gh-16404
 2019-04-01 15:42:02 -07:00
Andy Wilkinson e74582d263 Merge branch '2.1.x' 2019-04-01 14:08:18 +01:00
Andy Wilkinson 23d237928b Merge branch '2.0.x' into 2.1.x 2019-04-01 14:08:07 +01:00
Andy Wilkinson 922ab115ab Switch custom repository to one with JDK 9-friendly SSL certification chain 2019-04-01 14:07:01 +01:00
Andy Wilkinson 7b0183d60e Merge branch '2.1.x' 2019-04-01 11:54:31 +01:00
Andy Wilkinson d154ec8d64 Merge branch '2.0.x' into 2.1.x 2019-04-01 11:54:22 +01:00
Andy Wilkinson 2adb6b1fa4 Override version of Maven Site Plugin for JDK 9+181 compatibility 
See gh-16400
 2019-04-01 11:53:31 +01:00
Andy Wilkinson 84b557246e Merge branch '2.1.x' 2019-04-01 10:49:26 +01:00
Andy Wilkinson 8f1f258b25 Merge branch '2.0.x' into 2.1.x 2019-04-01 10:48:56 +01:00
Andy Wilkinson ef09c81ea7 Upgrade JDK 9 CI image to JDK 9+181 
Closes gh-16400
 2019-04-01 10:47:30 +01:00
Stephane Nicoll dcf849d4e0 Merge branch '2.1.x' 2019-03-31 19:41:19 +02:00
Stephane Nicoll bd72ff5d83 Switch to snapshots 2019-03-31 19:41:05 +02:00
Stephane Nicoll 8bbca7fd65 Merge branch '2.0.x' into 2.1.x 2019-03-31 19:38:06 +02:00
Stephane Nicoll 695dc8e992 Switch to snapshots 2019-03-31 19:37:43 +02:00
Stephane Nicoll e129f2ae20 Merge branch '1.5.x' into 2.0.x 2019-03-31 19:32:09 +02:00
Stephane Nicoll 2874d77021 Switch to snapshots 2019-03-31 19:31:44 +02:00
Stephane Nicoll ceb6ebcb85 Merge branch '2.1.x' 2019-03-31 15:29:30 +02:00
Stephane Nicoll 085ca0f915 Upgrade to Spring Framework 5.1.6.RELEASE 
Closes gh-16340
 2019-03-31 15:28:04 +02:00
Stephane Nicoll bf173e78b6 Merge branch '2.0.x' into 2.1.x 2019-03-31 15:27:46 +02:00
Stephane Nicoll 165b9d950a Upgrade to Spring Framework 5.0.13.RELEASE 
Closes gh-16339
 2019-03-31 15:26:57 +02:00
Stephane Nicoll 65296f0b77 Merge branch '1.5.x' into 2.0.x 2019-03-31 15:26:30 +02:00
Stephane Nicoll a0002c6ebe Upgrade to Spring Framework 4.3.23.RELEASE 
Closes gh-16338
 2019-03-31 15:25:31 +02:00
Stephane Nicoll 28bd5f5e50 Merge pull request #16039 from amcghie 
* pr/16039:
  Polish "Complete support for customizing Tomcat's access log"
  Complete support for customizing Tomcat's access log
 2019-03-29 17:48:22 +01:00
Stephane Nicoll 076e327481 Polish "Complete support for customizing Tomcat's access log" 
Closes gh-16039
 2019-03-29 17:47:53 +01:00
Andrew McGhie f823ae488d Complete support for customizing Tomcat's access log 
See gh-16039
 2019-03-29 17:47:53 +01:00
Andy Wilkinson 6615e11e65 Merge branch '2.1.x' 2019-03-29 16:12:40 +00:00
Andy Wilkinson 4e734669fe Merge branch '2.0.x' into 2.1.x 2019-03-29 16:12:27 +00:00
Stephane Nicoll c2b35e1cd5 Merge pull request #16084 from nosan 
* pr/16084:
  Polish "Permit use of https for configuring Prometheus push gateway"
  Permit use of https for configuring Prometheus push gateway
 2019-03-29 17:07:16 +01:00
Andy Wilkinson 7990c8ba68 Merge branch '1.5.x' into 2.0.x 2019-03-29 16:06:47 +00:00
Stephane Nicoll f4c4b1d3f0 Polish "Permit use of https for configuring Prometheus push gateway" 
Closes gh-16084
 2019-03-29 17:03:28 +01:00
Dmytro Nosan eed4e9ea56 Permit use of https for configuring Prometheus push gateway 
See gh-16084
 2019-03-29 16:48:27 +01:00
Andy Wilkinson 946e8267a8 Upgrade to Jetty 9.4.15.v20190215 
In addition to upgrading to Jetty 9.4.15, this commit updates the
KeyStores used in embedded container testing to add to their entries
subject alternative name extensions for localhost and 127.0.0.1. As
of 9.4.16, Jetty requires the SAN extensions.

Closes gh-16188
 2019-03-29 15:42:06 +00:00
Stephane Nicoll d7d2c345c1 Merge branch '2.1.x' 2019-03-29 15:58:00 +01:00
Stephane Nicoll f1df366ac0 Merge pull request #16262 from mrifni 
* pr/16262:
  Polish "Automatically detect log4j2.properties"
  Automatically detect log4j2.properties
 2019-03-29 15:57:33 +01:00
Stephane Nicoll b894696efb Polish "Automatically detect log4j2.properties" 
Closes gh-16262
 2019-03-29 15:57:06 +01:00
Mohamed Rifni 2cb4403cd0 Automatically detect log4j2.properties 
See gh-16262
 2019-03-29 15:55:49 +01:00
Stephane Nicoll 0a20ce8333 Merge pull request #16326 from simionAndrei 
* pr/16326:
  Polish "Add Spring-specific styling to Actuator's API documentation"
  Use asciidoctor 1.5.8
  Add Spring-specific styling to Actuator's API documentation
 2019-03-29 15:37:08 +01:00
Stephane Nicoll 1bc47b7e74 Polish "Add Spring-specific styling to Actuator's API documentation" 
Closes gh-16326
 2019-03-29 15:36:35 +01:00
Stephane Nicoll 604b0891d0 Use asciidoctor 1.5.8 
This commit uses asciidoctor 1.5.8 for the time being. Once a new
version of the plugin is released, this override will be unnecessary.
 2019-03-29 15:35:45 +01:00
simionAndrei 26cfbe04b2 Add Spring-specific styling to Actuator's API documentation 
This commit replaces the default Asciidoctor styling with
Spring specific styling.

First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.

See gh-16326
 2019-03-29 15:35:45 +01:00
Stephane Nicoll d1507497d8 Merge branch '2.1.x' 2019-03-29 14:16:58 +01:00
Stephane Nicoll 1261c3960d Merge branch '2.0.x' into 2.1.x 2019-03-29 14:16:38 +01:00
Stephane Nicoll 28b38ddc9a Upgrade to Reactor Bom Bismuth-SR17 
Closes gh-16372
 2019-03-29 14:15:40 +01:00
Stephane Nicoll 4c1186cbd8 Merge branch '1.5.x' into 2.0.x 2019-03-29 14:12:52 +01:00