Commit Graph

217 Commits

Author SHA1 Message Date
Marcin Grzejszczak
91d579ca48 Updating mvnw for all projects 2016-09-19 14:16:47 +02:00
Marcin Grzejszczak
f388884573 Updating mvnw for all projects 2016-09-19 12:44:20 +02:00
Spencer Gibb
045b88f7c3 Look for launched server config files in ~/.spring-cloud/
Also moved some debug to trace

fixes gh-31
2016-09-15 12:48:21 -06:00
Marcin Grzejszczak
0cd6911484 Updating mvnw for all projects 2016-09-15 16:10:23 +02:00
Spencer Gibb
af4e68719f Add javaOptions to Deployable.
Example command:
```
spring cloud -d configserver -- --logging.level.org.springframework.cloud.launcher.deployer=DEBUG --spring.cloud.launcher.deployables.configserver.java-options=-Dmy.system.prop=myval,-Dmy.system.prop2=yourval
```

fixes gh-18
2016-09-12 15:20:48 -06:00
Spencer Gibb
2dc5b47ac4 unignore tests 2016-09-12 15:19:58 -06:00
Marcin Grzejszczak
3d2bb7100f Removed adoc footer 2016-09-07 17:57:00 +02:00
Marcin Grzejszczak
0284a7a357 Updating mvnw for all projects 2016-09-07 17:26:26 +02:00
Dave Syer
0bf665e285 Unignore rabbit test 2016-09-07 10:10:17 +01:00
Dave Syer
ef0cbe904c Fix version of aether to same as Spring Boot CLI
Aether 1.1.0 is coming in from spring-cloud-contract, and it breaks
the classpath badly for CLI apps (pulling in loads of optional
dependencies). Fixing to the same version as Spring Boot works.
2016-09-06 18:34:59 +01:00
Spencer Gibb
38ad82a36d Ignore tests 2016-09-02 16:42:38 -06:00
Spencer Gibb
2d3e24b059 Change from Brixton to Camden 2016-09-02 16:42:32 -06:00
Spencer Gibb
621ee6e4b9 Ignoring LauncherCommandTests.
Similar tests exist in DeployerThreadTests.

See gh-27
2016-09-02 14:09:20 -06:00
Spencer Gibb
db389fc83b Revert "Ignore broken tests until fixed"
This reverts commit 1b5c04a0aec37fb3ecb4910764982eb0f168887f.
2016-08-29 15:34:09 -06:00
Spencer Gibb
94f575a8ad Ignore broken tests until fixed
see gh-27
2016-08-29 15:11:41 -06:00
Dave Syer
1ef1aa7da5 Merge branch '1.1.x' 2016-08-25 21:53:32 +01:00
Dave Syer
06548d06ca Add --keypass option to CLI
Up to now we only supported the default key pass (the same as the
store password). This change adds a new option to "encrypt" and
"decrypt" commands.

Fixes gh-26
2016-08-25 21:50:24 +01:00
Dave Syer
598e79d1f5 Revert to snapshots 2016-08-23 09:16:41 +01:00
Dave Syer
c35531c8e0 Update for 1.1.5 (Brixton.SR5) 2016-08-23 09:13:36 +01:00
Marcin Grzejszczak
cffb7d8528 Updating ghpages for all projects 2016-08-22 13:30:49 +02:00
Marcin Grzejszczak
618026d58b Updating ghpages for all projects 2016-08-22 13:30:41 +02:00
Marcin Grzejszczak
0c80a3a7d9 Updating ghpages for all projects 2016-08-19 11:44:33 +02:00
Marcin Grzejszczak
d836b52f34 Updating ghpages for all projects 2016-08-19 11:44:24 +02:00
Marcin Grzejszczak
6ac6057d7e Updating ghpages for all projects 2016-08-18 13:08:46 +02:00
Marcin Grzejszczak
8ec8a3e27d Updating ghpages for all projects 2016-08-18 13:08:38 +02:00
Dave Syer
59d18f9a5c Change repo URLs to https 2016-08-17 17:31:21 +01:00
Marcin Grzejszczak
753e05b6fd Updating ghpages for all projects 2016-08-17 12:42:51 +02:00
Marcin Grzejszczak
9c2f04dc69 Updating ghpages for all projects 2016-08-17 12:42:40 +02:00
Spencer Gibb
1927a8a8f7 polish 2016-08-16 12:10:30 -06:00
Marcin Grzejszczak
71b7747d58 Added missing whitelisted branch 2016-08-16 15:44:08 +02:00
Marcin Grzejszczak
945c20ccbc 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:43:46 +02:00
Marcin Grzejszczak
533be6dedf 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:41:50 +02:00
Dave Syer
68c9614be5 Add 'disabled' properties to deployable 2016-08-16 14:21:39 +01:00
Dave Syer
f26bdea6d9 Use map for deployables, not array (key is the name) 2016-08-16 14:09:57 +01:00
Dave Syer
9c443a1c04 Add non-option arguments after "--" to deployer command line
This allows user to play nice tricks with the deployer configuration (e.g.
changing the spring profile).

Fixes gh-25
2016-08-16 13:46:42 +01:00
Dave Syer
15a2a83fb0 Determine deployable app version dynamically
The deployer now checks its own version and uses that to set
up the app versions via "launcher.version" on the command line.

Closes gh-16
2016-08-15 17:05:58 +01:00
Dave Syer
7b6d0d65f1 Expunge grocer 2016-08-15 16:56:30 +01:00
Dave Syer
34418d8d3d Tidy imports 2016-08-15 16:49:13 +01:00
Dave Syer
9d44ed2631 Document the new local config YAML features
Also remove --git-url command line flag (since you can
put it in configserver.yml now).
2016-08-15 16:46:46 +01:00
Dave Syer
072cb9de21 File path starts with ./ 2016-08-15 15:44:12 +01:00
Dave Syer
656a1bd75d Ensure config files have / prefixes 2016-08-15 15:42:54 +01:00
Dave Syer
1a28da5d83 Load application properties from <name>.yml
(also try config/<name>.yml). In this way user can easily launch config
server with custom uri, h2 with custom tcp endpoints, etc. The local
app deployer puts these properties in sys env vars (a bit yuck), but
that's not in our control here.
2016-08-15 15:34:52 +01:00
Dave Syer
0ca734895c Update travis secrets 2016-08-15 13:55:21 +01:00
Dave Syer
bad74d9447 Remove spring-boot-test from dependencies
It adds too much stuff to the application classpath so the groovy
classloader cannot load spring-boot classes properly from the
"grabbed" classpath.
2016-08-15 13:39:01 +01:00
Dave Syer
1473ebd353 Push spring-boot.version property up to top level 2016-08-15 13:32:52 +01:00
Dave Syer
4c5c4b90a0 Fix dependencies
Need to use "provided" scope for stuff that is not required in the
/ext classpath. Also need to use a proper BOM for stream
dependencies to avoid mouldy versions being imported.
2016-08-15 10:43:32 +01:00
Spencer Gibb
569508ef02 comments 2016-08-11 16:27:34 -06:00
Spencer Gibb
cf7f060cd1 polish 2016-08-11 16:23:16 -06:00
Spencer Gibb
7f713e0d59 Add git.uri option.
spring cloud --git-uri=http://mygit/myrepo.git configserver

Above command option changes configserver to use the git profile with the configured git url.

fixes gh-24
2016-08-11 16:17:31 -06:00
Spencer Gibb
a0598c12f5 Remove duplicate LauncherCommand reference
fixes gh-23
2016-08-11 15:07:28 -06:00