Commit Graph

28384 Commits

Author SHA1 Message Date
Phillip Webb
d0fce0553f Support extensionless file imports
Update `ResourceConfigDataLocationResolver` so that it can import files
that have no file extension.

Closes gh-22280
2020-08-25 13:57:10 -07:00
Phillip Webb
081a7ee28c Throw exception if import locations are not found
Update config data processing code so that import locations are
mandatory by default. Any import request will now throw a
`ConfigDataLocationNotFoundException` if the specified import
location cannot be found. For optional imports, the user can
use the `optional:` prefix to indicate that the application should
continue to start, even if the location does not exist.

Closes gh-23032
2020-08-25 12:56:55 -07:00
Andy Wilkinson
19558ecda7 Merge branch '2.3.x' 2020-08-25 16:51:17 +01:00
Andy Wilkinson
d133f228e2 Increase wait times in DevToolsIntegrationTests
See gh-22909
2020-08-25 16:50:56 +01:00
Andy Wilkinson
cf0036992f Increase timeouts used in Cassandra integration tests
Closes gh-23083
2020-08-25 16:33:26 +01:00
Andy Wilkinson
1b8bfaa1fb Merge pull request #23048 from s50600822
* gh-23048:
  Polish "Add a configuration property for KLC's idleBetweenPolls"
  Add a configuration property for KLC's idleBetweenPolls

Closes gh-23048
2020-08-25 16:15:11 +01:00
Andy Wilkinson
e9ab269b3b Polish "Add a configuration property for KLC's idleBetweenPolls"
See gh-23048
2020-08-25 16:02:29 +01:00
hoaphan
03a8937d5c Add a configuration property for KLC's idleBetweenPolls
See gh-23048
2020-08-25 15:54:59 +01:00
Andy Wilkinson
56ded38f5d Generate default values from Duration and Period .ZERO
Closes gh-23082
2020-08-25 15:46:50 +01:00
Stephane Nicoll
085091dbe3 Adapt auto-configurations to back-off in presence of TransactionManager
Previous to this commit, an auto-configuration would create a
PlatformTransactionManager if none is present and others conditions are
met. Spring Framework now has the notion of TransactionManager, a parent
interface that gathers both PlatformTransactionManager and
ReactiveTransactionManager.

Spring Boot should not be in a situation where both managers are defined
out-of-the-box. This commit makes sure to back-off if any
TransactionManager is available.

Closes gh-22851
2020-08-25 15:32:38 +02:00
Stephane Nicoll
f191b7513d Polish 2020-08-25 15:13:56 +02:00
Stephane Nicoll
598b7a9137 Merge branch '2.3.x'
Closes gh-23078
2020-08-25 14:06:46 +02:00
Stephane Nicoll
a149edcfd7 Merge branch '2.2.x' into 2.3.x
Closes gh-23077
2020-08-25 14:06:12 +02:00
Stephane Nicoll
066471b1d9 Merge branch '2.1.x' into 2.2.x
Closes gh-23076
2020-08-25 14:05:07 +02:00
Stephane Nicoll
de169ff8c9 Merge pull request #23071 from dreis2211
* pr/23071:
  Disallow Apache Commons Lang & Lang3 imports

Closes gh-23071
2020-08-25 14:03:56 +02:00
dreis2211
7bf32e9bb1 Disallow Apache Commons Lang & Lang3 imports
See gh-23071
2020-08-25 14:03:37 +02:00
Andy Wilkinson
f493740892 Merge branch '2.3.x' 2020-08-25 12:02:19 +01:00
Andy Wilkinson
e431010453 Merge branch '2.2.x' into 2.3.x 2020-08-25 12:02:08 +01:00
Andy Wilkinson
b57b2f0b44 Test the Gradle Plugin against 6.5 and 6.6
Closes gh-23075
2020-08-25 12:01:25 +01:00
Andy Wilkinson
dbf583bc3c Merge branch '2.3.x' 2020-08-25 10:22:43 +01:00
Andy Wilkinson
0b3a1310bd Align managed version of Nimbus JOSE JWT with Spring Security
Closes gh-22996
2020-08-25 09:53:50 +01:00
Andy Wilkinson
bdaad5b2dc Merge branch '2.3.x' 2020-08-25 09:47:09 +01:00
Andy Wilkinson
7a5392d6bd Polish 2020-08-25 09:45:40 +01:00
Andy Wilkinson
4fa7b3dc02 Merge branch '2.3.x'
Closes gh-23072
2020-08-25 08:50:19 +01:00
Andy Wilkinson
82e1eca0ad Merge pull request #22996 from ThomasKasene
* gh-22996:
  Polish "Added dependency management for nimbus-jose-jwt"
  Added dependency management for nimbus-jose-jwt

Closes gh-22996
2020-08-25 08:49:49 +01:00
Andy Wilkinson
858e1948dd Polish "Added dependency management for nimbus-jose-jwt"
See gh-22996
2020-08-25 08:49:36 +01:00
Thomas Kåsene
0277dce3da Added dependency management for nimbus-jose-jwt
See gh-22996
2020-08-25 08:49:36 +01:00
Stephane Nicoll
640000c0bb Disable file system preference for Freemarker templates
Previously to this commit, a project that has several classpath
locations matching the template path may lead to some of those
locations to be ignored if one of them is a directory. This can easily
happen if you run your tests in your IDE.

This commit changes the default of "preferFileSystemAccess" to
false so that the complete classpath is always considered.

Closes gh-23051
2020-08-24 18:22:50 +02:00
Andy Wilkinson
0417f949ad Start building against Reactor 2020.0.0-RC1 snapshots
See gh-23065
2020-08-24 15:58:53 +01:00
Stephane Nicoll
deee3606c3 Merge branch '2.3.x'
Closes gh-23064
2020-08-24 12:21:12 +02:00
Stephane Nicoll
0374ed2a0c Merge branch '2.2.x' into 2.3.x
Closes gh-23063
2020-08-24 12:20:30 +02:00
Stephane Nicoll
5b0f22e8fe Fix unintended import on commons lang
Closes gh-23059
2020-08-24 12:12:33 +02:00
Stephane Nicoll
65a5994354 Merge branch '2.3.x'
Closes gh-23061
2020-08-24 11:57:42 +02:00
Stephane Nicoll
39dc2e7de4 Merge branch '2.2.x' into 2.3.x
Closes gh-23060
2020-08-24 11:57:22 +02:00
Stephane Nicoll
c2b69d560a Merge pull request #23028 from bedla
* pr/23028:
  Polish "Add example of custom Actuator operations"
  Add example of custom Actuator operations

Closes gh-23028
2020-08-24 11:56:47 +02:00
Stephane Nicoll
f1455b156a Polish "Add example of custom Actuator operations"
See gh-23028
2020-08-24 11:56:31 +02:00
Ivo Smid
e8de069e00 Add example of custom Actuator operations
See gh-23028
2020-08-24 11:37:00 +02:00
Stephane Nicoll
1aa7010c0f Merge pull request #23052 from dreis2211
* pr/23052:
  Simplify InputStream assertions

Closes gh-23052
2020-08-24 11:35:44 +02:00
dreis2211
33cd875cb8 Simplify InputStream assertions
See gh-23052
2020-08-24 11:35:17 +02:00
Stephane Nicoll
5b1c484e0d Merge pull request #23058 from mvanmeerbeck
* pr/23058:
  Polish "Add Hyperledger Fabric for Spring Boot Starter"
  Add Hyperledger Fabric for Spring Boot Starter

Closes gh-23058
2020-08-24 11:33:31 +02:00
Stephane Nicoll
2f7f5f4c8e Polish "Add Hyperledger Fabric for Spring Boot Starter"
See gh-23058
2020-08-24 11:33:02 +02:00
mvanmeerbeck
cd6945aad2 Add Hyperledger Fabric for Spring Boot Starter
See gh-23058
2020-08-24 11:30:44 +02:00
Andy Wilkinson
a408904120 Merge branch '2.3.x' 2020-08-24 09:23:20 +01:00
Andy Wilkinson
1f7d8f2180 Merge branch '2.2.x' into 2.3.x 2020-08-24 09:23:00 +01:00
Andy Wilkinson
947ba7081a Merge branch '2.1.x' into 2.2.x
Closes gh-23056
2020-08-24 09:22:44 +01:00
Andy Wilkinson
7a14477ac6 Upgrade to Gradle Enterprise Maven Extension 1.6.2
Closes gh-23055
2020-08-24 09:22:12 +01:00
Phillip Webb
758df17c7d Allow placeholders to be used in imports
Allow `${..}` property placeholders to be used in `spring.config.import`
properties. Prior to this commit, placeholders were not resolved when
binding the `ConfigDataProperty` instance. Furthermore, binding happened
too early for all placeholders to be resolved correctly. The
`ConfigDataEnvironmentContributor` class now has two states for imported
contributors, `UNBOUND_IMPORT` has the initial unbound state and is
eventually replaced with a `BOUND_IMPORT`.

Closes gh-23020
2020-08-23 20:27:12 -07:00
Phillip Webb
00cb5bbd86 Merge pull request #23050 from dreis2211
* pr/23050:
  Fix typos in tests

Closes gh-23050
2020-08-22 11:45:06 -07:00
dreis2211
f7d6f38368 Fix typos in tests
See gh-23050
2020-08-22 11:44:19 -07:00
Phillip Webb
d123c924a0 Add BootstrapRegisty support for config data
Expose the `BootstrapRegisty` to both `ConfigDataLocationResolver` and
`ConfigDataLoader` implementations. The registry is exposed via the
context interfaces and may be used to reuse instances that are expensive
to create. It may also be used to ultimately register beans with the
`ApplicationContext`.

Closes gh-22956
2020-08-20 21:49:03 -07:00