Commit Graph

27490 Commits

Author SHA1 Message Date
Andy Wilkinson
8426d8854f Import Testcontainers' bom rather than managing modules individually
Closes gh-15900
2019-02-12 09:46:20 +00:00
Andy Wilkinson
2884d99a5d Complete move to Testcontainers' Neo4j container
Closes gh-15638
2019-02-12 09:46:11 +00:00
Stephane Nicoll
48fcaca155 Merge pull request #15841 from mrotteveel
* pr/15841:
  Polish "Add support for jdbc:firebird: url prefix"
  Add support for jdbc:firebird: url prefix
2019-02-12 10:36:47 +01:00
Stephane Nicoll
82f33adba5 Polish "Add support for jdbc:firebird: url prefix"
Closes gh-15841
2019-02-12 10:32:44 +01:00
Mark Rotteveel
2ab7ece36d Add support for jdbc:firebird: url prefix
See gh-15841
2019-02-12 10:32:44 +01:00
Andy Wilkinson
7e51e1a076 Merge branch '2.1.x' 2019-02-12 09:26:59 +00:00
Andy Wilkinson
365ea31a51 Merge pull request #15638 from Michael Simons
* gh-15638:
  Polish “Replace custom Neo4j container with Testcontainers version”
  Replace custom Neo4j container with Testcontainers version

Closes gh-15638
2019-02-12 09:25:40 +00:00
Andy Wilkinson
01b8e2c834 Polish “Replace custom Neo4j container with Testcontainers version”
See gh-15638
2019-02-12 09:25:07 +00:00
Michael Simons
316126e8f0 Replace custom Neo4j container with Testcontainers version
See gh-15638
2019-02-12 09:24:44 +00:00
Andy Wilkinson
8e0cc278b2 Merge branch '2.1.x' 2019-02-11 20:00:09 +00:00
Andy Wilkinson
a5aceb35d7 Upgrade to Testcontainers 1.10.6
Closes gh-15893
2019-02-11 19:59:32 +00:00
Andy Wilkinson
6fe226d781 Merge branch '2.1.x' 2019-02-11 17:38:24 +00:00
Andy Wilkinson
609a30464d Merge pull request #15692 from Eugene Tenkaev
* gh-15692:
  Polish "Fix stopping of Embedded Mongo before context is closed"
  Fix stopping of Embedded Mongo before context is closed

Closes gh-15692
2019-02-11 17:35:42 +00:00
Andy Wilkinson
20f26c4d30 Polish "Fix stopping of Embedded Mongo before context is closed"
See gh-15692
2019-02-11 17:34:40 +00:00
Eugene
750246f021 Fix stopping of Embedded Mongo before context is closed
See gh-15692
2019-02-11 17:33:59 +00:00
Andy Wilkinson
5c08e23e9b Merge pull request #15799 from Johnny Lim
* gh-15799:
  Polish

Closes gh-15799
2019-02-11 17:21:17 +00:00
Johnny Lim
9f6c5e4e39 Polish 2019-02-11 17:19:19 +00:00
Andy Wilkinson
b5c9afc055 Merge branch '2.1.x' 2019-02-11 17:12:51 +00:00
Andy Wilkinson
08ce814853 Merge pull request #15822 from Artsiom Yudovin
* gh-15822:
  Polish "Set NO_REQUEST_TIMEOUT as a server option not a socket option"
  Set NO_REQUEST_TIMEOUT as a server option not a socket option
2019-02-11 17:12:27 +00:00
Andy Wilkinson
295a660e35 Polish "Set NO_REQUEST_TIMEOUT as a server option not a socket option"
See gh-15822
2019-02-11 17:11:20 +00:00
ayudovin
dbce3731a4 Set NO_REQUEST_TIMEOUT as a server option not a socket option
See gh-15822
2019-02-11 17:08:16 +00:00
Andy Wilkinson
c12bb77cb5 Merge pull request #15885 from Christoph Dreis
* gh-15885:
  Clean up SpringPropertyAction.getValue()

Closes gh-15885
2019-02-11 16:59:11 +00:00
dreis2211
3fb87a4506 Clean up SpringPropertyAction.getValue()
See gh-15885
2019-02-11 16:58:40 +00:00
Andy Wilkinson
648cbaaceb Merge pull request #15854 from Camille Vienot
* gh-15854:
  Polish "Remove dependency management for xml-apis"
  Remove dependency management for xml-apis

Closes gh-15854
2019-02-11 16:54:13 +00:00
Andy Wilkinson
c2c971e755 Polish "Remove dependency management for xml-apis"
See gh-15854
2019-02-11 16:53:05 +00:00
Camille Vienot
c7dba26812 Remove dependency management for xml-apis
See gh-15854
2019-02-11 16:52:44 +00:00
Andy Wilkinson
c6a1df6cd4 Merge branch '2.1.x' 2019-02-11 16:42:29 +00:00
Andy Wilkinson
93a6dfd79b Merge pull request #15889 from Jeffrey van der Laan
* gh-15889:
  Do not auto-configure OEMIV filter when user defines registration bean

Closes gh-15889
2019-02-11 16:34:36 +00:00
Jeffrey van der Laan
4f86233ca7 Do not auto-configure OEMIV filter when user defines registration bean
See gh-15889
2019-02-11 16:33:06 +00:00
Andy Wilkinson
d9ec48ef12 Merge branch '2.1.x' 2019-02-11 16:13:52 +00:00
Andy Wilkinson
88fd84aa56 Merge pull request #15876 from wonwoo
* gh-15876:
  Polish "Remove unwanted @Nullable annotations"
  Remove unwanted @Nullable annotations

Closes gh-15876
2019-02-11 16:13:10 +00:00
Andy Wilkinson
3f32fbd0de Polish "Remove unwanted @Nullable annotations"
See gh-15876
2019-02-11 16:11:40 +00:00
wonwoo
2855321074 Remove unwanted @Nullable annotations
See gh-15876
2019-02-11 16:07:29 +00:00
Andy Wilkinson
2cda30988e Merge branch '2.1.x' 2019-02-11 16:00:55 +00:00
Andy Wilkinson
6fe9e3a0e1 Test the Gradle plugin against Gradle 5.2.1
Closes gh-15892
2019-02-11 15:51:14 +00:00
Andy Wilkinson
c00dc42ee8 Merge pull request #15791 from Christoph Dreis
* gh-15791:
  Polish "Test the Gradle plugin against Gradle 4.10.3 and 5.1.1"
  Test the Gradle plugin against Gradle 4.10.3 and 5.1.1
2019-02-11 15:50:12 +00:00
Andy Wilkinson
4faa0f51b7 Polish "Test the Gradle plugin against Gradle 4.10.3 and 5.1.1"
Closes gh-15791
2019-02-11 15:49:59 +00:00
dreis2211
1de372d896 Test the Gradle plugin against Gradle 4.10.3 and 5.1.1
See gh-15791
2019-02-11 15:35:06 +00:00
Stephane Nicoll
9244f82593 Merge pull request #15823 from dreis2211
* pr/15823:
  Polish
2019-02-10 10:36:58 +01:00
dreis2211
1c50e7cf87 Polish
Closes gh-15823
2019-02-10 10:36:37 +01:00
Stephane Nicoll
f6380ba66c Merge pull request #15837 from kedar-joshi
* pr/15837:
  Polish
2019-02-10 10:35:53 +01:00
Kedar Joshi
4a253ff87c Polish
1. Removed unnecessary null checks
2. Combined collection initialization and modification
3. Minor collections related optimizations

Closes gh-15837
2019-02-10 10:35:36 +01:00
Stephane Nicoll
6e5ffd8587 Merge pull request #15883 from tim-toady
* pr/15883:
  Fix broken link to Appendix
2019-02-09 09:35:19 +01:00
tim-toady
4acebf45be Fix broken link to Appendix
Closes gh-15883
2019-02-09 09:34:49 +01:00
Madhura Bhave
4d69e127c8 Merge branch '2.1.x' 2019-02-08 18:38:21 -08:00
Madhura Bhave
26da45aa9a Configure a JerseyApplicationPath bean for the actuators
This commit also ensures that Jersey-based actuator endpoints are
available before the user has configured a `ResourceConfig` bean

Fixes gh-15625
Fixes gh-15877
2019-02-08 18:38:01 -08:00
Brian Clozel
8bcbcf6c27 Merge branch '2.1.x' 2019-02-08 19:48:49 +01:00
Brian Clozel
c24f02696f Upgrade to Californium-BUILD-SNAPSHOT
See gh-15878
2019-02-08 19:45:24 +01:00
Madhura Bhave
8528f7c140 Make spring.profiles.include behave consistently
Previously, if profiles were included via a property source with higher
precedence than config files, profiles activated via config files would
not be taken into account. This commit makes spring.profiles.include
behave consistently where it adds to active profiles rather than replacing
them, regardless of property source.

Fixes gh-15344
2019-02-08 10:28:52 -08:00
Brian Clozel
99656b9dd8 Merge branch '2.1.x' 2019-02-08 18:35:12 +01:00