Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SDW Depositor Updates #363

Merged
merged 13 commits into from
Oct 30, 2019
Merged

SDW Depositor Updates #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0e0c718
Merge pull request #336 from usdot-jpo-ode/master
hmusavi Apr 15, 2019
665bb2d
merged 0.0.8 to 'stage'
Schwartz-Matthew-bah May 24, 2019
4c2afac
Merge pull request #353 from usdot-jpo-ode/stage
mvs5465 May 24, 2019
e65a8c2
Merge pull request #1 from usdot-jpo-ode/master
payneBrandon Jul 31, 2019
d3c6000
merged 1.0.9 to 'stage'
payneBrandon Aug 19, 2019
3b9117f
Merge pull request #358 from usdot-jpo-ode/stage
bbrotsos Sep 5, 2019
c61753b
Update .travis.yml
snallamothu Sep 11, 2019
cdaaa34
Merge pull request #361 from usdot-jpo-ode/hotfix/issue-359
snallamothu Sep 11, 2019
5806eb1
Merge pull request #362 from usdot-jpo-ode/stage
snallamothu Sep 11, 2019
3d733bf
Merge branch 'master' of https://github.com/usdot-jpo-ode/jpo-ode
payneBrandon Sep 19, 2019
ae84320
SDX update
payneBrandon Sep 25, 2019
af12ce5
Swapping submodule back to ODE url
payneBrandon Oct 28, 2019
3b68c48
Merge pull request #4 from Trihydro/sdx-update
trevor-trou Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
language: java

dist: trusty

jdk: oraclejdk8

sudo: false
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ services:
#SDW_KAFKA_PORT: ${SDW_KAFKA_PORT}
#SDW_SUBSCRIPTION_TOPICS: ${SDW_SUBSCRIPTION_TOPICS}
#SDW_DESTINATION_URL: ${SDW_DESTINATION_URL}
SDW_USERNAME: ${SDW_USERNAME}
SDW_PASSWORD: ${SDW_PASSWORD}
SDW_API_KEY: ${SDW_API_KEY}
depends_on:
- kafka
- zookeeper
Expand Down
3 changes: 1 addition & 2 deletions docs/UserGuide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,8 +821,7 @@ ode.depositSdwMessagesOverWebsocket=false
3. Set the following environment variables in the _.env_ file:

```bash
SDW_USERNAME=myUsername
SDW_PASSWORD=myPassword
SDW_API_KEY=myApiKey
```

4. Follow the rest of the ODE setup steps. The SDW depositor service
Expand Down
5 changes: 2 additions & 3 deletions sample.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,8 @@ RDE_TIM_TOPIC=topic.FilteredOdeTimJson
# The first pair is used for the SDW depositor submodule
# The second pair is used for the built-in DDS depositor

## Required if using SDW depositor module (REST interface)
SDW_USERNAME=
SDW_PASSWORD=
## Required if using SDX depositor module (REST interface)
SDW_API_KEY=

## Optional overrides
#SDW_DESTINATION_URL=
Expand Down