Commit Graph

246 Commits

Author SHA1 Message Date
Dave Syer
2e0dda930d Make sure dataflow server uses h2 launched by spring cloud
If user runs `spring cloud dataflow h2` you'd expect the database to
be used by dataflow. It's tricky to achieve, and impossible with
an in-memory data store (because of the way dataflow is set up
currently). This was achieved by adding a feature: each deployable
can specify "enabled" (in addition to existing "disabled" feature)
properties: i.e. environemnt properties that are applied to all
other apps as long as this one is running.

Another change here is to pass the "PATH" env var from the deployer
down to deployed apps. This affects dataflow in particular because
it likes to launch other apps, and it will pick the wrong Java
version (for instance) if the path is not preserved.
2016-10-06 09:36:38 +02:00
Dave Syer
2ba29cea25 Use smaller memory for dataflow apps by default
(Requires a change in spring-cloud-deployer)
2016-10-06 09:36:38 +02:00
Spencer Gibb
c9ffd381ea Validate items to run are valid.
fixes gh-40
2016-10-04 19:37:58 -06:00
Spencer Gibb
2d924f9359 Push deployer and dataflow dep mgmt down.
Dataflow pom was bringing in old stream, which broke s-c-bus-kafka.

fixes gh-39
2016-10-03 17:01:29 -06:00
Spencer Gibb
33ca198cca Add spring cloud --version option
fixes gh-33
2016-10-03 15:12:17 -06:00
Spencer Gibb
44a5adbf6f Downgrade dataflow bits to 1.0.1 2016-10-03 13:54:34 -06:00
Spencer Gibb
e3f0a66f4d Add spring-cloud-config-monitor to configserver
fixes gh-36
2016-10-03 13:27:36 -06:00
Dave Syer
eb1896e509 Update to latest dataflow bits 2016-10-03 15:01:44 +01:00
Spencer Gibb
f2fc5c8a67 Upgrade to dataflow 1.0.1
fixes gh-32
2016-09-26 16:12:57 -06:00
Spencer Gibb
28407c9255 remove install 2016-09-26 16:08:57 -06:00
Spencer Gibb
6dbd550405 bump s-c-build version 2016-09-26 16:08:47 -06:00
Spencer Gibb
5c8c99af7e Revert "Update SNAPSHOT to 1.2.0.RC1"
This reverts commit 110fa69b975377a1c478faa10fb4f7266a24f8e4.
2016-09-26 16:06:21 -06:00
Spencer Gibb
c2c96700db Update SNAPSHOT to 1.2.0.RC1 2016-09-26 15:51:32 -06:00
Spencer Gibb
b486928aab Update install instructions 2016-09-26 15:29:12 -06:00
Dave Syer
7428de1176 Merge remote-tracking branch 'origin/1.1.x' 2016-09-21 12:49:24 +01:00
Dave Syer
27b759ee38 Revert to snapshots 2016-09-21 12:48:05 +01:00
Dave Syer
fd87508361 Update for Brixton.RC6 (1.1.6) 2016-09-21 12:45:19 +01:00
Spencer Gibb
64dc1c0f85 add default maven remote-repositories 2016-09-20 09:44:31 -06:00
Dave Syer
d6054aec0d Ensure version is scraped from parent pom 2016-09-20 13:48:13 +01:00
Spencer Gibb
8d17221c0a add spring-security-crypto 2016-09-19 15:14:12 -06:00
Spencer Gibb
618a713a60 add config props for maven 2016-09-19 15:03:56 -06:00
Spencer Gibb
604e05838c Added reference for ~/.spring-cloud config location 2016-09-19 13:11:10 -06:00
Marcin Grzejszczak
6d7e85df1b Updating mvnw for all projects 2016-09-19 19:29:45 +02:00
Marcin Grzejszczak
ecd2d3164e Updating mvnw for all projects 2016-09-19 19:29:38 +02:00
Marcin Grzejszczak
91d579ca48 Updating mvnw for all projects 2016-09-19 14:16:47 +02:00
Marcin Grzejszczak
8b45604eee Updating mvnw for all projects 2016-09-19 14:16:38 +02:00
Marcin Grzejszczak
f388884573 Updating mvnw for all projects 2016-09-19 12:44:20 +02:00
Marcin Grzejszczak
051fdf4c15 Updating mvnw for all projects 2016-09-19 12:44:13 +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
Marcin Grzejszczak
31101b0959 Updating mvnw for all projects 2016-09-15 16:09:55 +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
a47e9b4014 Removed adoc footer 2016-09-07 17:59:12 +02: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
Marcin Grzejszczak
7eea8ffb61 Updating mvnw for all projects 2016-09-07 17:26:12 +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