Commit Graph

294 Commits

Author SHA1 Message Date
Dave Syer
4afa7488cf Ensure version is scraped from parent pom 2016-09-20 13:48:13 +01:00
Marcin Grzejszczak
78b7a65e56 Updating mvnw for all projects 2016-09-19 19:30:22 +02:00
Spencer Gibb
0b61f4e089 Add spring-security-rsa back to dependencies.
With exclusion of spring-security-crypto and spring-core
2016-09-19 10:04:53 -06:00
Marcin Grzejszczak
01d7145036 Updating mvnw for all projects 2016-09-19 14:17:17 +02:00
Dave Syer
845cce0b0b Rationalize dependency management in BOMs 2016-09-19 12:02:03 +01:00
Marcin Grzejszczak
60653a6b6c Updating mvnw for all projects 2016-09-19 12:45:35 +02:00
Dave Syer
d4fd2b7aa5 Extract logging system shutdown into a separate listener
LoggingSystemShutdownListener runs immediately after
BootstrapApplicationListener and contains the code which used to be
in that to clean up the logging system (and make it go dark). That
is still a little bit of a hack to work around some limitations in
the static logging libraries (via the Spring Boot Logging System
and LoggingApplicationListener).

If the LoggingApplicationListener is then *not* applied in the
ContextRefresher, then we don't need the LoggingSystemShutdownListener
either. In fact we can narrow down the ContextRefresher to be only
interested in the listeners that affect the Environment (of which
we know of only 2). It means that any listeners that are added that
affect the Environment will not be applied, but there are plenty of
more "official" channels for modifying the Environment
(EnvironmentPostProcessor and PropertySourceLocator), so users can
easily migrate to a better implementation.
2016-09-16 13:44:48 +01:00
Dave Syer
68c7fcf7d8 Apply correct ordering in logging system on startup
Completes the work started in 7f687b1, where the call to
LoggingSystem.beforeInitialization() was ommitted which results
in JUL logging never being available in the application.

Partial fix for #131 (but a /refresh is still broken)
2016-09-16 12:11:15 +01:00
Dave Syer
30a7bb9a70 Update spring-security-rsa to latest 1.0.3 2016-09-16 12:10:44 +01:00
Marcin Grzejszczak
2b0a5e9dc7 Updating mvnw for all projects 2016-09-15 16:10:58 +02:00
Spencer Gibb
e13764db66 Fixes indexed properties merging problem.
Given the following in one property source
```
mine[0].someValue=Foo
mine[0].someKey={cipher}XXXX
mine[1].someValue=Bar
mine[1].someKey={cipher}XXXX
yours[0].anotherKey=Baz
```
only `mine[*].someKey` were added to "decrypted" property source. Due to house spring boot manages indexed properties, they can not be merged across property source. This change includes all indexed properties in the "decrypted" property source if any one of them is encrypted.

In the above example, `yours[*].*` is included even though unrelated.

fixes gh-466
2016-09-09 14:23:19 -06:00
Spencer Gibb
23d3a2ec3d Guard NPE in HeartbeatMonitor
fixes gh-129
2016-09-09 11:40:13 -06:00
Marcin Grzejszczak
3cfda6b31d Removed adoc footer 2016-09-07 17:59:41 +02:00
Marcin Grzejszczak
72be22f3f8 Updating mvnw for all projects 2016-09-07 17:27:23 +02:00
Dave Syer
cff67e0a12 Revert to snapshots 2016-09-06 14:53:36 +01:00
Dave Syer
00a2f23c00 Update to 1.1.2 2016-09-06 14:36:20 +01:00
Dave Syer
7f687b10e3 Adjust the logging lifecycle during bootstrap
Anticipating a change in Spring Boot 1.4.1 to support child context
creation without (needless) re-initialization of the logging system,
we need to carefully manage the lifecycle, in particular calling
cleanUp() when we know there are changes in the pipeline.

Fixes gh-125
2016-08-25 18:04:14 +01:00
Marcin Grzejszczak
cecac1125e Updating ghpages for all projects 2016-08-22 13:31:15 +02:00
Marcin Grzejszczak
4e0a70e4a8 Updating ghpages for all projects 2016-08-19 11:45:09 +02:00
Spencer Gibb
2da3fed95d Merge pull request #120 from ebjwc/gh-114
* ebjwc-gh-114:
  Add new properties to customize InetUtils.
2016-08-18 12:07:24 -06:00
Tomasz Juchniewicz
e6ccb824a6 Add new properties to customize InetUtils.
Added useOnlySiteLocalInterfaces and preferredNetworks properties to
InetUtils. The preferredNetworks property allows for a whitelist of
networks. The useOnlySiteLocalInterfaces allows InetAddresses where
isSiteLocalAddress is true.

Fixes gh-114
2016-08-18 12:04:46 -06:00
Marcin Grzejszczak
6fc4e60c83 Updating ghpages for all projects 2016-08-18 13:09:13 +02:00
Matt Benson
8281c829e2 correct GenericScope#setName() Javadoc (#124) 2016-08-17 13:26:00 -04:00
Dave Syer
6b957042e4 Change repo URLs to https 2016-08-17 17:31:22 +01:00
Marcin Grzejszczak
78c90d7db3 Updating ghpages for all projects 2016-08-17 12:43:37 +02:00
Marcin Grzejszczak
67bea29be5 Deploying documentation to proper folder
What we're missing ATM is different documentation versions for different application versions. What this change does is that it's:

- finding out what is the current branch (e.g. 1.0.x)
- finding out out what is the name of the main adoc file (e.g. spring-cloud-sleuth)
- pulling the changes from gh-pages after checkout
- finding out what is the list of comma separated whitelisted branches (via the `docs.whitelisted.branches` prop)
- in gh-pages creating a folder with name of the branch  (e.g. /1.0.x)
copying all the docs/target/generated-docs/ to that folder
- if the branch from which we're calling the script is NOT master then we're changing the ${main.adoc}.html to index.html so that it's easier to access the docs (e.g. http://cloud.spring.io/spring-cloud-sleuth/1.0.x/)
2016-08-16 15:55:41 +02:00
Dave Syer
3157a5c585 Update README with new CLA link 2016-07-11 14:35:09 +01:00
Dave Syer
a0287e5961 Update README 2016-06-11 10:50:32 +01:00
Dave Syer
8280e2463d Update readme script to handle local includes 2016-06-11 09:54:41 +01:00
Spencer Gibb
945f430efe Update to SNAPSHOT 2016-06-06 17:01:58 -06:00
Spencer Gibb
aaff352781 Update SNAPSHOT to 1.1.1.RELEASE 2016-06-06 16:31:03 -06:00
Spencer Gibb
ddfd8aa0e0 Polish versions in spring-cloud-commons-dependencies 2016-06-06 15:44:33 -06:00
Dave Syer
ff59dc8a42 Deprecate static methods in InetUtils 2016-06-06 15:58:34 +01:00
Dave Syer
7399045706 Update tp mvn 3.3.9 2016-06-04 09:14:03 +01:00
Dave Syer
cec4bbff0d Tone down logging for unknown host in discovery client
Fixes gh-112
2016-06-03 12:08:48 +01:00
Dave Syer
ee56f22b20 Add comment about shutdown errors in context.close() 2016-06-01 12:06:28 +01:00
Dave Syer
d80f6510cb Re-instate .settings.xml for Travis 2016-05-12 11:34:23 +01:00
Dave Syer
f7ddaa0b00 Update README and remove .settings.xml where appropriate 2016-05-12 10:47:36 +01:00
Dave Syer
d3915aad82 Update build parents to 1.1.2 snapshots 2016-05-10 09:16:12 +01:00
Dave Syer
01edfbf7f6 Revert to snapshots 2016-05-09 10:33:44 +01:00
Dave Syer
90c8a81611 Update for 1.1.0.RELEASE 2016-05-09 10:26:47 +01:00
Dave Syer
056db35780 Add explicit release disabled flag for artifactory for plugins 2016-05-06 18:09:41 +01:00
Dave Syer
45db3c18e7 Add explicit release disabled flag for artifactory in dependencies 2016-05-06 17:58:44 +01:00
Dave Syer
bf4305c05a Add explicit release disabled flag for artifactory 2016-05-06 17:47:14 +01:00
Dave Syer
0b654c22ab Switch parent of docs poms 2016-05-06 17:40:09 +01:00
Dave Syer
9aa4ad97be Update parent to 1.1.0.RELEASE 2016-05-06 17:13:33 +01:00
Dave Syer
31a2b3ea0e Make some tests more robust so they pass with BOot 1.4 as well
A couple of tests here make assumptions about the property source
names added using @IntegrationTest. If we are a bit more defensive
and search for a source with a matching name instead of grabbing
one by the precise name, we can have tests that pass in Boot 1.3
and 1.4.
2016-05-05 14:05:46 +01:00
Dave Syer
6f3cb2f132 Remove usage of deprecated code 2016-05-05 12:37:46 +01:00
Spencer Gibb
8c9317bd7e Merge pull request #110 from cfritz0127/cleaner-shutdown-on-deregistration-error
* cleaner-shutdown-on-deregistration-error:
  Catch and log exceptions that occur when attempting to deregister a service during shutdown.
2016-05-04 14:38:49 -06:00
Corey Fritz
0533eef471 Catch and log exceptions that occur when attempting to deregister a service during shutdown.
Currently, if an exception is thrown when deregistering the service (maybe the registry is not available) the latch used by the DefaultLifecycleProcessor is not decremented and you have to wait for the latch timeout (30 seconds) for shutdown to complete. With this fix, the exception is logged and normal shutdown execution continues.
2016-05-04 14:35:54 -06:00