Commit Graph

20287 Commits

Author SHA1 Message Date
Eddú Meléndez b005008cac Add TestNG support in TestTypeExcludeFilter
See gh-7630
2019-02-12 15:27:51 +00:00
Andy Wilkinson 4d9513404a Merge branch '2.1.x' 2019-02-12 15:27:08 +00:00
Andy Wilkinson 5ae7aeff21 Revert "Upgrade to Saaj Impl 1.5.1"
This reverts commit 1f47bd9717.

See gh-15915
2019-02-12 15:26:45 +00:00
Andy Wilkinson fc67e4472c Merge pull request #15842 from Raheela Aslam
* gh-15842:
  Polish "Make auto-config of RestTemplate metrics back off with no builder bean"
  Make auto-config of RestTemplate metrics back off with no builder bean

Closes gh-15842
2019-02-12 14:36:32 +00:00
Andy Wilkinson 22192c2b5c Polish "Make auto-config of RestTemplate metrics back off with no builder bean"
Closes gh-15842
2019-02-12 14:35:38 +00:00
Raheela 8f3c4dbc64 Make auto-config of RestTemplate metrics back off with no builder bean
See gh-15842
2019-02-12 14:28:48 +00:00
Andy Wilkinson 48e781181e Merge branch '2.1.x' 2019-02-12 14:15:20 +00:00
Andy Wilkinson 799ac24da1 Reinstate auto-config of RequestContextFilter with Jersey
Previously, the auto-configuration for both Jersey and WebMvc would auto-configure
a RequestContextFilter bean. In 2.1.0, this led to a startup failure due to the latter
attempting to override the bean defined by the former. In addition to the override there
were also problems with the order of the filter as Jersey uses -1 and MVC uses -105.

To avoid the above-described problems, the auto-configuration of the RequestContextFilter
was removed from JerseyAutoConfiguration in 2.1.1. Unfortunately, the broke
request-scoped beans for those using only Jersey.

This commit attempts to strike a better balance by reintroducing the auto-configuration
of RequestContextFilter in JerseyAutoConfiguration. It will back off if the user defines
their own filter or filter registration. WebMvcAutoConfiguration has been updated to
back off in the same manner. This leaves the potential for ordering problems, but they
are no worse than they were before. Furthermore, the user has the means to correct any
problems by using the various filter ordering properties that are provided for Jersey,
Spring Session, Spring Security, etc.

Closes gh-15376
2019-02-12 14:05:36 +00:00
Andy Wilkinson 2e66fc1d76 Merge branch '2.1.x' 2019-02-12 13:54:31 +00:00
Andy Wilkinson cc64398800 Revert "Upgrade to Couchbase Client 2.7.3"
This reverts commit 06feb728b8.

See gh-15914
2019-02-12 13:53:43 +00:00
Stephane Nicoll 6905edc649 Merge branch '2.1.x' 2019-02-12 13:35:37 +01:00
Stephane Nicoll 04aacdb37a Merge pull request #15881 from kedar-joshi
* pr/15881:
  Polish "Document internationalization support"
  Document internationalization support
2019-02-12 13:35:19 +01:00
Stephane Nicoll 4469c46b0a Polish "Document internationalization support"
Closes gh-15881
2019-02-12 13:34:53 +01:00
Kedar Joshi 989ac08f34 Document internationalization support
See gh-15881
2019-02-12 13:03:50 +01:00
Andy Wilkinson 5967a3b81d Merge branch '2.1.x' 2019-02-12 11:58:50 +00:00
Andy Wilkinson ef10eed83f Upgrade to Lombok 1.18.6
Closes gh-15928
2019-02-12 11:57:37 +00:00
Andy Wilkinson 3ec19362d6 Upgrade to Pooled Jms Version 1.0.4
Closes gh-15927
2019-02-12 11:57:37 +00:00
Andy Wilkinson 2ea9037aef Upgrade to Liquibase 3.6.3
Closes gh-15926
2019-02-12 11:57:37 +00:00
Andy Wilkinson 4cd1e68660 Upgrade to Mimepull 1.9.11
Closes gh-15925
2019-02-12 11:57:37 +00:00
Andy Wilkinson ba786048e0 Upgrade to Infinispan 9.4.6.Final
Closes gh-15924
2019-02-12 11:57:37 +00:00
Andy Wilkinson 8076dbc277 Upgrade to Groovy 2.5.6
Closes gh-15923
2019-02-12 11:57:37 +00:00
Andy Wilkinson 8b9b162675 Upgrade to Tomcat 9.0.16
Closes gh-15922
2019-02-12 11:57:37 +00:00
Andy Wilkinson 6dcf0ebb9b Upgrade to Log4j2 2.11.2
Closes gh-15921
2019-02-12 11:30:46 +00:00
Andy Wilkinson f8548d10b4 Upgrade to Artemis 2.6.4
Closes gh-15920
2019-02-12 11:30:45 +00:00
Andy Wilkinson 14212e9e22 Upgrade to Byte Buddy 1.9.10
Closes gh-15919
2019-02-12 11:30:44 +00:00
Andy Wilkinson ec9fe4bed5 Upgrade to Mysql 8.0.15
Closes gh-15918
2019-02-12 11:30:43 +00:00
Andy Wilkinson 59e9396c7d Upgrade to Undertow 2.0.17.Final
Closes gh-15917
2019-02-12 11:30:43 +00:00
Andy Wilkinson c2b5d9655d Upgrade to Rxjava2 2.2.6
Closes gh-15916
2019-02-12 11:30:42 +00:00
Andy Wilkinson 1f47bd9717 Upgrade to Saaj Impl 1.5.1
Closes gh-15915
2019-02-12 11:30:41 +00:00
Andy Wilkinson 06feb728b8 Upgrade to Couchbase Client 2.7.3
Closes gh-15914
2019-02-12 11:30:40 +00:00
Andy Wilkinson 0f2e13e707 Merge branch '2.0.x' into 2.1.x 2019-02-12 11:28:06 +00:00
Andy Wilkinson 103e072836 Upgrade to Thymeleaf Extras Java8time 3.0.3.RELEASE
Closes gh-15913
2019-02-12 11:17:54 +00:00
Andy Wilkinson 776e6bd47b Upgrade to Neo4j Ogm 3.1.7
Closes gh-15912
2019-02-12 11:17:53 +00:00
Andy Wilkinson 4bc40f9c47 Upgrade to Hibernate 5.2.18.Final
Closes gh-15911
2019-02-12 11:17:52 +00:00
Andy Wilkinson bb0d948f66 Upgrade to Janino 3.0.12
Closes gh-15910
2019-02-12 11:17:51 +00:00
Andy Wilkinson 33c32e8cb4 Upgrade to Reactor Bom Bismuth-SR16
Closes gh-15909
2019-02-12 11:17:50 +00:00
Andy Wilkinson 8ddf4a5a52 Upgrade to Netty 4.1.33.Final
Closes gh-15908
2019-02-12 11:17:49 +00:00
Andy Wilkinson b16aa6b21c Merge branch '1.5.x' into 2.0.x 2019-02-12 11:08:12 +00:00
Andy Wilkinson df28a44620 Upgrade to Spring Security Jwt 1.0.10.RELEASE
Closes gh-15907
2019-02-12 11:03:51 +00:00
Andy Wilkinson 984c0d85b9 Upgrade to Spring Retry 1.2.4.RELEASE
Closes gh-15906
2019-02-12 11:03:50 +00:00
Andy Wilkinson bdfe377af5 Upgrade to Tomcat 8.5.38
Closes gh-15905
2019-02-12 11:03:49 +00:00
Andy Wilkinson 8c4bffd5cf Upgrade to Httpcore 4.4.11
Closes gh-15904
2019-02-12 11:03:48 +00:00
Andy Wilkinson 8420dbac9b Upgrade to Httpclient 4.5.7
Closes gh-15903
2019-02-12 11:03:47 +00:00
Andy Wilkinson 330a6832cd Upgrade to Undertow 1.4.27.Final
Closes gh-15902
2019-02-12 11:03:46 +00:00
Andy Wilkinson db31e42751 Merge branch '2.1.x' 2019-02-12 09:58:21 +00:00
Andy Wilkinson a975c0ad16 Use Testcontainers’ CassandraContainer rather than our own
Closes gh-15901
2019-02-12 09:58:05 +00:00
Andy Wilkinson 1c90a89acd Merge branch '2.1.x' 2019-02-12 09:47:42 +00:00
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