ffe994335e
Merge branch '1.5.x' into 2.0.x
2018-07-16 14:12:16 +02:00
3c67edafcd
Expose more Quartz properties
...
Closes gh-13782
2018-07-16 14:07:10 +02:00
66cb4ce3c7
Polish "Allow to configure Quartz's "overwriteExistingJobs" property"
...
Closes gh-13582
2018-07-16 14:06:13 +02:00
910e6dc4cc
Allow to configure Quartz's "overwriteExistingJobs" property
...
See gh-13582
2018-07-16 14:06:13 +02:00
0654dd4de2
Add JUnit Jupiter API to spring-boot-docs build
...
This is required for the docs module to inspect Spring Boot
annotations for meta-annotations.
See gh-13739
2018-07-16 13:49:37 +02:00
9c0ce3d20a
Merge branch '2.0.x'
2018-07-16 10:51:27 +02:00
f2cef87878
Fix since on JdbcOperationsDependsOnPostProcessor
...
Closes gh-13778
2018-07-16 10:50:55 +02:00
9b60eef0e2
Fix build after SPR-17034 in Spring Framework
...
Since SPR-17034, the core container now behaves a bit differently when
dealing with `null` beans.
Given a `null` `HandlerMapping` bean named "resourceHandlerMapping":
* `context.getBean("resourceHandlerMapping", HandlerMapping.class)`
still returns a `NullBean`
* `ListableBeanFactory.getBeansOfType` will return a Map of all existing
beans, not including the `null` ones as values of the map.
Closes gh-13760
2018-07-16 10:39:56 +02:00
1ae420670a
Polish
...
Closes gh-13776
2018-07-16 10:38:40 +02:00
48962718d1
Merge branch '2.0.x'
2018-07-16 10:37:43 +02:00
068e22d60b
Polish
...
See gh-13776
2018-07-16 10:34:00 +02:00
635986299c
Merge branch '2.0.x'
2018-07-16 10:28:49 +02:00
4314dc2972
Remove a List creation in CompositePropertySources.iterator()
...
Closes gh-13774
2018-07-16 10:20:49 +02:00
ac1f2a5817
Polish
2018-07-14 08:45:34 +01:00
c0574c8437
Update docs to reflect new health & info security
...
See gh-13722
2018-07-13 13:40:01 -07:00
d1b8558430
Make /health and /info insecure by default
...
Closes gh-13722
2018-07-13 13:35:52 -07:00
42bba4e1c5
Document Liquibase default values
...
Closes gh-13765
2018-07-13 13:41:32 +02:00
c59f31218a
Revert "Ignore Data Elasticsearch test that fails due to DATAES-470"
...
Closes gh-13744
2018-07-13 10:59:37 +01:00
4c7c328972
Polish "Upgrade to Liquibase 3.6.2"
...
Closes gh-13625
2018-07-13 11:40:45 +02:00
b5cb074219
Upgrade to Liquibase 3.6.2
...
See gh-13625
2018-07-13 11:37:26 +02:00
fa171671b1
Merge branch '2.0.x'
2018-07-13 09:39:29 +02:00
e6ea28dec5
Polish
2018-07-13 09:36:37 +02:00
13202eb278
Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
...
Closes gh-13706
2018-07-13 09:35:34 +02:00
d17d6374f0
Merge branch '2.0.x'
2018-07-13 09:27:44 +02:00
174cc2bc4e
Merge branch '1.5.x' into 2.0.x
2018-07-13 09:25:42 +02:00
8fc1e0ed4e
Merge branch '2.0.x'
2018-07-13 07:55:59 +02:00
ac8eebfbad
Fix typos
...
Closes gh-13762
2018-07-13 07:54:03 +02:00
04bca3f37f
Merge branch '2.0.x'
2018-07-12 16:58:16 +02:00
19709f7dea
Polish
2018-07-12 16:57:52 +02:00
1b3fa3ff0d
Remove @since tag from getServlet()
...
Closes gh-13757
2018-07-12 09:36:13 +01:00
2e5f0c2873
Fix WebMvc auto-conf tests after Framework change
...
This commit adapts to a recent Spring Framework change (a40d25a) that
turns no-op Spring MVC beans (infrastructure components that, given
their configuration, won't contribute anything to the application) into
`NullBean` instances.
2018-07-12 10:04:45 +02:00
dba0e1b778
Merge branch '2.0.x'
2018-07-11 15:26:08 -07:00
d7822ba135
Update copyright header for modified files
2018-07-11 15:25:39 -07:00
34ebf1a97c
Merge branch '2.0.x'
2018-07-11 15:23:00 -07:00
c8c32cfa33
Migrate tests to ApplicationContextRunner
2018-07-11 15:06:36 -07:00
6d9fabf5bc
Harmonize mongo auto-configuration
...
Provides a way to easily exclude `MongoAutoConfiguration` or
`MongoReactiveAutoConfiguration` so that multiple mongo clients
are not present.
Fixes gh-12407
2018-07-11 13:15:08 -07:00
1ea91ece23
Merge branch '2.0.x'
2018-07-11 17:49:19 +01:00
cced3514a7
Polish
2018-07-11 17:49:10 +01:00
6a48a440b2
Annotate our test annotations with @ExtendWith(SpringExtension.class)
...
Closes gh-13739
2018-07-11 17:25:21 +01:00
889f1bce3f
Merge branch '2.0.x'
2018-07-11 17:13:59 +01:00
c489c6c5f6
Polish test following forward merge
2018-07-11 17:13:45 +01:00
f32ab6eade
Merge branch '2.0.x'
2018-07-11 16:51:58 +01:00
67dfa0a720
Merge branch '1.5.x' into 2.0.x
2018-07-11 16:51:43 +01:00
7b4096ab50
Merge branch '2.0.x'
2018-07-11 14:39:04 +01:00
44273ee093
Merge branch '1.5.x' into 2.0.x
2018-07-11 14:38:49 +01:00
611f2332e6
Polish Flyway keys
2018-07-11 14:56:36 +02:00
29fcb10f8d
Polish
2018-07-11 14:51:24 +02:00
59749d53b8
Merge branch '2.0.x'
2018-07-11 11:24:06 +02:00
48819253eb
Fix dependency order between JdbcTemplate and database migration tools
...
This commit makes sure that Flyway/Liquibase migrates the schema if
necessary before a `JdbcTemplate` is made available as an injection
point.
This commit also adds a test that validates simple datasource
initialization (spring.datasource.*) happens before a `JdbcTemplate`
bean can be used.
Closes gh-13155
2018-07-11 11:23:44 +02:00
42f4f2ded8
Merge branch '2.0.x'
2018-07-11 10:13:57 +02:00
331775d6c0
Document latest version of gradle-git-properties plugin
...
Closes gh-13747
2018-07-11 10:13:41 +02:00
8cc0d5577e
Avoid unwanted bean overrides in spring-boot-test-autoconfigure
...
See gh-13609
2018-07-10 19:54:48 +01:00
f94ce495d8
Fix parameter order for RequestMatcherAssert.doesNotMatch()
...
Closes gh-13707
2018-07-10 11:36:47 -07:00
8194dc4aea
Merge branch '2.0.x'
2018-07-10 19:45:36 +02:00
177c54d441
Migrate JdbcTemplateAutoConfiguration tests to context runner
2018-07-10 19:45:20 +02:00
87b72cc981
Polish DevTools auto-configuration tests to avoid bean overrides
...
See gh-13609
2018-07-10 16:31:11 +01:00
5fcf45c4d0
Merge branch '2.0.x'
2018-07-10 17:07:46 +02:00
3423c5dddb
Detect DispatcherServlets registered via ServletRegistrationBean
...
Previously, when a DispatcherServlet was registered via a
ServletRegistrationBean, the mappings endpoint did not expose any
information about it as it wasn't detected.
This commit fixes the detection of available DispatcherServlets in the
context so that the mappings endpoint include them all.
Closes gh-13186
2018-07-10 17:06:36 +02:00
a5b3d549b9
Ignore Data Elasticsearch test that fails due to DATAES-470
2018-07-10 15:58:18 +01:00
43e2df105c
Align with latest changes in Spring Data REST
2018-07-10 15:58:18 +01:00
cf3b1f6653
Start building against Spring HATEOAS 0.25.0 snapshots
...
See gh-13742
2018-07-10 15:58:18 +01:00
8426e3c2c9
Merge branch '2.0.x'
2018-07-10 15:58:39 +02:00
46e6aa5963
Fix query string encoding in TraceableHttpServletRequest
...
Closes gh-13545
2018-07-10 15:56:10 +02:00
be837ccb4b
Use PropertySources.stream() where possible
...
Closes gh-13724
2018-07-10 15:35:03 +02:00
8c691273e3
Merge branch '2.0.x'
2018-07-10 15:31:56 +02:00
0de8317979
Separate logging from getUrlMappings()
...
Closes gh-13710
2018-07-10 15:27:43 +02:00
c1a81cfca0
Prohibit bean overriding by default and analyze override failures
...
Closes gh-13609
2018-07-10 12:28:18 +01:00
cdd9c92ba2
Start building against snapshots for Spring Data Lovelace RC1
...
See gh-13740
2018-07-10 11:42:37 +01:00
19a494a94d
Merge branch '2.0.x'
2018-07-10 10:27:39 +01:00
57e2bb9c6a
Merge branch '1.5.x' into 2.0.x
2018-07-10 10:27:28 +01:00
b87b23a44f
Fix parameter order for RequestMatcherAssert.doesNotMatch()
...
Closes gh-13707
2018-07-09 15:20:18 -07:00
63ae682a95
Merge branch '2.0.x'
2018-07-09 14:16:17 -07:00
4e7719f1c7
Fix typo
2018-07-09 14:15:19 -07:00
063e8e4dc6
Revert "Prohibit bean overriding by default and analyze override failures"
...
This reverts commit 710cdbab92
2018-07-09 17:58:49 +01:00
710cdbab92
Prohibit bean overriding by default and analyze override failures
...
Closes gh-13609
2018-07-09 13:50:16 +01:00
918191664a
Merge branch '2.0.x'
2018-07-09 13:39:30 +01:00
9eb5c9bd18
Merge branch '1.5.x' into 2.0.x
2018-07-09 13:39:11 +01:00
d1acf9a24d
Fix API adaptation changes for Reactor Netty
2018-07-09 13:44:08 +02:00
60457f1d9a
Merge branch '2.0.x'
2018-07-09 13:22:14 +02:00
44b9aa168e
Polish "Improve description of Endpoint exclude"
...
Closes gh-13619
2018-07-09 13:20:43 +02:00
838e6cdbbb
Improve description of Endpoint exclude
...
See gh-13619
2018-07-09 13:12:13 +02:00
0b48e223f3
Merge branch '2.0.x'
2018-07-09 10:50:18 +02:00
ab6adc8265
Polish
...
Closes gh-13616
2018-07-09 10:45:01 +02:00
5fcba490d2
Polish conditional expressions
...
Closes gh-13583
2018-07-09 09:15:10 +02:00
ba46e77169
Optimize checks for java classes in Binder
...
Closes gh-13567
2018-07-09 08:51:06 +02:00
3e24df1794
Polish "Add reference to structurizr starter"
...
Closes gh-13540
2018-07-09 08:38:58 +02:00
94517b9811
Add reference to structurizr starter
...
See gh-13540
2018-07-09 08:36:43 +02:00
fde534c877
Merge branch '2.0.x'
2018-07-06 13:53:08 +01:00
809e30506f
Merge branch '1.5.x' into 2.0.x
2018-07-06 13:52:53 +01:00
68a3c234be
Adapt to API changes in Reactor Netty
...
The following issue changed the SSL configuration API for both client
and server: https://github.com/reactor/reactor-netty/issues/370
2018-07-06 14:45:47 +02:00
bdd95f09a4
Polish WebClient metrics support
...
This commit improves the for Actuator Metrics in WebClient.
Unlike the server couterpart of WebFlux, using a `retry` operator on a
`WebClient` pipeline does resubscribes to the whole chain.
The previous implementation recorded start time at the time of pipeline
build phase, but outside of it. This doesn't work since retrying the
same pipeline doesn't update the recorded start time and the duration of
sequential calls are cumulative.
This is now fixed using the Reactor `Context`, since we're now recording
the start time at subscription time and record metrics on `onNext` and
`onError` signals.
Closes gh-12228
2018-07-05 15:58:34 +02:00
337d2d8e9a
Merge branch '2.0.x'
2018-07-04 15:25:33 +01:00
58be01a790
Try to make Jest auto-configuration tests more robust
2018-07-04 15:25:10 +01:00
913872327c
Merge branch '2.0.x'
2018-07-04 14:29:15 +01:00
468453b66e
Upgrade to Kotlin 1.2.51
...
Closes gh-13705
2018-07-04 14:22:39 +01:00
0e8206cdf4
Start building against Spring Framework 5.0.8 snapshots
...
See gh-13704
2018-07-04 14:18:32 +01:00
bc65c4cb2c
Update Infinispan dependency management for changes between 9.1 and 9.3
...
Closes gh-13570
2018-07-04 14:00:22 +01:00
79155a5313
Upgrade to Infinispan 9.3.0.Final
...
See gh-13570
2018-07-04 12:57:59 +01:00
ed39d0106d
Remove dependency management for groovy-all as it doesn't exist in 2.5
...
See gh-13670
2018-07-04 10:32:38 +01:00
4799a539fe
Stop using groovy-all as it does not exist in Groovy 2.5
2018-07-03 22:12:47 +01:00
fd624c20cf
Upgrade to Hikaricp 3.2.0
...
Closes gh-13695
2018-07-03 20:04:55 +01:00
5e6220f040
Upgrade to Versions Maven Plugin 2.5
...
Closes gh-13694
2018-07-03 20:04:55 +01:00
27d727b52e
Upgrade to Maven Site Plugin 3.7.1
...
Closes gh-13693
2018-07-03 20:04:55 +01:00
649511d3c8
Upgrade to Maven Shade Plugin 3.1.1
...
Closes gh-13692
2018-07-03 20:04:55 +01:00
e219c8793b
Upgrade to Maven Resources Plugin 3.1.0
...
Closes gh-13691
2018-07-03 20:04:55 +01:00
a7351ec734
Upgrade to Maven Jar Plugin 3.1.0
...
Closes gh-13690
2018-07-03 20:04:55 +01:00
2c745aab14
Upgrade to Maven Help Plugin 3.1.0
...
Closes gh-13689
2018-07-03 20:04:55 +01:00
18904ec291
Upgrade to Mysql 8.0.11
...
Closes gh-13688
2018-07-03 20:04:55 +01:00
4cd0b194ab
Upgrade to Maven Dependency Plugin 3.1.1
...
Closes gh-13686
2018-07-03 17:30:48 +01:00
dbef33dd2a
Upgrade to Maven Clean Plugin 3.1.0
...
Closes gh-13685
2018-07-03 17:30:48 +01:00
6fa24edf3a
Upgrade to Snakeyaml 1.21
...
Closes gh-13684
2018-07-03 17:30:48 +01:00
099dd0bd93
Upgrade to Xmlunit2 2.6.0
...
Closes gh-13683
2018-07-03 17:30:48 +01:00
63cddd1b6d
Upgrade to Sqlite Jdbc 3.23.1
...
Closes gh-13682
2018-07-03 17:30:48 +01:00
a79644f252
Upgrade to Selenium 3.13.0
...
Closes gh-13681
2018-07-03 17:30:48 +01:00
366899f10c
Upgrade to Selenium Htmlunit 2.31.0
...
Closes gh-13680
2018-07-03 17:30:48 +01:00
fe2749ee7e
Upgrade to Lombok 1.18.0
...
Closes gh-13679
2018-07-03 17:30:48 +01:00
373fde9b5d
Upgrade to Mongo Driver Reactivestreams 1.9.0
...
Closes gh-13678
2018-07-03 17:30:48 +01:00
757c6a9619
Upgrade to Mongodb 3.8.0
...
Closes gh-13677
2018-07-03 17:30:48 +01:00
d1f441a038
Upgrade to Mockito 2.19.0
...
Closes gh-13676
2018-07-03 17:30:48 +01:00
134edf9f2a
Upgrade to Jooq 3.11.2
...
Closes gh-13675
2018-07-03 17:30:48 +01:00
fba7ff293c
Upgrade to Jolokia 1.6.0
...
Closes gh-13674
2018-07-03 17:30:48 +01:00
9b72a4c1f0
Upgrade to Influxdb Java 2.11
...
Closes gh-13673
2018-07-03 17:30:48 +01:00
b6b37c91bb
Upgrade to Flyway 5.1.3
...
Closes gh-13672
2018-07-03 17:30:48 +01:00
2348047450
Upgrade to Elasticsearch 6.3.0
...
Closes gh-13671
2018-07-03 17:30:48 +01:00
e4869a71be
Upgrade to Groovy 2.5.0
...
Closes gh-13670
2018-07-03 17:30:48 +01:00
2f303f3e5b
Upgrade to Assertj 3.10.0
...
Closes gh-13669
2018-07-03 17:30:48 +01:00
cbcde741b1
Upgrade to Aspectj 1.9.1
...
Closes gh-13668
2018-07-03 17:30:48 +01:00
1d4ec56b08
Upgrade to Solr 7.4.0
...
Closes gh-13667
2018-07-03 17:30:48 +01:00
13d53c0a33
Upgrade to Log4j2 2.11.0
...
Closes gh-13666
2018-07-03 16:42:30 +01:00
d80181c550
Upgrade to Derby 10.14.2.0
...
Closes gh-13665
2018-07-03 16:42:30 +01:00
53cb3d8641
Upgrade to Commons Dbcp2 2.4.0
...
Closes gh-13664
2018-07-03 16:42:30 +01:00
304598e4bc
Upgrade to Artemis 2.6.2
...
Closes gh-13663
2018-07-03 16:42:30 +01:00
fbcc92dc7d
Upgrade to Htmlunit 2.31
...
Closes gh-13662
2018-07-03 14:33:21 +01:00
5a85b7dbb7
Upgrade to Byte Buddy 1.8.12
...
Closes gh-13661
2018-07-03 14:33:21 +01:00
c21a6c59a9
Upgrade to Joda Time 2.10
...
Closes gh-13660
2018-07-03 14:33:21 +01:00
7fb62af8bd
Upgrade to Javax Transaction 1.3
...
Closes gh-13659
2018-07-03 14:33:21 +01:00
c94d8b1978
Upgrade to Rest Assured 3.1.0
...
Closes gh-13658
2018-07-03 14:33:21 +01:00
706945d2ce
Upgrade to Embedded Mongo 2.1.1
...
Closes gh-13657
2018-07-03 14:33:21 +01:00
49d9f59f1b
Upgrade to Sendgrid 4.2.1
...
Closes gh-13656
2018-07-03 14:33:21 +01:00
031ad17ac1
Upgrade to Rabbit Amqp Client 5.3.0
...
Closes gh-13655
2018-07-03 14:33:21 +01:00
a30f0d9148
Upgrade to Querydsl 4.2.1
...
Closes gh-13654
2018-07-03 14:33:21 +01:00
7e020b3170
Upgrade to Mssql Jdbc 6.4.0.jre8
...
Closes gh-13653
2018-07-03 14:33:21 +01:00
dbf239be81
Upgrade to Hazelcast 3.10.2
...
Closes gh-13652
2018-07-03 14:33:21 +01:00
0827d9791a
Upgrade to Cassandra Driver 3.5.1
...
Closes gh-13651
2018-07-03 14:33:21 +01:00
f7aee36fd4
Upgrade to Flatten Maven Plugin 1.0.1
...
Closes gh-13650
2018-07-03 14:33:21 +01:00
1615b7d128
Upgrade to Xml Maven Plugin 1.0.2
...
Closes gh-13649
2018-07-03 14:33:21 +01:00
e94aecc5b6
Upgrade to Maven Resources Plugin 3.0.2
...
Closes gh-13648
2018-07-03 14:33:21 +01:00
deee5e63a6
Upgrade to Maven Javadoc Plugin 3.0.1
...
Closes gh-13647
2018-07-03 14:33:21 +01:00
8014b21ad9
Upgrade to Maven Enforcer Plugin 3.0.0-M2
...
Closes gh-13646
2018-07-03 14:33:15 +01:00
0e601c58cc
Upgrade to Jooq 3.10.8
...
Closes gh-13645
2018-07-03 14:32:50 +01:00
1301e0885b
Upgrade to Johnzon Jsonb 1.1.8
...
Closes gh-13643
2018-07-03 14:32:23 +01:00
11c635671f
Upgrade to Rxjava2 2.1.16
...
Closes gh-13642
2018-07-03 14:32:23 +01:00
f173429327
Upgrade to Flatten Maven Plugin 1.0.1
...
Closes gh-13650
2018-07-03 13:33:04 +01:00
5220a08228
Upgrade to Xml Maven Plugin 1.0.2
...
Closes gh-13649
2018-07-03 13:33:03 +01:00
573f736374
Upgrade to Maven Resources Plugin 3.0.2
...
Closes gh-13648
2018-07-03 13:33:02 +01:00
83a56bac60
Upgrade to Maven Javadoc Plugin 3.0.1
...
Closes gh-13647
2018-07-03 13:33:01 +01:00
d3ef9fd2ba
Upgrade to Maven Enforcer Plugin 3.0.0-M2
...
Closes gh-13646
2018-07-03 13:33:00 +01:00
1c64496470
Upgrade to Jooq 3.10.8
...
Closes gh-13645
2018-07-03 13:32:59 +01:00
797efbd259
Upgrade to Solr 6.6.5
...
Closes gh-13644
2018-07-03 13:32:58 +01:00
c6dae8f305
Upgrade to Johnzon Jsonb 1.1.8
...
Closes gh-13643
2018-07-03 13:32:57 +01:00
aa5b70c43c
Upgrade to Rxjava2 2.1.16
...
Closes gh-13642
2018-07-03 13:32:57 +01:00
2859d7e649
Merge branch '2.0.x'
2018-07-03 13:25:11 +01:00
9120f49721
Merge branch '1.5.x' into 2.0.x
2018-07-03 13:24:19 +01:00
0d3b49cd95
Upgrade to Maven War Plugin 3.2.2
...
Closes gh-13629
2018-07-03 09:13:41 +01:00
205fa2507b
Remove maven-eclipse-plugin as it has been retired
...
Closes gh-13631
2018-07-03 08:38:49 +01:00
d641249ca8
Fix deprecation warning in SpringPhysicalNamingStrategyTests
...
Closes gh-13623
2018-07-03 08:29:11 +01:00
149c7a85c3
Merge branch '2.0.x'
2018-07-02 13:18:45 -07:00
673a08d228
Support microseconds in Duration conversions
...
Closes gh-13624
2018-07-02 13:18:09 -07:00
c3641c480b
Merge branch '2.0.x'
2018-07-02 19:18:30 +01:00
06a8c41943
Preserve trailing whitespace in origin-tracked property values
...
Closes gh-13602
2018-07-02 19:17:02 +01:00
de900e71a3
Merge branch '2.0.x'
2018-07-02 16:26:27 +01:00
032d5488cd
Tolerate non-existent source folders in DevTools
...
Closes gh-13620
2018-07-02 16:26:19 +01:00
4eff07f6c0
Merge branch '2.0.x'
2018-06-28 12:49:34 -07:00
fddc9e9c7e
Support multiple paths in DispatcherServletPathProvider
...
Closes gh-13603
2018-06-28 12:36:58 -07:00
4cccc9a886
Merge branch '2.0.x'
2018-06-28 14:27:21 +01:00
a5d20ffed7
Avoid NPE when creating method tag for WebFlux req with non-standard method
...
Previously, a NullPointerException would occur when WebFluxTags
attempted to create a method Tag for a request with a non-standard
method.
This commit updates WebFluxTags to use getMethodValue(), which will
never return null, rather than getMethod(), which may return null,
when determining the tag's value for the given request.
Closes gh-13596
2018-06-28 14:27:02 +01:00
45fdf2ffa4
Support Tomcat 9 and Undertow 2
...
Closes gh-11749
Closes gh-12243
2018-06-28 11:33:30 +01:00
b4cd4f4c43
Stop mocking class that is final in latest Framework 5.1 snapshots
2018-06-28 10:51:58 +01:00
cde3c21926
Merge branch '2.0.x'
2018-06-27 11:34:22 -07:00
17edf0e2fe
Fix typo
2018-06-27 11:31:06 -07:00
598b1f4300
Merge branch '2.0.x'
2018-06-27 11:21:18 -07:00
a1491be636
Refine DispatcherServletPathProvider creation
...
Closes gh-13527
2018-06-27 11:06:56 -07:00
ca0de4385c
Upgrade to Hibernate 5.3 and JPA 2.2
...
Closes gh-11725
2018-06-26 16:51:47 +01:00
9281e2a410
Avoid creating JsonParser for VCAP_* parsing when running outside CF
...
Closes gh-13437
2018-06-25 17:35:30 +01:00
8dbeb68afa
Merge branch '2.0.x'
2018-06-25 13:13:42 +01:00
04119585e8
Merge branch '1.5.x' into 2.0.x
2018-06-25 13:13:34 +01:00
80ede14510
Merge branch '2.0.x'
2018-06-25 11:25:21 +01:00
911453d478
Merge branch '1.5.x' into 2.0.x
2018-06-25 11:25:10 +01:00
a097f923c1
Provide sensible defaults for launch script properties when using Gradle
...
Closes gh-4458
2018-06-22 13:08:44 +01:00
5c3b4333f8
Merge branch '2.0.x'
2018-06-21 17:31:24 +01:00
30f0fd1fe4
Merge branch '1.5.x' into 2.0.x
2018-06-21 17:31:16 +01:00
24dec4807f
Merge branch '2.0.x'
2018-06-21 12:47:46 +01:00
fd125b4a4a
Remove assumption that a file URI can be turned into a File
...
Closes gh-13493
2018-06-21 12:47:23 +01:00
4c172eb6cd
Merge branch '2.0.x'
2018-06-21 13:32:31 +02:00
f2cc6e2ef2
Fix link of RESTEasy repository
...
Closes gh-13538
2018-06-21 13:32:07 +02:00
c594768640
Remove wro4j starter reference
...
This starter does not look maintained anymore and there is an
alternative that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
8858c88a4c
Remove GraphQL starter reference
...
This starter does not look maintained anymore and there is a fork of it
that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
a612ba1b11
Merge branch '2.0.x'
2018-06-21 12:18:40 +01:00
48c5e70ac8
Merge branch '1.5.x' into 2.0.x
2018-06-21 12:18:35 +01:00
eb6898314a
Merge branch '2.0.x'
2018-06-21 11:41:15 +01:00
2624748911
Merge branch '1.5.x' into 2.0.x
2018-06-21 11:41:02 +01:00
56a7aa552f
Polish
2018-06-21 10:40:33 +02:00
bb60edaca6
Polish
...
Closes gh-13534
2018-06-21 09:24:36 +02:00
d4d169277d
Merge branch '2.0.x'
2018-06-21 09:23:43 +02:00
b9ea0fd5a7
Polish
...
See gh-13534
2018-06-21 09:20:50 +02:00
9e9e746554
Merge branch '1.5.x' into 2.0.x
2018-06-21 09:17:05 +02:00
3ea7c2e003
Merge branch '2.0.x'
2018-06-20 16:51:56 +01:00
4fc0a33094
Merge branch '1.5.x' into 2.0.x
2018-06-20 16:49:53 +01:00
c90f589906
Merge branch '2.0.x'
2018-06-20 13:57:05 +01:00
e2d6280d83
Merge branch '1.5.x' into 2.0.x
2018-06-20 13:56:55 +01:00
7571f10ae3
Merge branch '2.0.x'
2018-06-20 11:41:54 +01:00
e730382718
Merge branch '1.5.x' into 2.0.x
2018-06-20 11:12:51 +01:00
20546024d3
Merge branch '2.0.x'
2018-06-20 10:11:44 +01:00
e1774672af
Prefer servlet to reactive when Jersey and WebFlux are both available
...
Closes gh-13521
2018-06-20 10:10:35 +01:00
8b35d06cf6
Share RetryTemplate infrastructure for Rabbit listener and template
...
Closes gh-13529
2018-06-20 09:28:00 +02:00
65cc7c72f4
Harmonize JNDI lookups to enable resourceRef
...
This commit makes sure that JMS and Mail JNDI lookups behave the same
way as DataSource JNDI lookups by enabling the "resourceRef" flag.
This will make sure to add "java:comp/env" to the lookup if the JNDI
name doesn't already contain it. If that name does not exist, a second
attempt to the original name will be issued automatically.
Closes gh-12803
2018-06-19 21:51:18 +02:00
c12f8298e6
Merge branch '2.0.x'
2018-06-19 20:06:58 +01:00
814e90805e
Merge branch '1.5.x' into 2.0.x
2018-06-19 20:06:44 +01:00
3fdb2b3c85
Merge branch '2.0.x'
2018-06-19 20:59:43 +02:00
864a6b3e91
Merge branch '1.5.x' into 2.0.x
2018-06-19 20:59:27 +02:00
9d3ba14686
Fix conditions for CachingConnectionFactory support
...
Closes gh-12161
2018-06-19 19:58:48 +02:00
12eafc84b0
Merge branch '2.0.x'
2018-06-19 15:45:16 +01:00
497902de4e
Only bridge JUL into SLF4J when JUL has not be customized
...
Previously, Slf4jLoggingSystem would install SLF4JBridgeHandler into
JUL but would only remove a single root handler that was a
ConsoleHandler. If there were was than one root handler or the single
root handler was of a different type, they would not be uninstalled.
When deploying an application to Tomcat, this led to duplicate log
messages appearing in Tomcat’s console output and to logging from
other application or Tomcat itself being routed into an
application-specific log file enabled using the logging.file
configuration property.
A secondary, related problem was that LogbackLoggingSystem installs a
LevelChangePropagator so that Logback’s log level configuration is
propagated into JUL. This meant that an individual Boot app with
custom log level configuration could change the log levels of Tomcat
itself and of any other applications that had been deployed to Tomcat
and use JUL.
This commit updates both Slf4jLoggingSystem and LogbackLoggingSystem
so that they only change JUL’s configuration if it hasn’t already been
customized. The configuration is deemed to have not been customised if
there’s a single root handler and its a console handler.
Closes gh-13470
2018-06-19 15:29:46 +01:00
cc894ce4f2
Fix Micrometer tag providers after HttpStatus changes
...
Since SPR-16898, `HttpStatus.toString()` has changed and we should
instead rely on `HttpStatus.value()` to get the HTTP status number.
2018-06-19 16:05:40 +02:00
8365d53554
Add support for JMS session caching
...
This commit adds support for CachingConnectionFactory for both Artemis
and ActiveMQ. If connection pooling is not enabled explicitly, sessions,
producers and consumers are cached. The factory can be further
customized, including reverting to the raw ConnectionFactory, using the
`spring.jms.*` namespace.
Closes gh-12161
2018-06-19 15:17:00 +02:00
0ef54a79b1
Add support for connection pooling with Artemis
...
This commit expands ActiveMQ's connection pooling to artemis. The same
pooling features are now shared by the two brokers and a
PooledConnectionFactory can be auto-configured when the necessary jar is
present.
Closes gh-13523
2018-06-19 15:05:32 +02:00
28c1bc9986
Fix DefaultErrorViewResolver after HttpStatus changes
...
Since SPR-16898, `HttpStatus.toString()` has changed and we should
instead rely on `HttpStatus.value()` to get the HTTP status number.
2018-06-19 15:02:45 +02:00
6970f19ce3
Merge branch '2.0.x'
2018-06-19 14:12:25 +02:00
7ae82b070b
Stop calling Charset.availableCharsets() early
...
This is no longer required as Spring Framework has been updated to
invoke this method lazily as well.
Closes gh-13423
2018-06-19 14:12:00 +02:00
ae12d515ee
Merge branch '2.0.x'
2018-06-19 11:11:18 +02:00
1e7ed2ffdb
Add log level guards in ConfigFileApplicationListener
...
Closes gh-13512
2018-06-19 11:10:45 +02:00
f682c77691
Polish "Add reference to dozer-spring-boot-starter"
...
Closes gh-13501
2018-06-19 10:54:01 +02:00
9308904af7
Add reference to dozer-spring-boot-starter
...
See gh-13501
2018-06-19 10:52:45 +02:00
fb834898ab
Use final keywords for Map fields in JacksonProperties
...
Closes gh-13517
2018-06-19 09:13:33 +02:00
3a01914b63
Merge branch '2.0.x'
2018-06-18 17:18:16 -07:00
87680b4ee5
Fix profile precedence when active and include provided
...
Before 2.0.2, if profiles were activated via the environment using the
active and include profile property, profiles specified via the active
property would take precedence. This commit restores that behavior.
Fixes gh-13513
2018-06-18 16:24:49 -07:00
165d993e5d
Merge branch '2.0.x'
2018-06-18 17:54:39 +02:00
62c93a4b9a
Add missing `@ConditionalOnClass` check on RedisCacheConfiguration
...
Closes gh-13508
2018-06-18 17:54:10 +02:00
defa171a32
Merge branch '2.0.x'
2018-06-18 13:41:36 +02:00
dd3bfdbe42
Use @ManagementContextConfiguration consistently
2018-06-18 13:28:30 +02:00
b4584e6a28
Support profile expression in Logback's <springProfile>
...
Closes gh-13496
2018-06-18 13:23:58 +02:00
a89b2ae46e
Support profile expression in yml profile matching
...
Closes gh-12469
2018-06-18 13:05:52 +02:00
0c4176f596
Drop JsonSimpleJsonParser and JSON simple dependency
...
Closes gh-13471
2018-06-18 10:11:50 +02:00
fa7da40640
Upgrade to JUnit 5.2.0
...
Closes gh-13118
2018-06-18 09:19:13 +02:00
f3f573a774
Merge branch '2.0.x'
2018-06-18 08:18:41 +01:00
b3927cfd10
Start building against Spring REST Docs 2.0.2 snapshots
...
See gh-13505
2018-06-18 08:18:15 +01:00
3b0c1354cb
Upgrade to Maven Surefire/Failsafe Plugin 2.22.0
...
Closes gh-13500
2018-06-17 16:43:27 +02:00
403f8927c3
Polish CachesEndpoint
...
Closes gh-13487
2018-06-15 13:56:39 +02:00
ec845c93f2
Polish HibernateProperties and its test
...
Closes gh-13484
2018-06-15 13:44:35 +02:00
60b109cf0c
Merge branch '2.0.x'
2018-06-15 13:38:29 +02:00
f34fb5f1ee
Reduce object creation in findMatchingItemMetadata()
...
Closes gh-13473
2018-06-15 13:36:55 +02:00
b96f9d635f
Upgrade to Elasticsearch 5.6.10
...
Closes gh-13479
2018-06-14 09:40:08 +01:00
5654fb049f
Merge branch '2.0.x'
2018-06-14 08:52:24 +02:00
438f0b008a
Upgrade to Spring Amqp 2.0.4
...
Closes gh-13477
2018-06-14 08:48:36 +02:00
2483ed3e4e
Upgrade to Spring Kafka 2.1.7
...
Closes gh-13476
2018-06-14 08:47:20 +02:00
f217aa40f0
Merge branch '2.0.x'
2018-06-14 08:38:33 +02:00
d47d84ff7a
Merge branch '1.5.x' into 2.0.x
2018-06-14 08:36:18 +02:00
de6ce79d5f
Upgrade to Spring Session Apple-SR3
...
Closes gh-13461
2018-06-14 08:30:11 +02:00
40ba15047b
Upgrade to Spring Integration 5.0.6
...
Closes gh-13457
2018-06-14 08:28:17 +02:00
6e9fee35a7
Upgrade to Spring Data Kay SR8
...
Closes gh-13455
2018-06-13 23:05:47 +02:00
cb6c8f76e2
Configure X-Forwarded-* support with Reactor Netty
...
This commit configures the new X-Forwarded-* / Forwarded HTTP headers
support with Reactor Netty in its 0.8.0 version.
Closes gh-10900
2018-06-13 14:55:33 +02:00
f8eefa80df
Merge branch '2.0.x'
2018-06-13 10:55:24 +01:00
42c307b744
Upgrade to Solr 6.6.4
...
Closes gh-13468
2018-06-13 10:54:36 +01:00
bbcbc2d113
Upgrade to Reactor Bom Bismuth-SR10
...
Closes gh-13467
2018-06-13 10:54:35 +01:00
ed3f43fd25
Upgrade to Jackson 2.9.6
...
Closes gh-13466
2018-06-13 10:54:34 +01:00
0e867aec97
Upgrade to Couchbase Client 2.5.9
...
Closes gh-13465
2018-06-13 10:54:33 +01:00
71b8b2d242
Merge branch '1.5.x' into 2.0.x
2018-06-13 10:52:27 +01:00
a79c8918ff
Upgrade to Spring Security 5.0.6.RELEASE
...
Closes gh-13459
2018-06-13 09:36:47 +01:00
c738b73c6f
Merge branch '2.0.x'
2018-06-13 09:29:36 +02:00
870d7fe16a
Use @SpringBootTest.properties in tests and samples
...
Closes gh-13453
2018-06-13 09:24:28 +02:00
f8eedb04cc
Merge branch '2.0.x'
2018-06-13 09:08:57 +02:00
96a6d2923c
Upgrade to Micrometer 1.0.5
...
Closes gh-13454
2018-06-13 08:56:04 +02:00
d24647b07c
Upgrade to Spring Framework 5.0.7.RELEASE
...
Closes gh-13353
2018-06-13 08:51:40 +02:00
de3c3cd755
Add CLIENT_NAME_NONE to WebClientExchangeTags
2018-06-12 09:20:46 +02:00
c908445bff
Use a precompiled pattern in WebClientExchangeTags.extractPath()
2018-06-12 14:56:02 +09:00
5bd9a445ae
Merge branch '2.0.x'
2018-06-08 18:09:00 +01:00
6f2171c282
Improve error message when BootJar or BootWar has no known main class
...
Closes gh-12712
2018-06-08 18:07:24 +01:00
db7789ad87
Merge branch '2.0.x'
2018-06-08 15:47:55 +01:00
7b3be82cfa
Merge branch '1.5.x' into 2.0.x
2018-06-08 15:47:50 +01:00
87506248b0
Merge branch '2.0.x'
2018-06-07 12:53:37 -07:00
4194baad91
Don't log p/w when AuthenticationManagerBuilder configured
...
Fixes gh-12872
2018-06-07 12:52:15 -07:00
f7ff8dd165
Make generated password output consistent
2018-06-07 12:39:46 -07:00
ed734d7e43
Trace filter ignores invalid requests
...
Fixes gh-12987
2018-06-07 09:27:49 -07:00
751a2b438e
Upgrade duplicate finder maven plugin to 1.3.0
...
Closes gh-13411
2018-06-07 15:24:32 +02:00
59746de63b
Backport web server configuration doc changes
...
Closes gh-13401
2018-06-07 14:38:19 +02:00
a4ee33bf56
Follow-up dates for web server config documentation
...
See gh-13315
2018-06-07 14:32:59 +02:00
34167dc163
Polish
2018-06-07 13:34:18 +02:00
a9e56aa089
Merge branch '2.0.x'
2018-06-07 10:46:20 +02:00
5c96943e59
Merge branch '1.5.x' into 2.0.x
2018-06-07 10:45:59 +02:00
a0b6547aca
Don't fail build on duplicate module-info classes
...
Update the duplicate-finder-maven-plugin configuration to ignore
module-info classes.
Closes gh-13403
2018-06-06 17:32:36 -07:00
cb621024e4
Include error stacktrace by default when devtools is in use
...
Fixes gh-828
2018-06-06 15:25:52 -07:00
375769ed5a
Merge branch '2.0.x'
2018-06-06 15:18:52 -07:00
dc1c459cde
Polish "Fix caching issues with map property sources"
...
Refine the property source cache key fix so that a copy of the
key is only taken when the values change. This allows us to
retain the previous performance optimization of not creating
unnecessary string arrays.
Closes gh-13344
2018-06-06 15:17:07 -07:00
c556d2b58f
Fix caching issues with map property sources
...
Update `SpringIterableConfigurationPropertySource` so that the cache
key from a `MapPropertySource` is invalidated when the map contents
changes.
Prior to this commit, the actual keys of the map were used as the key.
This meant that if the underlying map changed, they key wouldn't be
invalidated because it ultimately pointed to the same object instance.
See gh-13344
2018-06-06 15:02:59 -07:00
9570cd4172
Add saaj and jax-ws to webservices starter
...
Closes gh-13360
2018-06-06 14:36:39 -07:00
6eaae608b5
Merge branch '2.0.x'
2018-06-06 10:49:46 -07:00
461202bc25
EndpointRequest uses empty servlet path if not available
...
Fixes gh-13399
2018-06-06 10:48:42 -07:00
0004550f7b
Document Reactor Netty server configuration
...
This commit regroups the documentation on how to configure a web server
in Spring Boot. The same concepts apply, whether the server is
Tomcat/Netty/Jetty/Undertow, or if it's deployed for a Servlet or
Reactive web application.
Closes gh-13315
2018-06-06 17:32:24 +02:00
fe3de2816c
Merge branch '2.0.x'
2018-06-06 14:07:58 +02:00
7cbbd95fc9
Ignore invalid Accept headers in WebFlux error handling
...
Prior to this commit, the `DefaultErrorWebExceptionHandler` would parse
the HTTP "Accept" headers when routing the request to the error handler;
if an error occured during parsing, an `InvalidMediaTypeException` would
be thrown and break the error handling for this request.
This commit ignores those exceptions and makes sure that the error
handling function does not override the response status or the error
itself with those exceptions.
Closes: gh-13372
2018-06-06 14:02:04 +02:00
Stephane Nicoll
Taras Danylchuk
Brian Clozel
Johnny Lim
Andy Wilkinson
Madhura Bhave
Miguel Gomes
dreis2211
Klaus Lehner
Galder Zamarreño
Karl Heinz Marbaise
Kazuki Shimizu
Jon Schneider
Rossen Stoyanchev
Phillip Webb
Fahim Farook