Commit Graph

105 Commits

Author SHA1 Message Date
Olga Maciaszek-Sharma
e41b177129 Merge branch '2.1.x'
# Conflicts:
#	pom.xml
#	spring-cloud-cloudfoundry-dependencies/pom.xml
2019-05-10 16:08:52 +02:00
Olga Maciaszek-Sharma
328b0df842 Remove deprecated netflix-core dependency. 2019-05-10 16:06:58 +02:00
Spencer Gibb
b80eab7ced Makes app.internal configurable. 2019-04-29 17:35:54 -04:00
Spencer Gibb
8f7c072391 Checkstyle fixes 2019-04-29 15:13:07 -04:00
Toshiaki Maki
f0ef4f08bf Support DNS based Service Discovery
Adds new two DiscoveryClient implementations that depend on native Service Discovery supported by Cloud Foundry.

CloudFoundryAppServiceDiscoveryClient uses cf-java-client and find container's index-based route (e.g. 0.billing.apps.internal, 1.billing.apps.internal, 2.billing.apps.internal).
SimpleDnsBasedDiscoveryClient simply uses DNS and resolve container's ip (e.g. 10.250.56.12, 10.254.160.118, 10.254.112.192). does not depend on cf-java-client
By default, existing CloudFoundryDiscoveryClient is chosen.
Configuring spring.cloud.cloudfoundry.discovery.use-dns=true enables CloudFoundryAppServiceDiscoveryClient.
Configuring spring.cloud.cloudfoundry.discovery.use-dns=true and spring.cloud.cloudfoundry.discovery.use-container-ip=true enables SimpleDnsBasedDiscoveryClient.

This DiscoveryClient eliminates the limitation of Turbine on Cloud Foundry and does not need Turbine Stream.

In some environments (such as in a PaaS setting), the classic Turbine model of pulling metrics from all the distributed Hystrix commands does not work.

See gh-19
2019-04-29 15:06:11 -04:00
Spencer Gibb
4ba2f07891 Merge branch '2.1.x' 2019-04-01 13:03:06 -04:00
Spencer Gibb
362cfe7ec1 Merge branch '2.0.x' into 2.1.x 2019-04-01 12:52:55 -04:00
Spring Operator
32e77a4866 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://compose.docker.io/ (UnknownHostException) with 1 occurrences migrated to:
  https://compose.docker.io/ ([https](https://compose.docker.io/) result UnknownHostException).
* [ ] http://example.com/oauth/token (404) with 1 occurrences migrated to:
  https://example.com/oauth/token ([https](https://example.com/oauth/token) result 404).
* [ ] http://my-app.cfapps.io (404) with 1 occurrences migrated to:
  https://my-app.cfapps.io ([https](https://my-app.cfapps.io) result 404).
* [ ] 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://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/ with 1 occurrences migrated to:
  https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/ ([https](https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/) result 200).
* [ ] http://example.com with 9 occurrences migrated to:
  https://example.com ([https](https://example.com) 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://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://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).
2019-04-01 12:46:18 -04:00
Spring Operator
76ca08222e URL Cleanup (#50)
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).

# 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-04-01 11:35:24 -04:00
Spring Operator
f1beab8475 URL Cleanup (#41)
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 25 occurrences migrated to:  
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
2019-04-01 11:34:35 -04:00
Spring Operator
4230336ebc URL Cleanup (#38)
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 23 occurrences migrated to:  
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
2019-04-01 11:34:02 -04:00
Spring Operator
a35cf0b9a2 URL Cleanup (#34)
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).

# 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-04-01 11:33:33 -04:00
Marcin Grzejszczak
e3eaa72e25 Updated https 2019-03-29 15:16:31 +01:00
Spring Operator
5dee2ea031 URL Cleanup (#32)
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:33:46 -04:00
Marcin Grzejszczak
9538503b87 Hoxton 2019-03-07 18:17:09 +01:00
buildmaster
5b20e17b1e Bumping versions to 2.1.2.BUILD-SNAPSHOT after release 2019-03-05 17:34:29 +00:00
buildmaster
47f677d27c Going back to snapshots 2019-03-05 17:34:29 +00:00
buildmaster
15f7144a12 Update SNAPSHOT to 2.1.1.RELEASE 2019-03-05 17:33:19 +00:00
Tim Ysewyn
8c15fc073e Added the instance id to the DefaultServiceInstance (#28)
Should be merged after spring-cloud/spring-cloud-commons#419

NB: Maybe not the best implementation but Cloud Foundry doesn't have the notion of instance ids, only instance indexes.
2019-02-25 15:15:43 -05:00
Marcin Grzejszczak
004e83b1e8 Added checkstyle 2019-02-05 15:21:41 +01:00
buildmaster
c1772ba120 Bumping versions to 2.1.1.BUILD-SNAPSHOT after release 2019-01-22 18:22:09 +00:00
buildmaster
badefa5526 Going back to snapshots 2019-01-22 18:22:09 +00:00
buildmaster
ce0b7fd5ee Update SNAPSHOT to 2.1.0.RELEASE 2019-01-22 18:20:52 +00:00
buildmaster
88bc77ad8e Going back to snapshots 2018-12-11 21:50:21 +00:00
buildmaster
954fecd095 Update SNAPSHOT to 2.1.0.RC2 2018-12-11 21:49:42 +00:00
buildmaster
410fd654e0 Going back to snapshots 2018-12-11 16:36:29 +00:00
buildmaster
3e5c8ab0c2 Update SNAPSHOT to 2.1.0.RC1 2018-12-11 16:35:48 +00:00
buildmaster
9abdc8f322 Bumping versions to 2.0.2.BUILD-SNAPSHOT after release 2018-10-23 18:06:44 +00:00
buildmaster
6b7141861a Going back to snapshots 2018-10-23 18:06:43 +00:00
buildmaster
e7512818b5 Update SNAPSHOT to 2.0.1.RELEASE 2018-10-23 18:04:14 +00:00
Spencer Gibb
65474bf9b2 polish 2018-09-10 13:56:43 -04:00
Olga Maciaszek-Sharma
04ff3bba1a Add license notice and fix formatting. 2018-09-10 09:26:46 +02:00
Olga Maciaszek-Sharma
859d1a0a9e Switch to taking order from CloudFoundryDiscoveryProperties. 2018-09-07 15:50:48 +02:00
Olga Maciaszek-Sharma
1b5020144b Merge remote-tracking branch 'upstream/master' into gh-304-add-discovery-clients-order-support 2018-09-07 15:40:54 +02:00
Marcin Grzejszczak
74d3cfeec4 Bumping versions 2018-09-07 15:30:20 +02:00
Olga Maciaszek-Sharma
d836655b31 Merge remote-tracking branch 'upstream/master' into gh-304-add-discovery-clients-order-support 2018-09-07 13:53:39 +02:00
Spencer Gibb
571dc29f16 Bumps to 2.0.1.BUILD-SNAPSHOT 2018-06-19 13:12:14 -04:00
Ryan Baxter
f1e2460d8f Merge remote-tracking branch 'origin/1.1.x' 2018-06-11 09:55:36 -04:00
Ryan Baxter
ffa122a7ee adding spring boot autoconfigure processor 2018-06-11 09:54:59 -04:00
OlgaMaciaszek
8fb072505b Rename class. 2018-05-18 16:44:52 +02:00
OlgaMaciaszek
ef5f62133e Adjust changes to existing convention. 2018-05-18 15:52:53 +02:00
OlgaMaciaszek
52b1c75ffc Add default order to CloudFoundryDiscoveryClientConfig. 2018-05-18 14:30:16 +02:00
OlgaMaciaszek
dd007e233c Adjust CloudFoundryDiscoveryClient to DiscoveryClient ordering functionality
in spring-cloud-commons.
2018-05-18 14:23:11 +02:00
buildmaster
982f515408 Going back to snapshots 2018-04-20 20:31:41 +00:00
buildmaster
553ca1d7b0 Update SNAPSHOT to 2.0.0.RC1 2018-04-20 20:30:52 +00:00
Scott Frederick
510b6ebcfc Improve Cloud Foundry Java Client auto-configuration.
An organization and space are not required by all CF Java Client operations. Those properties should be optional to the client-autoconfiguration.

The CF target URL should default to the CF an application is running on when it is deployed to CF.
2018-04-09 17:11:33 -05:00
buildmaster
fa3922b641 Going back to snapshots 2018-02-09 22:51:06 +00:00
buildmaster
0a0678d7be Update SNAPSHOT to 2.0.0.M3 2018-02-09 22:50:25 +00:00
Spencer Gibb
89b5b3357b Update to new RibbonProperties location 2018-01-09 17:14:37 -05:00
Spencer Gibb
d275b72569 Add or update license headers 2018-01-09 15:21:52 -05:00