Commit Graph

298 Commits

Author SHA1 Message Date
Andy Wilkinson
4b6bddd476 Merge branch '1.4.x' into 1.5.x 2019-03-20 16:30:04 +00:00
Andy Wilkinson
6920c39349 Merge branch '1.3.x' into 1.4.x 2019-03-20 15:06:50 +00:00
Andy Wilkinson
0e009ef047 Use HTTPS to link to the Apache license 2019-03-20 15:00:10 +00:00
Spring Operator
991ba550d3 Update build and setup configuration to use HTTPS
See gh-16245
2019-03-19 16:48:30 +00:00
Spring Operator
e2837843e1 Update build and setup configuration to use HTTPS
See gh-16244
2019-03-19 16:44:10 +00:00
Spring Operator
7c314122f7 Update build and setup configuration to use HTTPS
See gh-16243
2019-03-19 16:01:05 +00:00
Spring Buildmaster
b04710d744 Next development version 2019-01-11 15:59:00 +00:00
Spring Buildmaster
9bb64a3493 Next Development Version 2018-11-29 09:52:39 +00:00
Spring Buildmaster
4d24feb443 Next development version 2018-10-16 08:44:44 +00:00
Spring Buildmaster
46df506b0a Next development version 2018-09-11 14:24:40 +00:00
Phillip Webb
9543fcf44d Upgrade to spring-javaformat 0.0.6 2018-08-30 15:59:27 -07:00
Spring Buildmaster
73bf744cb0 Next Development Version 2018-07-30 13:37:38 +00:00
Spring Buildmaster
36b8639853 Next Development Version 2018-06-14 10:05:31 +00:00
Phillip Webb
37646517cf Polish 2018-05-21 15:17:42 -07:00
Spring Buildmaster
010b4fccbd Next development version 2018-05-09 09:31:46 +00:00
Andy Wilkinson
2195ed1e8e Update Jetty war package test to expect new ASM transitive dependency
Closes gh-13097
2018-05-08 12:37:19 +01:00
Phillip Webb
99dad81e9a Update copyright header year for changed files 2018-05-04 12:15:13 -07:00
Phillip Webb
3ee777e142 Polish ternary expressions
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 09:46:15 -07:00
Andy Wilkinson
a29a70d2f4 Fix handling of static resource jar paths containing a +
Closes gh-12942
2018-05-02 10:23:42 +01:00
Spring Buildmaster
c10aad165f Next Development Version 2018-04-09 23:14:33 +00:00
Spring Buildmaster
ade4760842 Next Development Version 2018-04-05 09:01:52 +00:00
Phillip Webb
a8f366a554 Fix copyright header for edited files 2018-03-16 15:07:23 -07:00
Andy Wilkinson
88423c504b Polish "Fix handling of static resource jars with spaces in their paths"
Closes gh-11991
2018-02-28 10:40:43 +00:00
Stephane Nicoll
b4a7e1d64b Use toLowerCase() and toUpperCase() with Locale.ENGLISH
This commit updates all `toLowerCase()` and `toUpperCase` invocations to
use the variant that takes a `Locale` to avoid locale-specific side
effect.

Closes gh-12213
2018-02-26 17:49:03 +01:00
Madhura Bhave
75e82e1b2c Fix tests to use GET to bypass CsrfFilter 2018-02-16 16:49:38 -08:00
Andy Wilkinson
d59000ceb1 Change ownership when log file is created by launch script
Closes gh-11951
2018-02-13 14:54:35 +00:00
Spring Buildmaster
6414b42335 Next Development Version 2018-01-30 23:29:33 +00:00
Phillip Webb
9b8cb9a463 Protect against symlink attacks
Update embedded launch script to no longer change ownership of files
or folders that already exist.

Fixes gh-11397
2018-01-30 12:42:31 -08:00
Phillip Webb
61f7bd8576 Polish 2018-01-30 12:37:40 -08:00
Phillip Webb
8e783cdae9 Polish 2018-01-18 21:42:11 -08:00
Stephane Nicoll
7ea4501fd5 Polish 2018-01-17 15:47:53 +01:00
Stephane Nicoll
d8b1f1692a Fix type detection with annotated getter
This commit makes sure that the `type` of a property is generated
property if the getter of the property is annotated. Previously, a type
implementation may expose the annotation information.

Closes gh-11512
2018-01-17 13:30:57 +01:00
Phillip Webb
84fa67d33e Backport use docker-java 3.0.x for launch tests
Backport commit d439b73758 to upgrade launch integration tests to
use docker-java 3.0.x.
2018-01-10 11:56:09 -08:00
Sylwester Lachiewicz
7224d35322 Fix typo in StringUtils import
Closes gh-11189
2017-11-29 11:16:45 +01:00
Spring Buildmaster
df2ae7aa19 Next Development Version 2017-11-28 09:55:46 +00:00
Andy Wilkinson
89d27e58d3 Close input stream after adding entry to jar in DevTools tests
Closes gh-11089
2017-11-20 14:14:48 +00:00
Spring Buildmaster
c0f9f64776 Next Development Version 2017-10-16 12:36:43 +00:00
Andy Wilkinson
cc16402ee4 Update war packaging tests to reflect change in Tomcat's dependencies
See gh-10395
2017-09-24 16:27:42 +01:00
Spring Buildmaster
30eb937a83 Next Development Version 2017-09-12 10:54:22 +00:00
Spring Buildmaster
17a5bb0be4 Next development version 2017-07-27 08:00:21 +00:00
Spring Buildmaster
41c5c0e7c9 Next development version 2017-07-26 08:30:55 +00:00
Phillip Webb
aa57ca7e18 Polish 2017-07-06 16:53:04 -07:00
Spring Buildmaster
05d4d0281c Next Development Version 2017-06-08 12:47:16 +00:00
Spring Buildmaster
88e43c8421 Next Development Version 2017-06-08 09:52:43 +00:00
Andy Wilkinson
d5184724b0 Downgrade Jersey to version that plays nicely with Docker's Java client 2017-06-03 19:40:21 +01:00
Andy Wilkinson
ec8ae2f91e Merge branch '1.4.x' into 1.5.x 2017-06-03 16:53:48 +01:00
Andy Wilkinson
e60a261952 Do not allow failure to remove container to mask earlier failure 2017-06-03 16:53:28 +01:00
Andy Wilkinson
a215103bb5 Merge branch '1.4.x' into 1.5.x 2017-06-03 13:11:39 +01:00
Andy Wilkinson
31ff7f1846 Tolerate Successfully built being found in response other than last
Different versions of Docker produce different responses when building
and tagging an image. On CI, a response with a stream like
"Successfully built 185991ffe24a" followed by a response with a
stream like "Successfully tagged spring-boot-it/centos:6.9-a23bced6"
is received. By default, for the building of an image to be considered
successful, the Docker Java client requires the stream for the last
response item to contain "Successfully built". This means that, on the
CI server, it incorrectly believes that the building of the tagged
image has failed.

This commit uses a custom BuildImageResultCallback that doesn't
require the last response to be the one that has a stream containing
"Successfully built". Instead, it looks back through the error-free
responses (newest to oldest) looking for one with a stream containing
"Successfully built".
2017-06-03 13:00:15 +01:00
Andy Wilkinson
5722c149d0 Merge branch '1.4.x' into 1.5.x 2017-06-03 09:55:29 +01:00