Commit Graph

60 Commits

Author SHA1 Message Date
Janne Valkealahti
5ecd36b64d Upgrade to Spring Data Flow 1.1.2 (#54)
- Remove workaround from DataFlowApplication as dataflow
  server impls now work as plain main class having just
  @EnableDataFlowServer and @SpringBootApplication.

Fixes gh-53
2017-01-20 14:35:02 -05:00
Tommy Ludwig
229a1d9de1 Polish spring-cloud-launcher README (#45)
Use relative links, add mention of dataflow, fix example that mentions dataflow but had other applications in the code.
2016-11-28 14:44:43 -05:00
Spencer Gibb
c66f05dd3a Update to SNAPSHOT 2016-11-01 16:06:04 -06:00
Spencer Gibb
f240db174f Update SNAPSHOT to 1.2.2.RELEASE 2016-11-01 15:06:42 -06:00
Dave Syer
38866a1879 Revert to snapshots 2016-10-18 19:16:06 +01:00
Dave Syer
b83a8321d0 Update to 1.2.1.RELEASE (Camden.SR1) 2016-10-18 18:41:53 +01:00
Dave Syer
5d6eb0828d Add back the monitor for snapshots 2016-10-17 14:40:09 +01:00
Dave Syer
dc78a0c22b Settle back to dataflow 1.0.1 2016-10-14 09:10:28 +01:00
Spencer Gibb
4a49831ce9 Update to SNAPSHOT 2016-10-13 15:17:06 -06:00
Spencer Gibb
f4211e9236 Update SNAPSHOT to 1.2.0.RELEASE 2016-10-13 14:34:25 -06:00
Spencer Gibb
01e16a7235 Roll back to s-c-dataflow 1.0.1 2016-10-13 12:29:21 -06:00
Dave Syer
0969e488ce Reduce default memory consumption (-Xmx128m) 2016-10-13 14:46:33 +01:00
Dave Syer
cf0fe6c856 Remove unnecessary @SupressWarnings 2016-10-13 14:46:33 +01:00
Dave Syer
af43a16c91 Align default h2 URL with other launcher projects 2016-10-13 14:46:33 +01:00
Dave Syer
5facdb5e55 Remove config server monitor for this release
A bug in spring-cloud-config makes the generetaed jar blow up
if it is using the default classpath:/launcher/ location for
config files. We can fix that in 1.2.1.
2016-10-13 14:46:33 +01:00
Dave Syer
16a9c6890f Workaround for file system issues with Boot 1.4 2016-10-13 11:03:35 +01:00
Dave Syer
3ea5efa862 DeployerThread refactored to extract meat into a Deployer utility
The utility can then be added to the application context, and only one
lookup is needed. Also switchews on autoconfiguration in the deployer
app, since the deployer implementations support that now.
2016-10-07 17:21:35 +02:00
Dave Syer
b949e390f2 Add generic deployment properties to deployer apps
Instead of JAVA_OPTS (didn't like the name anyway), user can define
generic "properties" in each deployable that will be passed down
to the app request.

The current 1.0 snapshots of the local deployer look in there for
JAVA_OPTS (but that hopefully will change to something more
"property like") before 1.0.3 is released.
2016-10-06 11:34:10 +02:00
Dave Syer
8587791549 Remove . from default classpath for cli launcher
Since "." is already on the search path for config files, it is
not obviously necessary to add "." to the classpath as well.
2016-10-06 10:45:03 +02:00
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
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
64dc1c0f85 add default maven remote-repositories 2016-09-20 09:44:31 -06:00
Spencer Gibb
618a713a60 add config props for maven 2016-09-19 15:03:56 -06: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
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
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
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
Spencer Gibb
1927a8a8f7 polish 2016-08-16 12:10:30 -06: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