Merge pull request usdot-jpo-ode#364 from usdot-jpo-ode/dev

Merge issue#360 from dev to master
dan-du-car · Oct 30, 2019 · 540b79f · 540b79f
2 parents 5806eb1 + e68826b
commit 540b79f
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 46 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -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

diff --git a/docs/UserGuide.md b/docs/UserGuide.md
@@ -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

diff --git a/jpo-ode-common/pom.xml b/jpo-ode-common/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>usdot.jpo.ode</groupId>
  <artifactId>jpo-ode</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10-SNAPSHOT</version>
  </parent>
 
  <artifactId>jpo-ode-common</artifactId>

diff --git a/jpo-ode-core/pom.xml b/jpo-ode-core/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>usdot.jpo.ode</groupId>
  <artifactId>jpo-ode</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10-SNAPSHOT</version>
  </parent>
 
  <artifactId>jpo-ode-core</artifactId>
@@ -23,12 +23,12 @@
  <dependency>
  <groupId>usdot.jpo.ode</groupId>
  <artifactId>jpo-ode-common</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>usdot.jpo.ode</groupId>
  <artifactId>jpo-ode-plugins</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>org.apache.httpcomponents</groupId>

diff --git a/jpo-ode-plugins/pom.xml b/jpo-ode-plugins/pom.xml
@@ -11,7 +11,7 @@
  <parent>
  <groupId>usdot.jpo.ode</groupId>
  <artifactId>jpo-ode</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10-SNAPSHOT</version>
  </parent>
  <properties>
  <!-- SonarQube Properties -->
@@ -27,7 +27,7 @@
  <dependency>
  <groupId>usdot.jpo.ode</groupId>
  <artifactId>jpo-ode-common</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10-SNAPSHOT</version>
  </dependency>
  <!-- TODO open-ode
  <dependency>

diff --git a/jpo-ode-svcs/pom.xml b/jpo-ode-svcs/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>usdot.jpo.ode</groupId>
  <artifactId>jpo-ode</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10-SNAPSHOT</version>
  </parent>
  <artifactId>jpo-ode-svcs</artifactId>
  <packaging>jar</packaging>
@@ -84,12 +84,12 @@
  <dependency>
  <groupId>usdot.jpo.ode</groupId>
  <artifactId>jpo-ode-core</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>usdot.jpo.ode</groupId>
  <artifactId>jpo-ode-plugins</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>org.springframework</groupId>

diff --git a/pom.xml b/pom.xml
@@ -11,12 +11,12 @@
 
  <scm>
  <developerConnection>scm:git:https://github.com/usdot-jpo-ode/jpo-ode.git</developerConnection>
- <tag>jpo-ode-1.0.9</tag>
+ <tag>HEAD</tag>
  </scm>
 
  <groupId>usdot.jpo.ode</groupId>
  <artifactId>jpo-ode</artifactId>
- <version>1.0.9</version>
+ <version>1.0.10-SNAPSHOT</version>
  <packaging>pom</packaging>
  <modules>
  <module>jpo-ode-common</module>

diff --git a/release.properties b/release.properties
@@ -1,28 +1,28 @@
-#release configuration
-#Fri May 24 13:00:38 EDT 2019
-project.scm.usdot.jpo.ode\:jpo-ode-svcs.empty=true
-scm.commentPrefix=[maven-release-plugin] 
-project.rel.usdot.jpo.ode\:jpo-ode-core=0.0.8
-pushChanges=true
-project.scm.usdot.jpo.ode\:jpo-ode.developerConnection=scm\:git\:https\:https://github.com/usdot-jpo-ode/jpo-ode.git
-project.dev.usdot.jpo.ode\:jpo-ode=0.0.9-SNAPSHOT
-project.rel.usdot.jpo.ode\:jpo-ode-common=0.0.8
-scm.tag=jpo-ode-0.0.8
-remoteTagging=true
-project.scm.usdot.jpo.ode\:jpo-ode-plugins.empty=true
-projectVersionPolicyId=default
-project.scm.usdot.jpo.ode\:jpo-ode-core.empty=true
-scm.url=scm\:git\:https\:https://github.com/usdot-jpo-ode/jpo-ode.git
-scm.tagNameFormat=@{project.artifactId}-@{project.version}
-project.dev.usdot.jpo.ode\:jpo-ode-svcs=0.0.9-SNAPSHOT
-preparationGoals=clean verify
-project.scm.usdot.jpo.ode\:jpo-ode.tag=HEAD
-project.dev.usdot.jpo.ode\:jpo-ode-plugins=0.0.9-SNAPSHOT
-project.dev.usdot.jpo.ode\:jpo-ode-core=0.0.9-SNAPSHOT
-exec.snapshotReleasePluginAllowed=false
-project.scm.usdot.jpo.ode\:jpo-ode-common.empty=true
-project.dev.usdot.jpo.ode\:jpo-ode-common=0.0.9-SNAPSHOT
-project.rel.usdot.jpo.ode\:jpo-ode=0.0.8
-project.rel.usdot.jpo.ode\:jpo-ode-svcs=0.0.8
-completedPhase=end-release
-project.rel.usdot.jpo.ode\:jpo-ode-plugins=0.0.8
+#release configuration
+#Mon Aug 19 15:45:10 MDT 2019
+project.scm.usdot.jpo.ode\:jpo-ode-svcs.empty=true
+scm.commentPrefix=[maven-release-plugin] 
+project.rel.usdot.jpo.ode\:jpo-ode-core=1.0.9
+pushChanges=true
+project.scm.usdot.jpo.ode\:jpo-ode.developerConnection=scm\:git\:https\:https://github.com/usdot-jpo-ode/jpo-ode.git
+project.dev.usdot.jpo.ode\:jpo-ode=1.0.10-SNAPSHOT
+project.rel.usdot.jpo.ode\:jpo-ode-common=1.0.9
+scm.tag=jpo-ode-1.0.9
+remoteTagging=true
+project.scm.usdot.jpo.ode\:jpo-ode-plugins.empty=true
+projectVersionPolicyId=default
+project.scm.usdot.jpo.ode\:jpo-ode-core.empty=true
+scm.url=scm\:git\:https\:https://github.com/usdot-jpo-ode/jpo-ode.git
+scm.tagNameFormat=@{project.artifactId}-@{project.version}
+project.dev.usdot.jpo.ode\:jpo-ode-svcs=1.0.10-SNAPSHOT
+preparationGoals=clean verify
+project.scm.usdot.jpo.ode\:jpo-ode.tag=HEAD
+project.dev.usdot.jpo.ode\:jpo-ode-plugins=1.0.10-SNAPSHOT
+project.dev.usdot.jpo.ode\:jpo-ode-core=1.0.10-SNAPSHOT
+exec.snapshotReleasePluginAllowed=false
+project.scm.usdot.jpo.ode\:jpo-ode-common.empty=true
+project.dev.usdot.jpo.ode\:jpo-ode-common=1.0.10-SNAPSHOT
+project.rel.usdot.jpo.ode\:jpo-ode=1.0.9
+project.rel.usdot.jpo.ode\:jpo-ode-svcs=1.0.9
+completedPhase=end-release
+project.rel.usdot.jpo.ode\:jpo-ode-plugins=1.0.9
diff --git a/sample.env b/sample.env
@@ -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=