Commit Graph

20455 Commits

Author SHA1 Message Date
Stephane Nicoll
02ec1911fc Merge pull request #16628 from ielatif
* pr/16628:
  Exclude HikariCP specific dependency from Quartz
2019-04-30 14:32:01 +02:00
ielatif
3ffbe256f1 Exclude HikariCP specific dependency from Quartz
Closes gh-16628
2019-04-30 14:31:17 +02: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
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
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
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
ba0279be14 Remove race condition in TaskSchedulingAutoConfigurationTests
Closes gh-16640
2019-04-24 11:55:41 +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
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
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
e8955852a3 Add missing GlassFish JAXB dependency management
Closes gh-16619
2019-04-23 09:50:46 +01:00
Stephane Nicoll
09acbc1a4f Merge pull request #16613 from liaozan
* pr/16613:
  Polish "Fix UndertowWebServer's logger name"
  Fix UndertowWebServer's logger name
2019-04-22 10:00:02 +02:00
Stephane Nicoll
1f656e75fc Polish "Fix UndertowWebServer's logger name"
Closes gh-16613
2019-04-22 09:59:24 +02:00
liaozan
360da66333 Fix UndertowWebServer's logger name
See gh-16613
2019-04-22 09:58:59 +02:00
Stephane Nicoll
6774cc5119 Merge pull request #16507 from aftersss
* pr/16507:
  Polish "Cache MimeTypes to improve performance"
  Cache MimeTypes to improve performance
2019-04-19 16:31:20 +02:00
Stephane Nicoll
2448efc028 Polish "Cache MimeTypes to improve performance"
Closes gh-16507
2019-04-19 16:30:54 +02:00
wenqi.huang
b3f94c47d9 Cache MimeTypes to improve performance
See gh-16507
2019-04-19 16:29:32 +02:00
Stephane Nicoll
0875a07fe5 Merge pull request #16513 from vpavic
* pr/16513:
  Polish "Improve DefaultCookieSerializer auto-configuration"
  Improve DefaultCookieSerializer auto-configuration
2019-04-19 15:55:45 +02:00
Stephane Nicoll
7b9471836b Polish "Improve DefaultCookieSerializer auto-configuration"
Closes gh-16513
2019-04-19 15:55:13 +02:00
Vedran Pavic
5e02541195 Improve DefaultCookieSerializer auto-configuration
Spring Session's own configuration support (i.e.
SpringHttpSessionConfiguration) will configure the default
DefaultCookieSerializer with rememberMeRequestAttribute if
SpringSessionRememberMeServices bean has been detected in the
application context.

In contrast, Spring Boot's auto-configured DefaultCookieSerializer does
not do this which results in a different out-of-the-box experience for
users that rely on Spring Session's remember-me integration.

This commit improves Spring Session DefaultCookieSerializer
auto-configuration to match Spring Session's behavior and make the
auto-configured DefaultCookieSerializer aware of
SpringSessionRememberMeServices bean.

See gh-16513
2019-04-19 15:54:26 +02:00
Andy Wilkinson
50bcfd25fd Make EL available to reactive web apps as it already is to servlet web apps
Closes gh-16596
2019-04-18 10:10:49 +01:00
Andy Wilkinson
853b4952a0 Upgrade to Tomcat 9.0.19
Closes gh-16591
2019-04-17 11:36:04 +01:00
Stephane Nicoll
caed8e86cc Merge pull request #16575 from izeye
* pr/16575:
  Polish
2019-04-17 11:57:16 +02:00
Johnny Lim
363994515b Polish
See gh-16575
2019-04-17 11:56:31 +02:00
Andy Wilkinson
dfbc787737 Test the Gradle plugin against Gradle 5.4
Closes gh-16576
2019-04-17 09:25:28 +01:00
Andy Wilkinson
dacbb65fd7 Merge branch '2.0.x' into 2.1.x
Closes gh-16579
2019-04-16 15:47:17 +01:00
Andy Wilkinson
7260c0f2c4 Merge branch '1.5.x' into 2.0.x 2019-04-16 15:46:49 +01:00
Andy Wilkinson
c11e847d6c Fix syntax highlighting in the reference documentation
Closes gh-16548
2019-04-16 15:46:16 +01:00
Andy Wilkinson
043f0ffbeb Restore indentation in published spring-boot-starter-parent pom
Closes gh-16466
2019-04-16 09:46:16 +01:00
Andy Wilkinson
4ad636ee8e Tolerate competing gRPC version requirements in Micrometer's registries
See gh-16178
2019-04-16 09:17:35 +01:00
Andy Wilkinson
4e4d5f0539 Remove dependency management for solr-uima following upgrade to 7.7.1
Closes gh-16490
2019-04-16 09:10:16 +01:00
Madhura Bhave
f0544fb86f Polish 2019-04-15 17:09:47 -07:00
Madhura Bhave
38cbc0f096 Merge pull request #16515 from Rudy Adams
* pr/16515:
  Add tests for CompressionConnectorCustomizer
2019-04-15 16:21:30 -07:00
Rudy Adams
0aa25fb742 Add tests for CompressionConnectorCustomizer
Closes gh-16515
2019-04-15 16:17:29 -07:00
Andy Wilkinson
95149cd7cb Make it easier to identify issues created for forward ports
Closes gh-16566
2019-04-15 16:59:27 +01:00
Stephane Nicoll
e99deb95f7 Fix source detection in case of multiple candidates
This commit improves the detection of a property source when more than
one group with the same type exist.

Closes gh-16549
2019-04-15 16:17:11 +02:00
Andy Wilkinson
bb0037f041 Restore indentation in published spring-boot-dependencies pom
The move to an HTTPS URL for the xmlns:xslt identifier has the unwanted
side-effect of disabling indentation.

This commit moves back to an HTTPS URL. It also changes the indent size
to 2, aligning with the size used by all the other poms that are written
by the flatten plugin.

Closes gh-16466
2019-04-15 14:26:52 +01:00
Madhura Bhave
b4d6ac1f41 Fix javadoc 2019-04-12 12:32:23 -07:00