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
Ryan Baxter
5c20cc0a80
Merge remote-tracking branch 'origin/2.0.x' into 2.1.x
2019-05-21 10:48:49 -04:00
Ryan Baxter
f2c69f351d
Updating README
2019-05-21 10:33:28 -04:00
Ryan Baxter
9f3ec9ec74
Add note about spring.application.name needing to be set in bootstrap.yml. Fixes #416
2019-05-21 10:33:09 -04:00
Olga Maciaszek-Sharma
4715da896c
Fix stale link.
2019-05-13 14:02:47 +02:00
Spencer Gibb
700a11a4ec
Merge branch 'spring-operator-polish-urls-remaining-2.1.x' into 2.1.x
2019-03-27 12:21:22 -04:00
Spring Operator
8045850e96
URL Cleanup
...
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).
These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended.
* [ ] http://a.host (UnknownHostException) with 1 occurrences migrated to:
https://a.host ([https](https://a.host ) result UnknownHostException).
* [ ] http://c.host (UnknownHostException) with 1 occurrences migrated to:
https://c.host ([https](https://c.host ) result UnknownHostException).
* [ ] http://compose.docker.io/ (UnknownHostException) with 1 occurrences migrated to:
https://compose.docker.io/ ([https](https://compose.docker.io/ ) result UnknownHostException).
* [ ] http://d.host (UnknownHostException) with 1 occurrences migrated to:
https://d.host ([https](https://d.host ) result UnknownHostException).
* [ ] http://f.host (UnknownHostException) with 1 occurrences migrated to:
https://f.host ([https](https://f.host ) result UnknownHostException).
* [ ] http://g.host (UnknownHostException) with 1 occurrences migrated to:
https://g.host ([https](https://g.host ) result UnknownHostException).
* [ ] http://h.host (UnknownHostException) with 1 occurrences migrated to:
https://h.host ([https](https://h.host ) result UnknownHostException).
* [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to:
https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ) result 404).
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.
* [ ] http://12factor.net/ with 2 occurrences migrated to:
https://12factor.net/ ([https](https://12factor.net/ ) result 200).
* [ ] http://cloud.spring.io/spring-cloud-consul/ with 1 occurrences migrated to:
https://cloud.spring.io/spring-cloud-consul/ ([https](https://cloud.spring.io/spring-cloud-consul/ ) result 200).
* [ ] http://cloud.spring.io/spring-cloud-netflix/ with 1 occurrences migrated to:
https://cloud.spring.io/spring-cloud-netflix/ ([https](https://cloud.spring.io/spring-cloud-netflix/ ) result 200).
* [ ] http://cloud.spring.io/spring-cloud-zookeeper/ with 1 occurrences migrated to:
https://cloud.spring.io/spring-cloud-zookeeper/ ([https](https://cloud.spring.io/spring-cloud-zookeeper/ ) result 200).
* [ ] http://example.com with 1 occurrences migrated to:
https://example.com ([https](https://example.com ) result 200).
* [ ] http://martinfowler.com/bliki/CircuitBreaker.html with 1 occurrences migrated to:
https://martinfowler.com/bliki/CircuitBreaker.html ([https](https://martinfowler.com/bliki/CircuitBreaker.html ) result 200).
* [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 2 occurrences migrated to:
https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ) result 200).
* [ ] http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html with 2 occurrences migrated to:
https://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html ([https](https://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html ) result 200).
* [ ] http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html with 2 occurrences migrated to:
https://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html ([https](https://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html ) result 200).
* [ ] http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html with 2 occurrences migrated to:
https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html ([https](https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html ) result 200).
* [ ] http://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook with 2 occurrences migrated to:
https://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook ([https](https://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook ) result 301).
* [ ] http://plugins.jetbrains.com/plugin/6546 with 2 occurrences migrated to:
https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546 ) result 301).
* [ ] http://projects.spring.io/spring-boot with 2 occurrences migrated to:
https://projects.spring.io/spring-boot ([https](https://projects.spring.io/spring-boot ) result 301).
* [ ] http://eclipse.org with 1 occurrences migrated to:
https://eclipse.org ([https](https://eclipse.org ) result 302).
* [ ] http://eclipse.org/m2e/ with 2 occurrences migrated to:
https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/ ) result 302).
* [ ] http://www.springsource.com/developer/sts with 1 occurrences migrated to:
https://www.springsource.com/developer/sts ([https](https://www.springsource.com/developer/sts ) result 302).
These URLs were intentionally ignored.
* http:///foobar with 1 occurrences
* http://default with 1 occurrences
* http://foo with 7 occurrences
* http://foo_underscore with 1 occurrences
* http://foobar with 1 occurrences
* http://host1:8080 with 2 occurrences
* http://listener with 1 occurrences
* http://localhost with 4 occurrences
* http://localhost:8888 with 1 occurrences
* http://myservice/path/to/service with 1 occurrences
* http://noRetry with 1 occurrences
* http://s1-1:8080 with 5 occurrences
* http://stores with 1 occurrences
* http://stores/stores with 3 occurrences
* http://testservice with 1 occurrences
2019-03-27 12:21:04 -04:00
Spring Operator
951539ed9c
URL Cleanup ( #546 )
...
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 But Review Recommended
These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended.
* [ ] http://compose.docker.io/ (UnknownHostException) with 1 occurrences migrated to:
https://compose.docker.io/ ([https](https://compose.docker.io/ ) result UnknownHostException).
* [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to:
https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ) result 404).
## 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://12factor.net/ with 2 occurrences migrated to:
https://12factor.net/ ([https](https://12factor.net/ ) result 200).
* [ ] http://cloud.spring.io/spring-cloud-consul/ with 1 occurrences migrated to:
https://cloud.spring.io/spring-cloud-consul/ ([https](https://cloud.spring.io/spring-cloud-consul/ ) result 200).
* [ ] http://cloud.spring.io/spring-cloud-netflix/ with 1 occurrences migrated to:
https://cloud.spring.io/spring-cloud-netflix/ ([https](https://cloud.spring.io/spring-cloud-netflix/ ) result 200).
* [ ] http://cloud.spring.io/spring-cloud-zookeeper/ with 1 occurrences migrated to:
https://cloud.spring.io/spring-cloud-zookeeper/ ([https](https://cloud.spring.io/spring-cloud-zookeeper/ ) result 200).
* [ ] http://example.com with 1 occurrences migrated to:
https://example.com ([https](https://example.com ) result 200).
* [ ] http://martinfowler.com/bliki/CircuitBreaker.html with 1 occurrences migrated to:
https://martinfowler.com/bliki/CircuitBreaker.html ([https](https://martinfowler.com/bliki/CircuitBreaker.html ) result 200).
* [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 2 occurrences migrated to:
https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ) result 200).
* [ ] http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html with 2 occurrences migrated to:
https://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html ([https](https://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html ) result 200).
* [ ] http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html with 2 occurrences migrated to:
https://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html ([https](https://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html ) result 200).
* [ ] http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html with 2 occurrences migrated to:
https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html ([https](https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html ) result 200).
* [ ] http://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook with 2 occurrences migrated to:
https://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook ([https](https://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook ) result 301).
* [ ] http://plugins.jetbrains.com/plugin/6546 with 2 occurrences migrated to:
https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546 ) result 301).
* [ ] http://projects.spring.io/spring-boot with 2 occurrences migrated to:
https://projects.spring.io/spring-boot ([https](https://projects.spring.io/spring-boot ) result 301).
* [ ] http://eclipse.org with 1 occurrences migrated to:
https://eclipse.org ([https](https://eclipse.org ) result 302).
* [ ] http://eclipse.org/m2e/ with 2 occurrences migrated to:
https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/ ) result 302).
* [ ] http://www.springsource.com/developer/sts with 1 occurrences migrated to:
https://www.springsource.com/developer/sts ([https](https://www.springsource.com/developer/sts ) result 302).
# Ignored
These URLs were intentionally ignored.
* http:///foobar with 1 occurrences
* http://default with 1 occurrences
* http://foo with 7 occurrences
* http://foo_underscore with 1 occurrences
* http://foobar with 1 occurrences
* http://host1:8080 with 2 occurrences
* http://listener with 1 occurrences
* http://localhost with 4 occurrences
* http://localhost:8888 with 1 occurrences
* http://myservice/path/to/service with 1 occurrences
* http://noRetry with 1 occurrences
* http://s1-1:8080 with 5 occurrences
* http://stores with 1 occurrences
* http://stores/stores with 3 occurrences
* http://testservice with 1 occurrences
2019-03-26 16:11:45 -04: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
Spring Operator
9e9b3e9d4d
URL Cleanup ( #537 )
...
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://repo.spring.io/libs-milestone-local with 2 occurrences migrated to:
https://repo.spring.io/libs-milestone-local ([https](https://repo.spring.io/libs-milestone-local ) result 302).
* [ ] http://repo.spring.io/libs-snapshot-local with 2 occurrences migrated to:
https://repo.spring.io/libs-snapshot-local ([https](https://repo.spring.io/libs-snapshot-local ) result 302).
* [ ] http://repo.spring.io/release with 1 occurrences migrated to:
https://repo.spring.io/release ([https](https://repo.spring.io/release ) result 302).
# Ignored
These URLs were intentionally ignored.
* http://maven.apache.org/POM/4.0.0 with 16 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 8 occurrences
2019-03-26 16:07:53 -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
Spring Operator
13004974c4
URL Cleanup ( #518 )
...
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 163 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:46:32 -04:00
Spring Operator
ae265d1bbc
URL Cleanup ( #500 )
...
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 8 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).
* http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch with 1 occurrences migrated to:
https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch ([https](https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch ) result 200).
* http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin with 1 occurrences migrated to:
https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin ([https](https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin ) result 200).
* http://www.apache.org/licenses/LICENSE-2.0 with 2 occurrences migrated to:
https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0 ) result 200).
# Ignored
These URLs were intentionally ignored.
* http://maven.apache.org/POM/4.0.0 with 16 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 8 occurrences
2019-03-16 11:31:54 -04:00
Marcin Grzejszczak
eed7042995
Whitelisted this branch
2019-03-07 15:37:43 +01:00
Marcin Grzejszczak
96e490c4fa
HTTP to HTTPS
2019-03-07 13:46:41 +01: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
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
2019-02-17 17:48:28 +01:00
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
2019-02-17 17:47:50 +01:00
Olga Maciaszek-Sharma
77fd62d4f6
Add ConditionalOnDiscoveryEnabled. ( #482 )
...
* Add ConditionalOnDiscoveryEnabled.
* Fix typo.
* Fix typo.
* Add @since info. Fix typo.
2019-02-17 15:57:28 +01: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
buildmaster
8c4fe5626e
Bumping versions
2019-02-14 17:23:19 +00: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
dd3909611d
Changed the order of plugins
2019-02-07 16:58:08 +01: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
30b59dacae
Added springformat
2019-02-01 13:42:45 +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
Bruce E. Thelen
6cffcf9352
Update to RELEASE version of dependency ( #474 )
2019-01-29 16:23:23 -05:00
buildmaster
b761f276e7
Bumping versions
2019-01-25 12:42:52 +00: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
