14328 Commits

Author SHA1 Message Date
Phillip Webb
5c28f8f6a8 Merge branch '2.4.x'
Closes gh-26585
2021-05-17 21:35:04 -07:00
Phillip Webb
0e3ef4071e Allow optional ConfigDataLocationResolver results
Update `ConfigData` so that it signal if is considered optional. This
update allows `ConfigDataLocationResolvers` to return results that
behave in the same way as `optional:` prefixed locations without the
user themselves needing to prefix the location string.

Closes gh-25894
2021-05-17 21:31:58 -07:00
Phillip Webb
0c8d819150 Merge branch '2.4.x'
Closes gh-26584
2021-05-17 17:10:10 -07:00
Phillip Webb
0699fdcc8a Polish 'Allow remote devtools access with Spring Security'
See gh-25868
2021-05-17 16:54:27 -07:00
Hatef Palizgar
9b2e13aace Allow remote devtools access with Spring Security
Update `ManagementWebSecurityAutoConfiguration` so that the
`managementSecurityFilterChain` bean has an explicit order.

Prior to this commit, the `managementSecurityFilterChain` would override
the `securityFilterChain` in `RemoteDevtoolsSecurityConfiguration` which
would prevent the remote devtools endpoint from being accessed.

See gh-25868
2021-05-17 16:51:18 -07:00
Phillip Webb
ba0fe1edbd Merge branch '2.4.x'
Closes gh-26581
Closes gh-26582
Closes gh-26583
2021-05-17 16:28:52 -07:00
Madhura Bhave
c45bb2bd95 Handle empty locations from patterns
Update `StandardConfigDataLocationResolver` to deal with patterns when
resolving empty directories. This update also fixes the handling of
mandatory pattern locations which would previously throw an exception.

The error message returned when a location with a pattern does not
contain any subdirectories has also been improved.

Fixes gh-26468
Fixes gh-26577
Fixes gh-26415
2021-05-17 16:23:46 -07:00
Phillip Webb
2bbad94910 Restore hasProgrammaticallySetProfiles code
Restore code lost on merge.

See gh-26580
2021-05-17 15:34:45 -07:00
Phillip Webb
634d27679a Merge branch '2.4.x'
Closes gh-26580
2021-05-17 13:30:33 -07:00
Madhura Bhave
cfa26735d2 Merge programmatically set active profiles
Update `Profiles` so that any profiles set programmatically on the
`Environment` are merged with `spring.profiles.active` properties.

Fixes gh-26151

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-05-17 13:29:12 -07:00
Andy Wilkinson
36b6235e86 Upgrade to Spring AMQP 2.2.17.RELEASE
Closes gh-26428
2021-05-17 18:02:53 +01:00
Stephane Nicoll
e9174c1e3d Update copyright year of changed files
See gh-26478
2021-05-17 16:08:20 +02:00
weixsun
935199b6ba Polish AbstractServletWebServerFactory
See gh-26478
2021-05-17 16:08:19 +02:00
Andy Wilkinson
d41fa13463 Merge branch '2.4.x'
Closes gh-26575
2021-05-17 14:39:35 +01:00
Andy Wilkinson
4eab9476a6 Polish "Detect use of spring.profiles.include as a YAML list"
See gh-26205
2021-05-17 14:13:29 +01:00
ChangYong
80ad6385f1 Detect use of spring.profiles.include as a YAML list
See gh-26205
2021-05-17 14:04:51 +01:00
Andy Wilkinson
4517f6057e Merge branch '2.4.x'
Closes gh-26573
2021-05-17 13:50:13 +01:00
Andy Wilkinson
1d5abf5af7 Merge branch '2.3.x' into 2.4.x
Closes gh-26572
2021-05-17 13:49:25 +01:00
Andy Wilkinson
eecb7dd101 Remove stale jboss-transaction-spi dependencies
Closes gh-26569
2021-05-17 13:49:16 +01:00
Andy Wilkinson
513dd82bed Upgrade to Kotlin Coroutines 1.5.0
Closes gh-26568
2021-05-17 13:39:59 +01:00
Andy Wilkinson
af506685be Upgrade to Thymeleaf Layout Dialect 2.5.3
Closes gh-26566
2021-05-17 13:39:58 +01:00
Andy Wilkinson
17506c7e13 Upgrade to Solr 8.8.2
Closes gh-26565
2021-05-17 13:39:58 +01:00
Andy Wilkinson
6d786ecfe1 Upgrade to SAAJ Impl 1.5.3
Closes gh-26564
2021-05-17 13:39:58 +01:00
Andy Wilkinson
d3e8d1533f Upgrade to R2DBC Bom Arabba-SR10
Closes gh-26563
2021-05-17 13:39:58 +01:00
Andy Wilkinson
b62a011643 Upgrade to Postgresql 42.2.20
Closes gh-26562
2021-05-17 13:39:58 +01:00
Andy Wilkinson
f6d89fd940 Upgrade to Pooled JMS 1.2.2
Closes gh-26561
2021-05-17 13:39:58 +01:00
Andy Wilkinson
ef89622a10 Upgrade to Netty tcNative 2.0.39.Final
Closes gh-26560
2021-05-17 13:39:57 +01:00
Andy Wilkinson
2d39269368 Upgrade to Netty 4.1.64.Final
Closes gh-26559
2021-05-17 13:39:57 +01:00
Andy Wilkinson
c9814abe16 Upgrade to Neo4j Java Driver 4.2.5
Closes gh-26558
2021-05-17 13:39:57 +01:00
Andy Wilkinson
0e16c58ed6 Upgrade to MySQL 8.0.25
Closes gh-26557
2021-05-17 13:39:57 +01:00
Andy Wilkinson
0575f2f60a Upgrade to MariaDB 2.7.3
Closes gh-26556
2021-05-17 13:39:57 +01:00
Andy Wilkinson
27d599b9e2 Upgrade to Liquibase 4.3.5
Closes gh-26555
2021-05-17 13:39:57 +01:00
Andy Wilkinson
23c957a563 Upgrade to Lettuce 6.1.2.RELEASE
Closes gh-26554
2021-05-17 13:39:56 +01:00
Andy Wilkinson
4bbcc3edda Upgrade to Kafka 2.7.1
Closes gh-26552
2021-05-17 13:39:56 +01:00
Andy Wilkinson
4b132628a7 Upgrade to JUnit Jupiter 5.7.2
Closes gh-26551
2021-05-17 13:39:56 +01:00
Andy Wilkinson
f1e4cc1c28 Upgrade to Json-smart 2.4.7
Closes gh-26550
2021-05-17 13:39:56 +01:00
Andy Wilkinson
7729755cd6 Upgrade to jOOQ 3.14.9
Closes gh-26549
2021-05-17 13:39:56 +01:00
Andy Wilkinson
875a31a70d Upgrade to Johnzon 1.2.11
Closes gh-26548
2021-05-17 13:39:56 +01:00
Andy Wilkinson
6f72007d77 Upgrade to Jetty 9.4.40.v20210413
Closes gh-26547
2021-05-17 13:39:55 +01:00
Andy Wilkinson
ed316c43d5 Upgrade to Jetty Reactive HTTPClient 1.1.8
Closes gh-26546
2021-05-17 13:39:55 +01:00
Andy Wilkinson
416511bb98 Upgrade to Jedis 3.6.0
Closes gh-26545
2021-05-17 13:39:55 +01:00
Andy Wilkinson
0322a3931f Upgrade to JBoss Transaction SPI 7.6.1.Final
Closes gh-26544
2021-05-17 13:39:55 +01:00
Andy Wilkinson
2f4fbfdcf8 Upgrade to Janino 3.1.4
Closes gh-26543
2021-05-17 13:39:55 +01:00
Andy Wilkinson
b7c8badfe8 Upgrade to Infinispan 12.1.3.Final
Closes gh-26542
2021-05-17 13:39:55 +01:00
Andy Wilkinson
23e02cada1 Upgrade to HttpCore5 5.1.1
Closes gh-26541
2021-05-17 13:39:55 +01:00
Andy Wilkinson
a78e50bcc3 Upgrade to HttpClient5 5.0.4
Closes gh-26540
2021-05-17 13:39:54 +01:00
Andy Wilkinson
544abfd9ae Upgrade to Hibernate 5.4.31.Final
Closes gh-26539
2021-05-17 13:39:54 +01:00
Andy Wilkinson
93b385421d Upgrade to Hazelcast 4.1.3
Closes gh-26538
2021-05-17 13:39:54 +01:00
Andy Wilkinson
466a9e3421 Upgrade to Groovy 3.0.8
Closes gh-26537
2021-05-17 13:39:54 +01:00
Andy Wilkinson
53e178e1c4 Upgrade to Glassfish JAXB 2.3.4
Closes gh-26536
2021-05-17 13:39:54 +01:00