Merge pull request #363 from bsinno/feature/update-dependencies

Update various dependencies
eclipse-ditto · Mar 27, 2019 · 0484be6
2 parents ce5af1b + 96d8010
commit 0484be6
Show file tree

Hide file tree

Showing 23 changed files with 699 additions and 452 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -25,19 +25,19 @@
 
     <properties>
         <scala.version>2.12</scala.version> <!-- for scala libraries the scala version is used in their artifactId -->
-        <scala.full.version>2.12.6</scala.full.version>
+        <scala.full.version>2.12.8</scala.full.version>
 
         <javac.source>1.8</javac.source>
         <javac.target>1.8</javac.target>
 
         <!-- ### Compile dependencies versions -->
         <minimal-json.version>0.9.5</minimal-json.version>
         <typesafe-config.version>1.3.3</typesafe-config.version>
-        <ssl-config-core.version>0.2.4</ssl-config-core.version>
-        <akka.version>2.5.17</akka.version>
-        <akka-http.version>10.1.5</akka-http.version>
+        <ssl-config-core.version>0.3.7</ssl-config-core.version>
+        <akka.version>2.5.21</akka.version>
+        <akka-http.version>10.1.7</akka-http.version>
         <akka-persistence-mongo.version>2.2.4</akka-persistence-mongo.version>
-        <akka-management.version>0.14.0</akka-management.version>
+        <akka-management.version>1.0.0</akka-management.version>
         <simple-akka-downing.version>0.9.2</simple-akka-downing.version>
         <alpakka-mqtt.version>0.20</alpakka-mqtt.version>
         <akka-stream-kafka.version>1.0.1</akka-stream-kafka.version>
@@ -49,11 +49,11 @@
         <parboiled.version>2.1.4</parboiled.version>
         <jjwt.version>0.10.1</jjwt.version>
         <asm.version>5.2</asm.version>
-        <qpid-jms-client.version>0.39.0</qpid-jms-client.version>
+        <qpid-jms-client.version>0.40.0</qpid-jms-client.version>
         <newmotion-akka-rabbitmq.version>5.0.0</newmotion-akka-rabbitmq.version>
         <amqp-client.version>5.4.2</amqp-client.version>
         <reactive-streams.version>1.0.2</reactive-streams.version>
-        <netty.version>4.1.27.Final</netty.version>
+        <netty.version>4.1.32.Final</netty.version>
 
         <slf4j.version>1.7.25</slf4j.version>
         <logback.version>1.2.3</logback.version>
@@ -167,6 +167,11 @@
                 <artifactId>akka-stream_${scala.version}</artifactId>
                 <version>${akka.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.typesafe.akka</groupId>
+                <artifactId>akka-discovery_${scala.version}</artifactId>
+                <version>${akka.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.typesafe.akka</groupId>
@@ -255,12 +260,12 @@
             </dependency>
             <dependency>
                 <groupId>com.lightbend.akka.discovery</groupId>
-                <artifactId>akka-discovery-dns_${scala.version}</artifactId>
+                <artifactId>akka-discovery-kubernetes-api_${scala.version}</artifactId>
                 <version>${akka-management.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.lightbend.akka.discovery</groupId>
-                <artifactId>akka-discovery-kubernetes-api_${scala.version}</artifactId>
+                <groupId>com.lightbend.akka.management</groupId>
+                <artifactId>akka-management-cluster-http_${scala.version}</artifactId>
                 <version>${akka-management.version}</version>
             </dependency>
 

diff --git a/deployment/kubernetes/ditto/ditto-cluster.yaml b/deployment/kubernetes/ditto/ditto-cluster.yaml
@@ -20,20 +20,22 @@ spec:
         command: ["java"]
         args: ["-jar", "/opt/ditto/starter.jar"]
         ports:
-        - name: akka-remoting
+        - name: remoting
           containerPort: 2551
           protocol: TCP
-        - name: akka-mgmt-http
+        - name: management
           containerPort: 8558
           protocol: TCP
         readinessProbe:
-          tcpSocket:
-            port: 8558
+          httpGet:
+            port: management
+            path: /ready
           initialDelaySeconds: 45
           periodSeconds: 10
         livenessProbe:
-          tcpSocket:
-            port: 2551
+          httpGet:
+            port: management
+            path: /alive
           initialDelaySeconds: 180
           periodSeconds: 10
           timeoutSeconds: 3
@@ -77,20 +79,22 @@ spec:
         command: ["java"]
         args: ["-jar", "/opt/ditto/starter.jar"]
         ports:
-        - name: akka-remoting
+        - name: remoting
           containerPort: 2551
           protocol: TCP
-        - name: akka-mgmt-http
+        - name: management
           containerPort: 8558
           protocol: TCP
         readinessProbe:
-          tcpSocket:
-            port: 8558
+          httpGet:
+            port: management
+            path: /ready
           initialDelaySeconds: 45
           periodSeconds: 10
         livenessProbe:
-          tcpSocket:
-            port: 2551
+          httpGet:
+            port: management
+            path: /alive
           initialDelaySeconds: 180
           periodSeconds: 10
           timeoutSeconds: 3
@@ -134,20 +138,22 @@ spec:
         command: ["java"]
         args: ["-jar", "/opt/ditto/starter.jar"]
         ports:
-        - name: akka-remoting
+        - name: remoting
           containerPort: 2551
           protocol: TCP
-        - name: akka-mgmt-http
+        - name: management
           containerPort: 8558
           protocol: TCP
         readinessProbe:
-          tcpSocket:
-            port: 8558
+          httpGet:
+            port: management
+            path: /ready
           initialDelaySeconds: 45
           periodSeconds: 10
         livenessProbe:
-          tcpSocket:
-            port: 2551
+          httpGet:
+            port: management
+            path: /alive
           initialDelaySeconds: 180
           periodSeconds: 10
           timeoutSeconds: 3
@@ -190,20 +196,22 @@ spec:
         command: ["java"]
         args: ["-jar", "/opt/ditto/starter.jar"]
         ports:
-        - name: akka-remoting
+        - name: remoting
           containerPort: 2551
           protocol: TCP
-        - name: akka-mgmt-http
+        - name: management
           containerPort: 8558
           protocol: TCP
         readinessProbe:
-          tcpSocket:
-            port: 8558
+          httpGet:
+            port: management
+            path: /ready
           initialDelaySeconds: 45
           periodSeconds: 10
         livenessProbe:
-          tcpSocket:
-            port: 2551
+          httpGet:
+            port: management
+            path: /alive
           initialDelaySeconds: 180
           periodSeconds: 10