Commit Graph

18905 Commits

Author SHA1 Message Date
Andy Wilkinson
85a4fb389d Merge branch '2.0.x' 2018-10-11 11:51:56 +01:00
Andy Wilkinson
a296a805c5 Tolerate different quoting of annotation attributes on Java 8 and 9+
Closes gh-13594
2018-10-11 11:51:34 +01:00
Stephane Nicoll
3f4fbe32ff Merge branch '2.0.x' 2018-10-11 11:56:13 +02:00
Stephane Nicoll
81377e2fd5 Invoke Flyway#setCallbacks only if necessary
Closes gh-14775
2018-10-11 11:50:53 +02:00
Andy Wilkinson
9d09a385ba Merge branch '2.0.x' 2018-10-11 10:40:55 +01:00
Andy Wilkinson
6b22cc1581 Revert "Upgrade to Netty 4.1.30.Final"
This reverts commit c9cf78bb69.

See gh-14752
2018-10-11 10:38:33 +01:00
Phillip Webb
85f86243c9 Order class filter checks and exit early
Update the logic in `OnClassCondition` so that filtering exits on the
first missing class. Also refactor the implementation to save
unnecessary `Set` creation when there is just a single class to check.

The `AutoConfigureAnnotationProcessor` has also been updated to order
classes so that any starting `org.springframework` are considered last.
The assumption being that other classes are more likely to be missing.

Closes gh-12131
2018-10-10 22:02:05 -07:00
Phillip Webb
b1d4cf4ea8 Fix Neo4J Tests
Update Neo4J tests following SPR-17333 which has broken our previous
method of simulating Embedded Neo4J.

Closes gh-14779
2018-10-10 17:51:41 -07:00
Phillip Webb
33c2d24560 Support ConfigurationProperties BindHandler advise
Allow custom `BinderHandler` advise to be applied to the `Binder` used
for `@ConfigurationProperties`.  This mechanism has been added to allow
Spring Cloud Stream to manipulate `Bindable` instances before binding
occurs.

NOTE: This commit introduces a breaking change to the `BindHandler`
interface since the `onStart` method now returns a `Bindable` rather
than a `boolean`.

Closes gh-14745
2018-10-10 12:40:11 -07:00
Phillip Webb
8da295998b Polish 2018-10-10 12:20:03 -07:00
Phillip Webb
60719bd982 Upgrade to Dropwizard Metrics 4.0.3
Closes gh-14428
2018-10-10 10:00:45 -07:00
Phillip Webb
94798062ab Configure Cassandra JMX Reporting
Allow Cassandra JMX reporting to be configured via a property, and
disable it by default since it won't work with Dropwizard metrics 4.

Also update some of our own tests to explicitly disable it.

Closes gh-14778
2018-10-10 10:00:44 -07:00
Phillip Webb
b3bdbd0e84 Upgrade cassandra-unit-spring to 3.5.0.1
Closes gh-14777
2018-10-10 10:00:44 -07:00
Stephane Nicoll
1a140a80d8 Improve logger-name value hint definition
This commit improve the logger-name value hint by adding a group
attribute that can be defined to specify whether logging groups should
be considered.

Closes gh-14748
2018-10-10 18:40:10 +02:00
Andy Wilkinson
923b48bae0 Exclude duplicate javax.activation classes from web services starter
In 2.3.1, the JAX-B API now depends on javax.activation-api. This has
caused duplicate Activation classes to appear in the starter due to
dependencies on both javax.activation:activation:1.1 and on
javax.activation:javax.activation-api:1.2. This commit removes the
duplicate classes by excluding the former in favour of the latter.

See gh-14754
2018-10-10 16:51:47 +01:00
Andy Wilkinson
526a66f0ad Upgrade to Sqlite Jdbc 3.25.2
Closes gh-14769
2018-10-10 16:35:16 +01:00
Andy Wilkinson
7d3493ba47 Upgrade to Selenium Htmlunit 2.33.0
Closes gh-14768
2018-10-10 16:35:16 +01:00
Andy Wilkinson
8660bd1500 Upgrade to Mockito 2.23.0
Closes gh-14767
2018-10-10 16:35:16 +01:00
Andy Wilkinson
6d0bae5fb0 Upgrade to Kotlin 1.2.71
Closes gh-14766
2018-10-10 16:35:16 +01:00
Andy Wilkinson
7e494b5616 Upgrade to Infinispan 9.4.0.Final
Closes gh-14765
2018-10-10 16:35:16 +01:00
Andy Wilkinson
2fe9ed85cc Upgrade to Glassfish Jaxb 2.3.1
Closes gh-14764
2018-10-10 15:17:42 +01:00
Andy Wilkinson
8425b52b42 Upgrade to Flyway 5.2.0
Closes gh-14763
2018-10-10 15:17:42 +01:00
Andy Wilkinson
c36655961f Upgrade to Elasticsearch 6.4.2
Closes gh-14762
2018-10-10 15:17:42 +01:00
Andy Wilkinson
cdf0b556f0 Upgrade to Ehcache3 3.6.1
Closes gh-14761
2018-10-10 15:17:42 +01:00
Andy Wilkinson
36bedff9f4 Upgrade to Commons Lang3 3.8.1
Closes gh-14760
2018-10-10 15:17:42 +01:00
Andy Wilkinson
7e449de2e4 Upgrade to Byte Buddy 1.9.1
Closes gh-14759
2018-10-10 15:17:42 +01:00
Andy Wilkinson
d422f4d295 Upgrade to Javax Jaxws 2.3.1
Closes gh-14758
2018-10-10 15:17:42 +01:00
Andy Wilkinson
ccb9a93754 Upgrade to Netty Tcnative 2.0.17.Final
Closes gh-14757
2018-10-10 15:17:42 +01:00
Andy Wilkinson
6be81a9a31 Upgrade to Saaj Impl 1.5.0
Closes gh-14756
2018-10-10 15:17:42 +01:00
Stephane Nicoll
73ad17d2cb Use standard SpringBeanJobFactory to create Quartz Job instances
A recent update to SpringBeanJobFactory provides the same features as
our AutowireCapableBeanJobFactory override so this commit removes it in
favour of the standard factory.

Closes gh-14772
2018-10-10 16:01:59 +02:00
Stephane Nicoll
c5122fb365 Merge branch '2.0.x' 2018-10-10 15:44:12 +02:00
Stephane Nicoll
3ccdbd0621 Merge pull request #14770 from Hanope
* pr/14770:
  Fix typo
2018-10-10 15:43:56 +02:00
Hanope
29b453d8b0 Fix typo
Closes gh-14770
2018-10-10 15:43:29 +02:00
Andy Wilkinson
4ede33e09b Merge branch '2.0.x' 2018-10-10 13:08:13 +01:00
Andy Wilkinson
c897ff959f Upgrade to Ehcache3 3.5.3
Closes gh-14755
2018-10-10 13:06:01 +01:00
Andy Wilkinson
88c2f36ff1 Upgrade to Javax Jaxb 2.3.1
Closes gh-14754
2018-10-10 13:06:01 +01:00
Andy Wilkinson
72db995336 Upgrade to Javax Json 1.1.3
Closes gh-14753
2018-10-10 13:06:00 +01:00
Andy Wilkinson
c9cf78bb69 Upgrade to Netty 4.1.30.Final
Closes gh-14752
2018-10-10 13:05:59 +01:00
Andy Wilkinson
27ae772064 Upgrade to Rabbit Amqp Client 5.4.3
Closes gh-14751
2018-10-10 13:05:58 +01:00
Andy Wilkinson
3debf4f68c Merge branch '2.0.x' 2018-10-10 13:01:24 +01:00
Andy Wilkinson
ddb8694ae2 Merge branch '1.5.x' into 2.0.x 2018-10-10 13:00:17 +01:00
Andy Wilkinson
8124ac2b79 Upgrade to Undertow 1.4.26.Final
Closes gh-13880
2018-10-10 12:58:09 +01:00
Andy Wilkinson
f638dd40fa Upgrade to Rabbit Amqp Client 4.8.3
Closes gh-14750
2018-10-10 12:54:01 +01:00
Andy Wilkinson
4c3912a70c Upgrade to Appengine Sdk 1.9.66
Closes gh-14749
2018-10-10 12:54:00 +01:00
Stephane Nicoll
eacea1af46 Merge pull request #10771 from hengyunabc
* pr/10771:
  Polish "Add encoding support for git and build properties"
  Add encoding support for git and build properties
2018-10-10 13:44:13 +02:00
Stephane Nicoll
c91d9bfda8 Polish "Add encoding support for git and build properties"
Closes gh-10771
2018-10-10 13:43:44 +02:00
hengyunabc
f7a4a56fba Add encoding support for git and build properties
See gh-10771
2018-10-10 13:43:44 +02:00
Andy Wilkinson
73c6cc1b5d Merge branch '2.0.x' 2018-10-10 12:43:22 +01:00
Andy Wilkinson
839e686c9e Fix Checkstyle violation 2018-10-10 12:43:06 +01:00
Andy Wilkinson
646c20ed6a Merge branch '2.0.x' 2018-10-10 12:22:00 +01:00