Merge "Add all required and reasonable MDCs"
authorPiotr Wielebski <piotr.wielebski@nokia.com>
Fri, 14 Dec 2018 08:38:03 +0000 (08:38 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 14 Dec 2018 08:38:03 +0000 (08:38 +0000)
1  2 
development/docker-compose.yml
pom.xml

@@@ -78,7 -78,7 +78,7 @@@ services
        start_period: 20s
      depends_on:
      - message-router-kafka
 -    - consul-server
 +    - consul-config
      volumes:
      - ./ssl/:/etc/ves-hv/
  
@@@ -94,6 -94,7 +94,7 @@@
      command: ["--listen-port", "6062",
                "--ves-host", "ves-hv-collector",
                "--ves-port", "6061",
+               "--key-store", "/etc/ves-hv/client.p12",
                "--key-store-password", "onaponap",
                "--trust-store-password", "onaponap"]
      depends_on:
diff --combined pom.xml
+++ b/pom.xml
@@@ -49,7 -49,7 +49,7 @@@
      </modules>
  
      <properties>
-         <kotlin.version>1.3.0</kotlin.version>
+         <kotlin.version>1.3.11</kotlin.version>
          <arrow.version>0.8.0</arrow.version>
          <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
          <build-helper-maven-plugin.version>1.7</build-helper-maven-plugin.version>
              </dependency>
              <dependency>
                  <groupId>io.micrometer</groupId>
 -                <artifactId>micrometer-registry-jmx</artifactId>
 -                <version>1.0.5</version>
 +                <artifactId>micrometer-registry-prometheus</artifactId>
 +                <version>1.0.8</version>
              </dependency>
  
              <!-- Test dependencies -->