Commit Graph

27913 Commits

Author SHA1 Message Date
Andy Wilkinson
a9a32f39b5 Merge branch '2.2.x' into 2.3.x
Closes gh-23671
2020-10-13 11:20:18 +01:00
Andy Wilkinson
667ccdae84 Simplify temp directory creation and improve diagnostics
Closes gh-23622
2020-10-13 11:18:06 +01:00
Scott Frederick
de685bdca4 Document buildpack configuration of JVM options
Fixes gh-21582
2020-10-09 13:21:37 -05:00
Scott Frederick
49b0707f1a Clarify image builder configuration documentation
This commit qualifies examples of configuring the CNB builder to clarify
that the examples apply to use of the default Paketo builder, and adds links
to the official Paketo docs for more details.

Fixes gh-19967
2020-10-08 17:02:17 -05:00
Phillip Webb
0709c7671f Merge branch '2.2.x' into 2.3.x
Closes gh-23614
2020-10-07 11:41:11 -07:00
Phillip Webb
ce70e7d768 Merge branch '2.1.x' into 2.2.x
Closes gh-23613
2020-10-07 11:40:55 -07:00
Phillip Webb
1db2f5f960 Support Formatter conversion service beans
Update `ConversionServiceDeducer` to also include `Formatter` beans
when they are qualified with `@ConfigurationPropertiesBinding`.

Fixes gh-23576
2020-10-07 11:34:57 -07:00
Phillip Webb
61181b4554 Merge branch '2.2.x' into 2.3.x
Closes gh-23611
2020-10-07 11:05:22 -07:00
Phillip Webb
c523295694 Merge branch '2.1.x' into 2.2.x
Closes gh-23610
2020-10-07 11:04:39 -07:00
Phillip Webb
206356728c Add upgrading section to reference docs
Add a section to the reference documentation with links to the release
notes on the wiki.

Closes gh-23529
2020-10-07 11:04:20 -07:00
Andy Wilkinson
543763462c Update tests to look for snippets in correct location
See gh-23598
2020-10-06 15:57:25 +01:00
Andy Wilkinson
7eb92cc71a More Gradle snippets to correct location
See gh-23598
2020-10-06 14:44:26 +01:00
Andy Wilkinson
2d3291fb83 Merge branch '2.2.x' into 2.3.x
Closes gh-23598
2020-10-06 14:35:49 +01:00
Andy Wilkinson
7ac14203ab Expand Gradle plugin's docs on setting bootRun's system properties
Closes gh-23578
2020-10-06 14:35:30 +01:00
Stephane Nicoll
a74c538bec Merge pull request #23561 from thorasine
* pr/23561:
  Fix typos

Closes gh-23561
2020-10-02 09:34:29 +02:00
Thorasine
6c3dfac1d0 Fix typos
See gh-23561
2020-10-02 09:32:26 +02:00
Madhura Bhave
e2289e2f21 Merge branch '2.2.x' into 2.3.x
Closes gh-23569
2020-10-01 18:19:35 -07:00
Madhura Bhave
4dad8c221a Merge pull request #23566 from Shraddha-Yeole
* pr/23566:
  Polish "Do not fail if h2Console bean cannot connect to db"
  Do not fail if h2Console bean cannot connect to db

Closes gh-23566
2020-10-01 18:16:56 -07:00
Madhura Bhave
c0f158dffd Polish "Do not fail if h2Console bean cannot connect to db"
See gh-23566
2020-10-01 18:16:11 -07:00
Shraddha Yeole
2d76de29ff Do not fail if h2Console bean cannot connect to db
See gh-23566
2020-10-01 18:10:48 -07:00
Madhura Bhave
9a6d52e30d Merge branch '2.2.x' into 2.3.x 2020-10-01 18:01:53 -07:00
Madhura Bhave
3118ca9313 Polish 2020-10-01 18:01:11 -07:00
Madhura Bhave
121ba2b0ab Merge branch '2.2.x' into 2.3.x
Closes gh-23567
2020-10-01 17:16:37 -07:00
Madhura Bhave
0cdb1b3b26 Merge pull request #23562 from ketaki-t
* pr/23562:
  Remove documentation for unsupported gradle versions

Closes gh-23562
2020-10-01 17:14:07 -07:00
ketaki-t
66aa24b5f0 Remove documentation for unsupported gradle versions
See gh-23562
2020-10-01 17:13:26 -07:00
Andy Wilkinson
914dccade2 Merge branch '2.2.x' into 2.3.x
Closes gh-23555
2020-10-01 12:30:16 +01:00
Andy Wilkinson
323af718e2 Only change the method of requests that Jetty won't handle by default
Previously, JettyEmbeddedErrorHandler would change the method of every
request that is handles to GET. This was being done to work around
Jetty's error handling only dealing with GET, POST, and HEAD requests
by default. It had the unwanted side-effect of causing an error
response to a HEAD request having a body as, from the error handling's
perspective, it was a GET request.

This commit updates JettyEmbeddedErrorHandler to only set the method
on a request for which error handling is being performed if the method
isn't already one that will be handled, leaving the method of GET,
POST, and HEAD requests unchanged.

Unfortunately, short of implementing an HTTP client, this change cannot
be tested as the Apache HttpClient, OkHttp, and the JDK's
HttpURLConnection all silently drop the body of a response to a HEAD
request, preventing a test from asserting that a body hasn't been sent.

Closes gh-23551
2020-10-01 12:29:44 +01:00
Stephane Nicoll
74a164e822 Upgrade Ubuntu version in CI images
Closes gh-23548
2020-10-01 10:44:27 +02:00
Stephane Nicoll
23698de21c Merge branch '2.2.x' into 2.3.x 2020-10-01 10:43:39 +02:00
Stephane Nicoll
b3563deeb3 Upgrade Ubuntu version in CI images
Closes gh-23549
2020-10-01 10:43:11 +02:00
Stephane Nicoll
94da5155d6 Merge branch '2.1.x' into 2.2.x 2020-10-01 10:42:17 +02:00
Stephane Nicoll
abee05c67b Upgrade Ubuntu version in CI images
Closes gh-23546
2020-10-01 10:39:25 +02:00
Andy Wilkinson
bd4934b0fd Fix matching of SNAPSHOT artifacts when customizing layers
Previously the artifact's version was used. In an artifact's version,
SNAPSHOT is replaced with the timestamped version number of a specific
snapshot. As a result, it no longer matches the *:*:*SNAPSHOT pattern.

This commit replaces switches to using the artifact's base version.
This preserves the SNAPSHOT in the version number. For non-snapshot
artifacts, the version and base version are identical.

Fixes gh-23533
2020-09-30 14:48:04 +01:00
Stephane Nicoll
cd15cbdc79 Do not execute datasource initialization in a separate thread
This commit makes sure that `data.sql` is performed in the same thread
as the one initializing the JPA container.

Closes gh-22852
2020-09-30 10:10:16 +02:00
Stephane Nicoll
789fafadac Start building against Spring Framework 5.3.10 snapshots
See gh-23526
2020-09-30 10:00:21 +02:00
Stephane Nicoll
466c1012d6 Merge branch '2.2.x' into 2.3.x
Closes gh-23521
2020-09-29 10:44:30 +02:00
Stephane Nicoll
fd3683646a Migrate SessionAutoConfigurationMongoTests to Testcontainers
Closes gh-23512
2020-09-29 10:34:59 +02:00
Stephane Nicoll
209f92cfd4 Merge branch '2.2.x' into 2.3.x
See gh-23495
2020-09-28 14:40:10 +02:00
Stephane Nicoll
350ef9755d Merge branch '2.1.x' into 2.2.x
See gh-23494
2020-09-28 14:39:15 +02:00
Stephane Nicoll
756a86aa8f Rename changelog generator's task name
Closes gh-23493
2020-09-28 14:38:21 +02:00
Stephane Nicoll
2c1634e6ed Merge branch '2.2.x' into 2.3.x
Closes gh-23508
2020-09-28 09:21:51 +02:00
Stephane Nicoll
e25e67cbff Merge pull request #23502 from chenrujun
* pr/23502:
  Add mising entry for Netty tcnative dependency management

Closes gh-23502
2020-09-28 09:19:27 +02:00
Rujun Chen
8330752b11 Add mising entry for Netty tcnative dependency management
See gh-23502
2020-09-28 09:18:44 +02:00
Andy Wilkinson
9bd040cb0f Merge branch '2.2.x' into 2.3.x
Closes gh-23500
2020-09-26 09:16:46 +01:00
Andy Wilkinson
e74f777971 Remove use of spring-core's Assert from PropertiesLauncher
Fixes gh-23474
2020-09-26 09:11:05 +01:00
Phillip Webb
f53b031628 Merge branch '2.2.x' into 2.3.x 2020-09-25 12:42:38 -07:00
Phillip Webb
325194093c Merge branch '2.1.x' into 2.2.x 2020-09-25 12:42:29 -07:00
Phillip Webb
6d70c3867e Upgrade to latest concourse-java-scripts 2020-09-25 12:41:58 -07:00
Phillip Webb
ff4d3eb1be Merge branch '2.2.x' into 2.3.x
Closes gh-23498
2020-09-25 12:40:57 -07:00
Phillip Webb
f16eabad0a Merge branch '2.1.x' into 2.2.x
Closes gh-23497
2020-09-25 12:40:44 -07:00