Commit Graph

456 Commits

Author SHA1 Message Date
buildmaster
178395f6c9 Going back to snapshots 2019-11-18 14:33:52 +00:00
buildmaster
4bba3d1a80 Update SNAPSHOT to 2.1.4.RELEASE 2019-11-18 14:32:51 +00:00
buildmaster
d8b1abe02f Bumping versions to 2.1.4.BUILD-SNAPSHOT after release 2019-09-09 18:22:04 +00:00
buildmaster
fff96f4a8c Going back to snapshots 2019-09-09 18:22:04 +00:00
buildmaster
74ba6c90c2 Update SNAPSHOT to 2.1.3.RELEASE 2019-09-09 18:20:12 +00:00
Ryan Baxter
656feb2758 Merge branch '2.1.x' of github.com:spring-cloud/spring-cloud-commons into 2.1.x 2019-08-22 12:11:58 -04:00
Ryan Baxter
e52736cef1 Merge branch 'master' of https://github.com/rhanton/spring-cloud-commons into rhanton-master 2019-08-22 11:42:56 -04:00
Tim Ysewyn
86650dc215 Updated license header 2019-07-26 15:08:53 +01:00
Tim Ysewyn
c19575b978 Added optimizations to EnvironmentDecryptApplicationInitializer 2019-07-26 15:08:53 +01:00
Tim Ysewyn
28b9727250 Changed order of decrypting values. (#581)
Reversed order of sources in CompositePropertySource to adhere to the order of sources returned by the Spring Cloud Config server.
2019-07-16 18:28:26 +02:00
Olga Maciaszek-Sharma
3eeee62272 Apply Spring Boot's solution of coercing false LogLevel to OFF. (#575)
Fixes gh-556.
2019-07-01 14:01:39 +02:00
Spencer Gibb
23ac3caabe Updates version to 2.1.3 bumps build to 2.1.7 2019-06-21 11:44:03 -04:00
buildmaster
ad4e8d6a29 Bumping versions to 2.1.4.BUILD-SNAPSHOT after release 2019-06-20 16:26:17 +00:00
buildmaster
3d3673ade7 Going back to snapshots 2019-06-20 16:26:17 +00:00
buildmaster
24514b085c Update SNAPSHOT to 2.1.2.RELEASE 2019-06-20 16:23:22 +00:00
buildmaster
c9d42117be Bumping versions to 2.1.3.BUILD-SNAPSHOT after release 2019-06-11 18:38:29 +00:00
buildmaster
a21ed507cb Going back to snapshots 2019-06-11 18:38:29 +00:00
buildmaster
8b5ea85b44 Update SNAPSHOT to 2.1.2.RELEASE 2019-06-11 18:37:07 +00:00
Spring Operator
6ffcf639f9 URL Cleanup (#538)
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://maven.apache.org/xsd/maven-4.0.0.xsd with 9 occurrences migrated to:
  https://maven.apache.org/xsd/maven-4.0.0.xsd ([https](https://maven.apache.org/xsd/maven-4.0.0.xsd) result 200).

# Ignored
These URLs were intentionally ignored.

* http://maven.apache.org/POM/4.0.0 with 18 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 9 occurrences
2019-03-26 16:08:14 -04:00
Ryan Baxter
08bdac40d0 Updating dependencies 2019-03-26 15:53:51 -04:00
Spring Operator
2a84af80d4 URL Cleanup (#523)
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://www.apache.org/licenses/ with 1 occurrences migrated to:
  https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200).
* [ ] http://www.apache.org/licenses/LICENSE-2.0 with 275 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
2019-03-26 15:48:29 -04:00
buildmaster
54f496ecef Bumping versions to 2.1.2.BUILD-SNAPSHOT after release 2019-03-05 15:22:36 +00:00
buildmaster
f3fa713490 Going back to snapshots 2019-03-05 15:22:35 +00:00
buildmaster
41db03106f Update SNAPSHOT to 2.1.1.RELEASE 2019-03-05 14:55:27 +00:00
Ryan Baxter
911b9aa992 Merge remote-tracking branch 'origin/2.0.x' 2019-02-27 11:45:44 -05:00
Ryan Baxter
5e29ff1a6f Add new type property to KeyStore properties. (#486) 2019-02-27 11:31:56 -05:00
buildmaster
f19f4be761 Bumping versions to 2.0.4.BUILD-SNAPSHOT after release 2019-02-22 15:22:11 +00:00
buildmaster
ea5abfd3a5 Going back to snapshots 2019-02-22 15:22:11 +00:00
buildmaster
5ea5bdcf70 Update SNAPSHOT to 2.0.3.RELEASE 2019-02-22 15:19:33 +00:00
Ryan Baxter
bb1e769ce3 Revert #473 2019-02-14 18:51:22 -05:00
Ryan Baxter
fcf67be215 Merge remote-tracking branch 'origin/2.0.x' 2019-02-14 18:11:00 -05:00
Ryan Baxter
4413f136aa Revert "Only attempt to decrypt properties that are not overridden (#462)"
This reverts commit 59798f52ed.
2019-02-14 17:14:14 -05:00
Ryan Baxter
5e52806440 Revert "Allow overriding encrypted properties with unencrypted properties (#459)"
This reverts commit 4a66435d38.
2019-02-14 17:09:28 -05:00
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
2019-02-14 15:54:27 -05:00
Spencer Gibb
a7c344f83f formatting 2019-02-14 15:52:32 -05:00
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
2019-02-13 11:34:26 -05:00
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
2019-02-13 11:33:06 -05:00
Marcin Grzejszczak
377eaad4a1 Checkstyle for tests 2019-02-03 15:13:41 +01:00
Marcin Grzejszczak
04d764d33a Updated copyrights 2019-02-01 14:41:18 +01:00
Marcin Grzejszczak
ae314100f5 Applied checkstyle and turned it on by default 2019-02-01 12:50:02 +01:00
Jasper Aarts
e024f6f5c2 Fix override behaviour when using CompositePropertySource. (#473)
* Fix override behaviour when using CompositePropertySource.
Fixes gh-471

* Improve imports
2019-01-31 20:51:37 -05:00
buildmaster
0c9f9f1d6e Bumping versions to 2.1.1.BUILD-SNAPSHOT after release 2019-01-22 17:52:15 +00:00
buildmaster
de56340e7b Going back to snapshots 2019-01-22 17:52:15 +00:00
buildmaster
5c64a6d02c Update SNAPSHOT to 2.1.0.RELEASE 2019-01-22 17:49:47 +00:00
Ryan Baxter
ddcd40736f Merge remote-tracking branch 'origin/2.0.x' 2019-01-18 16:14:12 -05:00
Ryan Baxter
d7d0320905 Merge remote-tracking branch 'origin/1.3.x' into 2.0.x 2019-01-18 16:13:43 -05:00
Ryan Baxter
b91e2ab731 Trim profile names in array (#469)
* Trim profile names in array.  Fixes #460

* Use tokenizeToStringArray
2019-01-18 16:12:52 -05:00
Ryan Baxter
43c270a53c Provide exact error when there is a problem opening the logging config file. Fixes #464 (#470) 2019-01-18 10:30:05 -05:00
Ryan Baxter
7ee51d9bc8 Provide exact error when there is a problem opening the logging config file. Fixes #464 (#470) 2019-01-18 10:29:14 -05:00
Ryan Baxter
ecabe2bb8d Merge remote-tracking branch 'origin/2.0.x' 2019-01-07 12:43:08 -05:00