Merge pull request #410 from usdot-jpo-ode/bugfix/remove-json-file-text

update docker-compose
usdot-jpo-ode · Jan 13, 2021 · bfda0f6 · bfda0f6
2 parents a9976fd + 323de91
commit bfda0f6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,7 +17,7 @@ version: 2.1
 jobs:
  build:
  docker:
- - image: 'circleci/openjdk:8u252-jdk'
+ - image: 'circleci/openjdk:14.0.2-jdk-buster-node'
  steps:
  - checkout
  - run:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,7 +8,6 @@ services:
  - "2181:2181"
  logging:
  options:
- driver: "json-file"
  max-size: "10m"
  max-file: "5"
 
@@ -38,7 +37,6 @@ services:
  - ${DOCKER_SHARED_VOLUME_WINDOWS}/var/run/docker.sock:/var/run/docker.sock
  logging:
  options:
- driver: "json-file"
  max-size: "10m"
  max-file: "5"
 
@@ -68,7 +66,6 @@ services:
  - ${DOCKER_SHARED_VOLUME}:/jpo-ode
  logging:
  options:
- driver: "json-file"
  max-size: "10m"
  max-file: "5"
 
@@ -84,7 +81,6 @@ services:
  - ${DOCKER_SHARED_VOLUME}:/asn1_codec_share
  logging:
  options:
- driver: "json-file"
  max-size: "10m"
  max-file: "5"
 
@@ -100,7 +96,6 @@ services:
  - ${DOCKER_SHARED_VOLUME}:/asn1_codec_share
  logging:
  options:
- driver: "json-file"
  max-size: "10m"
  max-file: "5"
 
@@ -118,7 +113,6 @@ services:
  - kafka
  logging:
  options:
- driver: "json-file"
  max-size: "10m"
  max-file: "5"
 
@@ -136,7 +130,6 @@ services:
  - kafka
  logging:
  options:
- driver: "json-file"
  max-size: "10m"
  max-file: "5"
 
@@ -159,7 +152,6 @@ services:
  - kafka
  logging:
  options:
- driver: "json-file"
  max-size: "10m"
  max-file: "5"
 
@@ -182,7 +174,6 @@ services:
  - kafka
  logging:
  options:
- driver: "json-file"
  max-size: "10m"
  max-file: "5"
 
@@ -205,7 +196,6 @@ services:
  - kafka
  logging:
  options:
- driver: "json-file"
  max-size: "10m"
  max-file: "5"
 
@@ -228,7 +218,6 @@ services:
  - kafka
  logging:
  options:
- driver: "json-file"
  max-size: "10m"
  max-file: "5"
 
@@ -248,7 +237,6 @@ services:
  - ode
  logging:
  options:
- driver: "json-file"
  max-size: "10m" 
  max-file: "5"
 
@@ -261,6 +249,5 @@ services:
  SEC_CRYPTO_SERVICE_BASE_URI: ${SEC_CRYPTO_SERVICE_BASE_URI}
  logging:
  options:
- driver: "json-file"
  max-size: "10m" 
  max-file: "5"
diff --git a/jpo-ode-common/pom.xml b/jpo-ode-common/pom.xml
@@ -39,6 +39,11 @@
  <groupId>com.fasterxml.jackson.dataformat</groupId>
  <artifactId>jackson-dataformat-xml</artifactId>
  </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
  <dependency>
  <groupId>javax.websocket</groupId>
  <artifactId>javax.websocket-client-api</artifactId>

diff --git a/jpo-ode-svcs/pom.xml b/jpo-ode-svcs/pom.xml
@@ -38,6 +38,11 @@
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-data-rest</artifactId>
  </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-web</artifactId>