Commit Graph

26617 Commits

Author SHA1 Message Date
Stephane Nicoll
c3c7fc0f43 Polish smoke test with removal of View support in Couchbase
See gh-21383
2020-05-11 16:17:18 +02:00
Stephane Nicoll
07958ac5cc Start building against Spring Kafka 2.5.0 snapshots
See gh-21387
2020-05-11 11:49:33 +02:00
Stephane Nicoll
dedcfeb150 Start building against Spring Session Dragonfruit snapshots
See gh-21386
2020-05-11 11:49:01 +02:00
Stephane Nicoll
e32d701e76 Start building against Spring Integration 5.3.0 snapshots
See gh-21385
2020-05-11 11:48:24 +02:00
Stephane Nicoll
5c26c895d5 Start build against Spring HATEOAS 1.1.0 snapshots
See gh-21284
2020-05-11 11:47:57 +02:00
Stephane Nicoll
7ce6ea484f Start building against Spring Data Neumann snapshots
See gh-21383
2020-05-11 11:47:07 +02:00
Phillip Webb
49921d65ac Ensure @ActiveProfiles replaces existing profiles
Update `SpringBootContextLoader` to both add `spring.profiles.active`
properties and to directly call `Environment.setActiveProfiles`.
The additional `setActiveProfiles` call prevents `AbstractEnvironment`
from accidentally loading `spring.profiles.active` properties directly
when `doGetActiveProfiles` is called.

Directly setting active profiles has only become necessary since we
started adding properties using the square bracket notation. Previously
we added a comma-separated list which would be picked up by both the
`AbstractEnvironment` and the `ConfigurationFileApplicationListener`.

Closes gh-21302
2020-05-08 17:16:06 -07:00
Scott Frederick
28749e7fbb Update CNB buildpack Java version env variable
Prior to this commit, the build tool plugins set the environment
variable BP_JAVA_VERSION when invoking the CNB builder to set the
version of the JDK/JRE that the builder should use in the created
image.

With CNB API 0.3, the convention changed the name of this environment
variable to BP_JVM_VERSION. This commit updates the build tool
plugins to match the newer convention.

See gh-21273
2020-05-08 17:07:51 -05:00
Scott Frederick
35bc82a693 Use CNB creator all-in-one lifecycle
This commit modifies the buildpack platform invocation logic used by
the build plugins to invoke the single creator lifecycle introduced in
the CNB API 0.3, instead of invoking discrete lifecycle phases
separately. It also removes support for CNB API 0.2.

Fixes gh-21273
2020-05-08 17:03:47 -05:00
Stephane Nicoll
d067cc6ae2 Merge branch '2.2.x'
Closes gh-21367
2020-05-08 16:58:01 +02:00
Stephane Nicoll
c3eaa6dc54 Merge branch '2.1.x' into 2.2.x
Closes gh-21366
2020-05-08 16:57:41 +02:00
Stephane Nicoll
efc9978362 Document use case of splitting auto-configuration and starter
Closes gh-20686
2020-05-08 16:55:47 +02:00
Stephane Nicoll
228703faed Merge pull request #21365 from izeye
* pr/21365:
  Fix JarFileTests.getInputStreamWhenClosed()

Closes gh-21365
2020-05-08 16:07:06 +02:00
Johnny Lim
665a127448 Fix JarFileTests.getInputStreamWhenClosed()
See gh-21365
2020-05-08 16:06:42 +02:00
Stephane Nicoll
846db6105f Merge branch '2.2.x'
Closes gh-21364
2020-05-08 14:51:49 +02:00
Stephane Nicoll
0dfca922ac Merge pull request #21318 from ahrytsiuk
* pr/21318:
  Polish "Align TestRestTemplate Javadoc with documentation"
  Align TestRestTemplate Javadoc with documentation

Closes gh-21318
2020-05-08 14:51:30 +02:00
Stephane Nicoll
60ff8bafb5 Polish "Align TestRestTemplate Javadoc with documentation"
See gh-21318
2020-05-08 14:49:50 +02:00
Andrii Hrytsiuk
f11c030b71 Align TestRestTemplate Javadoc with documentation
See gh-21318
2020-05-08 14:48:21 +02:00
Stephane Nicoll
fe652ea6e2 Merge pull request #21040 from dreis2211
* pr/21040:
  Update link to new Spring Security docs location

Closes gh-21040
2020-05-08 14:30:18 +02:00
dreis2211
71c8d5cda1 Update link to new Spring Security docs location
See gh-21040
2020-05-08 14:29:22 +02:00
Phillip Webb
7afd25fc9a Add ConfigurationPropertyCaching support
Add a `ConfigurationPropertyCaching` utility interface that can be
used to control the property source caching.

Prior to this commit, a `ConfigurationPropertySource` that was backed
by a mutable `EnumerablePropertySource` would need to call the
`getPropertyNames()` method each time a property was accessed. Since
this this operation can be expensive, we now provide a way to cache
the results for a specific length of time.

This commit also improves the performance of immutable property sources
by limiting the number of candidates that need to be searched.
Previously, all mapped names would be enumerated. Now, mappings are
grouped by `ConfigurationPropertyName`. This is especially helpful when
the `ConfigurationPropertyName` isn't mapped at all since the hash based
map lookup will be very fast and the resulting mappings will be empty.

Closes gh-20625
2020-05-07 15:22:24 -07:00
Phillip Webb
85e9a73e85 Add hashcode support to ConfigurationPropertyName
Provide a hashcode implementation for `ConfigurationPropertyName` so
that instances can be stored in Map without them all ending up in the
same bucket.

See gh-20625
2020-05-07 15:22:20 -07:00
Phillip Webb
5309912927 Test large property source performance
Add a test to ensure that a large number of property sources that each
contain many items can perform well.

See gh-20625
2020-05-07 15:22:10 -07:00
Stephane Nicoll
74327e11a1 Merge branch '2.2.x' 2020-05-07 17:50:29 +02:00
Stephane Nicoll
15cd0f8ef4 Merge branch '2.1.x' into 2.2.x 2020-05-07 17:50:14 +02:00
Spring Buildmaster
b65747e301 Next development version (v2.2.8.BUILD-SNAPSHOT) 2020-05-07 15:27:07 +00:00
Phillip Webb
81058cab03 Allow clash in spring.config.name
Remove the recently added slash restriction since Spring Cloud
Config Server needs to support names with slashes.

See gh-21217
2020-05-07 07:56:01 -07:00
Phillip Webb
559c178637 Simplify regex expressions 2020-05-07 07:44:31 -07:00
Spring Buildmaster
9f37f163a8 Next development version (v2.1.15.BUILD-SNAPSHOT) 2020-05-07 14:10:55 +00:00
Stephane Nicoll
09815cc99d Merge branch '2.2.x'
Closes gh-21352
2020-05-07 14:19:41 +02:00
Stephane Nicoll
31f9a965f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21351
2020-05-07 14:12:53 +02:00
Stephane Nicoll
1a4f6df0a3 Upgrade to Spring Ldap 2.3.3.RELEASE
Closes gh-21342
2020-05-07 14:11:24 +02:00
Stephane Nicoll
3ac38fd65e Upgrade to Spring Security 5.3.2.RELEASE
Closes gh-21349
2020-05-07 09:50:25 +02:00
Stephane Nicoll
99a31be8cd Merge branch '2.2.x' 2020-05-07 09:49:43 +02:00
Stephane Nicoll
55a1cd4a34 Upgrade to Spring Security 5.2.4.RELEASE
Closes gh-21348
2020-05-07 09:41:38 +02:00
Stephane Nicoll
c56a113867 Merge branch '2.1.x' into 2.2.x 2020-05-07 09:40:40 +02:00
Stephane Nicoll
66afe280cb Upgrade to Spring Security 5.1.10.RELEASE
Closes gh-21346
2020-05-07 09:32:15 +02:00
Madhura Bhave
8e7f816f48 Merge branch '2.2.x'
Closes gh-21344
2020-05-06 16:37:25 -07:00
Madhura Bhave
5583f64b1f Add tests to verify Jetty's thread pool defaults match server defaults
Closes gh-21213
2020-05-06 16:35:00 -07:00
Madhura Bhave
01404aa27b Merge branch '2.2.x'
Closes gh-21343
2020-05-06 16:00:24 -07:00
Madhura Bhave
f29bce657e Harmonize default for server.tomcat.use-relative-redirects
Prior to this commit, the property was a Boolean with a null default.
If it was explicitly set by the user, a context customizer would use
that value to set it on the context. However, if it was not set, the default
wouldn't be tomcat's default but `false` because it was explicitly set to
`false` in `TomcatServletWebServerFactory`. This commit defaults the property
itself to `false` so that the default is more obvious to the user.

Fixes gh-20796
2020-05-06 15:54:27 -07:00
Madhura Bhave
be7fe85b55 Polish 2020-05-06 15:35:44 -07:00
Phillip Webb
b4963d2463 Fix legacy environment names in isAncestorOf
Fix the `SystemEnvironmentPropertyMapper.isAncestorOf` implementation
to convert names based on their dashed form and to silently ignore
any invalid results.

Closes gh-14479
2020-05-06 11:35:39 -07:00
Andy Wilkinson
70c4baeef6 Merge branch '2.2.x'
Closes gh-21341
2020-05-06 17:34:48 +01:00
Andy Wilkinson
386d678d99 Use Gradle's CreateStartScripts task with 6.4 and later
Fixes gh-20759
2020-05-06 17:02:34 +01:00
Stephane Nicoll
1560c66702 Merge branch '2.2.x' 2020-05-06 16:44:47 +02:00
Andy Wilkinson
693fa918e2 Tolerate deprecation warnings generated by Gradle 6.4
The warnings will be addressed by gh-20759. CreateBootStartScripts
must be excluded from the classes that are validated by the
ValidatePlugins task. It is invalid, but only for Gradle 6.4. gh-20759
will cause it to only be used with Gradle 6.3 and earlier.

See gh-21329
2020-05-06 15:33:11 +01:00
Stephane Nicoll
addaf5ff18 Upgrade to Jetty El 8.5.54
Closes gh-21340
2020-05-06 16:09:23 +02:00
Stephane Nicoll
4dc9aa082f Upgrade to Hibernate 5.4.15.Final
Closes gh-21339
2020-05-06 16:09:23 +02:00
Stephane Nicoll
5bb26bf9db Upgrade to Johnzon Jsonb 1.2.5
Closes gh-21338
2020-05-06 16:09:22 +02:00