Ryan Baxter
5e29ff1a6f
Add new type property to KeyStore properties. ( #486 )
6 years ago
buildmaster
f19f4be761
Bumping versions to 2.0.4.BUILD-SNAPSHOT after release
6 years ago
buildmaster
ea5abfd3a5
Going back to snapshots
6 years ago
buildmaster
5ea5bdcf70
Update SNAPSHOT to 2.0.3.RELEASE
6 years ago
Olga Maciaszek-Sharma
ea9404ef81
Merge branch '2.0.x'
...
# Conflicts:
# spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
# spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java
6 years ago
Olga Maciaszek-Sharma
b0bd3278a5
Merge branch '2.0.x'
...
# Conflicts:
# spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
# spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java
6 years ago
Olga Maciaszek-Sharma
77fd62d4f6
Add ConditionalOnDiscoveryEnabled. ( #482 )
...
* Add ConditionalOnDiscoveryEnabled.
* Fix typo.
* Fix typo.
* Add @since info. Fix typo.
6 years ago
Ryan Baxter
bb1e769ce3
Revert #473
6 years ago
Ryan Baxter
fcf67be215
Merge remote-tracking branch 'origin/2.0.x'
6 years ago
Ryan Baxter
4413f136aa
Revert "Only attempt to decrypt properties that are not overridden ( #462 )"
...
This reverts commit 59798f52ed
.
6 years ago
Ryan Baxter
5e52806440
Revert "Allow overriding encrypted properties with unencrypted properties ( #459 )"
...
This reverts commit 4a66435d38
.
6 years ago
Spencer Gibb
b38ce54410
Sets the child class loader to parent class loader.
...
This prevents odd behavior in jdk 11 +
Fixes https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
6 years ago
Spencer Gibb
a7c344f83f
formatting
6 years ago
buildmaster
8c4fe5626e
Bumping versions
6 years ago
Spencer Gibb
703c7c2bbf
Ignores MapPropertySources not created by boot
...
Prior to this change, any `MapPropertySource` created by an `EnvironmentPostProcessor` would be processed by `BootstrapApplicationListener`. If that property source had a conditional property that it created itself, the 2nd run (bootstrap causes EPPs to run twice) would not have the property and that property source would end up in the main `Environment` effectively deleting a property.
This change only deals with `MapPropertySource`s created by boot testing for a specific sub-type.
Fixes gh-476
6 years ago
Spencer Gibb
109e5779e9
Ignores MapPropertySources not created by boot
...
Prior to this change, any `MapPropertySource` created by an `EnvironmentPostProcessor` would be processed by `BootstrapApplicationListener`. If that property source had a conditional property that it created itself, the 2nd run (bootstrap causes EPPs to run twice) would not have the property and that property source would end up in the main `Environment` effectively deleting a property.
This change only deals with `MapPropertySource`s created by boot testing for a specific sub-type.
Fixes gh-476
6 years ago
Marcin Grzejszczak
dd3909611d
Changed the order of plugins
6 years ago
Marcin Grzejszczak
377eaad4a1
Checkstyle for tests
6 years ago
Marcin Grzejszczak
04d764d33a
Updated copyrights
6 years ago
Marcin Grzejszczak
30b59dacae
Added springformat
6 years ago
Marcin Grzejszczak
ae314100f5
Applied checkstyle and turned it on by default
6 years ago
Jasper Aarts
e024f6f5c2
Fix override behaviour when using CompositePropertySource. ( #473 )
...
* Fix override behaviour when using CompositePropertySource.
Fixes gh-471
* Improve imports
6 years ago
Bruce E. Thelen
6cffcf9352
Update to RELEASE version of dependency ( #474 )
6 years ago
buildmaster
b761f276e7
Bumping versions
6 years ago
buildmaster
0c9f9f1d6e
Bumping versions to 2.1.1.BUILD-SNAPSHOT after release
6 years ago
buildmaster
de56340e7b
Going back to snapshots
6 years ago
buildmaster
5c64a6d02c
Update SNAPSHOT to 2.1.0.RELEASE
6 years ago
Ryan Baxter
ddcd40736f
Merge remote-tracking branch 'origin/2.0.x'
6 years ago
Ryan Baxter
d7d0320905
Merge remote-tracking branch 'origin/1.3.x' into 2.0.x
6 years ago
Ryan Baxter
b91e2ab731
Trim profile names in array ( #469 )
...
* Trim profile names in array. Fixes #460
* Use tokenizeToStringArray
6 years ago
Ryan Baxter
43c270a53c
Provide exact error when there is a problem opening the logging config file. Fixes #464 ( #470 )
6 years ago
Ryan Baxter
7ee51d9bc8
Provide exact error when there is a problem opening the logging config file. Fixes #464 ( #470 )
6 years ago
Spencer Gibb
493a324d03
Bumps spring cloud build to 2.1.2.BUILD-SNAPSHOT
6 years ago
Ryan Baxter
ecabe2bb8d
Merge remote-tracking branch 'origin/2.0.x'
6 years ago
Jasper Aarts
59798f52ed
Only attempt to decrypt properties that are not overridden ( #462 )
6 years ago
Jasper Aarts
4a66435d38
Allow overriding encrypted properties with unencrypted properties ( #459 )
6 years ago
buildmaster
bc521c4ab6
Going back to snapshots
6 years ago
buildmaster
57c2f9a154
Update SNAPSHOT to 2.1.0.RC2
6 years ago
buildmaster
c410aa749f
Going back to snapshots
6 years ago
buildmaster
1251411295
Update SNAPSHOT to 2.1.0.RC1
6 years ago
Dave Syer
daff90f230
Ensure null order is not allowed to bubble up to annotation utils
...
Fixes gh-456
6 years ago
Ryan Baxter
8d0f64fd93
Add property to disable WritableEnvironmentEndpoint. Fixes #432 . ( #453 )
6 years ago
Spencer Gibb
2515e45405
Closes bootstrap context on parent ApplicationFailedEvent. ( #450 )
...
Closes bootstrap context on parent ApplicationFailedEvent.
fixes gh-440
6 years ago
Spencer Gibb
ef6865cbc5
References DiscoveryClient with ObjectProvider.
...
fixes gh-451
6 years ago
Spencer Gibb
1acb2b8b8b
Moves away from Class.forName() to order.
6 years ago
Spencer Gibb
5df3c48fae
Moves BootstrapConfiguration classes to ImportSelector. ( #444 )
...
This change moves a dynamic list of classes passed to
`SpringApplicationBuilder.sources` to a `DeferredImportSelector` loaded
by a simple `@Configuration` class. `BootstrapImportSelector` now loads
the classes and orders them and returns the class names so that
`@Conditional` annotations (such as `@ConditionalOnClass`) function
properly.
This was exposed while using java 11.
fixes gh-438
6 years ago
Marcin Grzejszczak
0f9789511d
Merge branch '2.0.x'
6 years ago
Marcin Grzejszczak
0821e2b1cd
Merge branch '1.3.x' into 2.0.x
6 years ago
Marcin Grzejszczak
2b4c30c4b2
Added more info about how to disable compatibility check; fixes gh-449
6 years ago
buildmaster
8ed921523b
Going back to snapshots
6 years ago