diff --git a/bom/pom.xml b/bom/pom.xml index 35bc0cca88..e665e475eb 100755 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,7 +25,7 @@ 2.12 - 2.12.6 + 2.12.8 1.8 1.8 @@ -33,11 +33,11 @@ 0.9.5 1.3.3 - 0.2.4 - 2.5.17 - 10.1.5 + 0.3.7 + 2.5.21 + 10.1.7 2.2.4 - 0.14.0 + 1.0.0 0.9.2 0.20 1.0.1 @@ -49,11 +49,11 @@ 2.1.4 0.10.1 5.2 - 0.39.0 + 0.40.0 5.0.0 5.4.2 1.0.2 - 4.1.27.Final + 4.1.32.Final 1.7.25 1.2.3 @@ -167,6 +167,11 @@ akka-stream_${scala.version} ${akka.version} + + com.typesafe.akka + akka-discovery_${scala.version} + ${akka.version} + com.typesafe.akka @@ -255,12 +260,12 @@ com.lightbend.akka.discovery - akka-discovery-dns_${scala.version} + akka-discovery-kubernetes-api_${scala.version} ${akka-management.version} - com.lightbend.akka.discovery - akka-discovery-kubernetes-api_${scala.version} + com.lightbend.akka.management + akka-management-cluster-http_${scala.version} ${akka-management.version} diff --git a/deployment/kubernetes/ditto/ditto-cluster.yaml b/deployment/kubernetes/ditto/ditto-cluster.yaml index d2bfbd0215..af5bfadc40 100644 --- 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 timeoutSeconds: 3 @@ -246,20 +254,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 @@ -302,20 +312,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 diff --git a/deployment/openshift/ditto/ditto-cluster.yaml b/deployment/openshift/ditto/ditto-cluster.yaml index 8611df8a98..5c59654437 100644 --- a/deployment/openshift/ditto/ditto-cluster.yaml +++ b/deployment/openshift/ditto/ditto-cluster.yaml @@ -1,7 +1,6 @@ --- # Note: -# The K8S_NAMESPACE env variable relates to the namespace in which the Ditto service is running. -# According to this the pod-reader-role have to be created in the same namespace. +# According to the used k8s namespace the pod-reader-role have to be created in the same namespace. apiVersion: extensions/v1beta1 kind: Deployment @@ -25,20 +24,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 @@ -64,8 +65,6 @@ spec: - name: DISCOVERY_METHOD value: "kubernetes-api" # namespace in which the Ditto service is running according to this the pod-reader-role have to be created in the same namespace - - name: K8S_NAMESPACE - value: "default" - name: TZ value: "Europe/Berlin" - name: OPENJ9_JAVA_OPTIONS @@ -98,20 +97,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 @@ -137,8 +138,6 @@ spec: - name: DISCOVERY_METHOD value: "kubernetes-api" # namespace in which the Ditto service is running according to this the pod-reader-role have to be created in the same namespace - - name: K8S_NAMESPACE - value: "default" - name: TZ value: "Europe/Berlin" - name: OPENJ9_JAVA_OPTIONS @@ -171,20 +170,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 @@ -210,8 +211,6 @@ spec: - name: DISCOVERY_METHOD value: "kubernetes-api" # namespace in which the Ditto service is running according to this the pod-reader-role have to be created in the same namespace - - name: K8S_NAMESPACE - value: "default" - name: TZ value: "Europe/Berlin" - name: OPENJ9_JAVA_OPTIONS @@ -243,20 +242,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 @@ -281,8 +282,6 @@ spec: fieldPath: status.podIP - name: DISCOVERY_METHOD value: "kubernetes-api" - - name: K8S_NAMESPACE - value: "default" - name: TZ value: "Europe/Berlin" - name: OPENJ9_JAVA_OPTIONS @@ -314,20 +313,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 @@ -353,8 +354,6 @@ spec: - name: DISCOVERY_METHOD value: "kubernetes-api" # namespace in which the Ditto service is running according to this the pod-reader-role have to be created in the same namespace - - name: K8S_NAMESPACE - value: "default" - name: TZ value: "Europe/Berlin" - name: OPENJ9_JAVA_OPTIONS @@ -386,20 +385,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 @@ -427,8 +428,6 @@ spec: - name: DISCOVERY_METHOD value: "kubernetes-api" # namespace in which the Ditto service is running according to this the pod-reader-role have to be created in the same namespace - - name: K8S_NAMESPACE - value: "default" - name: BIND_HOSTNAME value: 0.0.0.0 - name: TZ diff --git a/legal/3rd-party-dependencies/compile.txt b/legal/3rd-party-dependencies/compile.txt index e6644cf8bc..7de4e68c40 100755 --- a/legal/3rd-party-dependencies/compile.txt +++ b/legal/3rd-party-dependencies/compile.txt @@ -12,55 +12,54 @@ com.github.scullxbones:akka-persistence-mongo-common_2.12:jar:2.2.4:compile com.github.scullxbones:akka-persistence-mongo-scala_2.12:jar:2.2.4:compile com.lightbend.akka:akka-stream-alpakka-mqtt_2.12:jar:0.20:compile - com.lightbend.akka.discovery:akka-discovery_2.12:jar:0.14.0:compile - com.lightbend.akka.discovery:akka-discovery-dns_2.12:jar:0.14.0:compile - com.lightbend.akka.discovery:akka-discovery-kubernetes-api_2.12:jar:0.14.0:compile - com.lightbend.akka.management:akka-management_2.12:jar:0.14.0:compile - com.lightbend.akka.management:akka-management-cluster-bootstrap_2.12:jar:0.14.0:compile + com.lightbend.akka.discovery:akka-discovery-kubernetes-api_2.12:jar:1.0.0:compile + com.lightbend.akka.management:akka-management_2.12:jar:1.0.0:compile + com.lightbend.akka.management:akka-management-cluster-bootstrap_2.12:jar:1.0.0:compile com.newmotion:akka-rabbitmq_2.12:jar:5.0.0:compile com.rabbitmq:amqp-client:jar:5.4.2:compile - com.typesafe.akka:akka-actor_2.12:jar:2.5.17:compile - com.typesafe.akka:akka-cluster_2.12:jar:2.5.17:compile - com.typesafe.akka:akka-cluster-sharding_2.12:jar:2.5.17:compile - com.typesafe.akka:akka-cluster-tools_2.12:jar:2.5.17:compile - com.typesafe.akka:akka-distributed-data_2.12:jar:2.5.17:compile - com.typesafe.akka:akka-http_2.12:jar:10.1.5:compile - com.typesafe.akka:akka-http-core_2.12:jar:10.1.5:compile - com.typesafe.akka:akka-http-spray-json_2.12:jar:10.1.5:compile - com.typesafe.akka:akka-parsing_2.12:jar:10.1.5:compile - com.typesafe.akka:akka-persistence_2.12:jar:2.5.17:compile - com.typesafe.akka:akka-persistence-query_2.12:jar:2.5.17:compile - com.typesafe.akka:akka-protobuf_2.12:jar:2.5.17:compile - com.typesafe.akka:akka-remote_2.12:jar:2.5.17:compile - com.typesafe.akka:akka-slf4j_2.12:jar:2.5.17:compile - com.typesafe.akka:akka-stream_2.12:jar:2.5.17:compile + com.typesafe.akka:akka-actor_2.12:jar:2.5.21:compile + com.typesafe.akka:akka-cluster_2.12:jar:2.5.21:compile + com.typesafe.akka:akka-cluster-sharding_2.12:jar:2.5.21:compile + com.typesafe.akka:akka-cluster-tools_2.12:jar:2.5.21:compile + com.typesafe.akka:akka-discovery_2.12:jar:2.5.21:compile + com.typesafe.akka:akka-distributed-data_2.12:jar:2.5.21:compile + com.typesafe.akka:akka-http_2.12:jar:10.1.7:compile + com.typesafe.akka:akka-http-core_2.12:jar:10.1.7:compile + com.typesafe.akka:akka-http-spray-json_2.12:jar:10.1.7:compile + com.typesafe.akka:akka-parsing_2.12:jar:10.1.7:compile + com.typesafe.akka:akka-persistence_2.12:jar:2.5.21:compile + com.typesafe.akka:akka-persistence-query_2.12:jar:2.5.21:compile + com.typesafe.akka:akka-protobuf_2.12:jar:2.5.21:compile + com.typesafe.akka:akka-remote_2.12:jar:2.5.21:compile + com.typesafe.akka:akka-slf4j_2.12:jar:2.5.21:compile + com.typesafe.akka:akka-stream_2.12:jar:2.5.21:compile com.typesafe.akka:akka-stream-kafka_2.12:jar:1.0.1:compile com.typesafe:config:jar:1.3.3:compile - com.typesafe:ssl-config-core_2.12:jar:0.2.4:compile - io.aeron:aeron-client:jar:1.9.3:compile - io.aeron:aeron-driver:jar:1.9.3:compile + com.typesafe:ssl-config-core_2.12:jar:0.3.7:compile + io.aeron:aeron-client:jar:1.15.1:compile + io.aeron:aeron-driver:jar:1.15.1:compile io.jsonwebtoken:jjwt-api:jar:0.10.1:compile io.jsonwebtoken:jjwt-impl:jar:0.10.1:compile io.kamon:kamon-core_2.12:jar:1.1.2:compile io.kamon:kamon-prometheus_2.12:jar:1.1.1:compile io.kamon:kamon-system-metrics_2.12:jar:1.0.0:compile - io.netty:netty-buffer:jar:4.1.27.Final:compile - io.netty:netty-codec-http:jar:4.1.27.Final:compile - io.netty:netty-codec:jar:4.1.27.Final:compile - io.netty:netty-common:jar:4.1.27.Final:compile - io.netty:netty-handler:jar:4.1.27.Final:compile - io.netty:netty-resolver:jar:4.1.27.Final:compile - io.netty:netty-transport:jar:4.1.27.Final:compile - io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.27.Final:compile - io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.27.Final:compile - io.netty:netty-transport-native-unix-common:jar:4.1.27.Final:compile - io.spray:spray-json_2.12:jar:1.3.3:compile + io.netty:netty-buffer:jar:4.1.32.Final:compile + io.netty:netty-codec-http:jar:4.1.32.Final:compile + io.netty:netty-codec:jar:4.1.32.Final:compile + io.netty:netty-common:jar:4.1.32.Final:compile + io.netty:netty-handler:jar:4.1.32.Final:compile + io.netty:netty-resolver:jar:4.1.32.Final:compile + io.netty:netty-transport:jar:4.1.32.Final:compile + io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.32.Final:compile + io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.32.Final:compile + io.netty:netty-transport-native-unix-common:jar:4.1.32.Final:compile + io.spray:spray-json_2.12:jar:1.3.5:compile nl.grons:metrics-scala_2.12:jar:3.5.5_a2.4:compile - org.agrona:agrona:jar:0.9.18:compile + org.agrona:agrona:jar:0.9.31:compile org.apache.geronimo.specs:geronimo-jms_2.0_spec:jar:1.0-alpha-2:compile org.apache.kafka:kafka-clients:jar:2.1.1:compile org.apache.qpid:proton-j:jar:0.31.0:compile - org.apache.qpid:qpid-jms-client:jar:0.39.0:compile + org.apache.qpid:qpid-jms-client:jar:0.40.0:compile org.atteo.classindex:classindex:jar:3.6:compile org.eclipse.paho:org.eclipse.paho.client.mqttv3:jar:1.2.0:compile org.hdrhistogram:HdrHistogram:jar:2.1.9:compile @@ -83,8 +82,8 @@ org.reactivestreams:reactive-streams:jar:1.0.2:compile org.scala-lang.modules:scala-java8-compat_2.12:jar:0.8.0:compile org.scala-lang.modules:scala-parser-combinators_2.12:jar:1.1.0:compile - org.scala-lang:scala-library:jar:2.12.6:compile - org.scala-lang:scala-reflect:jar:2.12.6:compile + org.scala-lang:scala-library:jar:2.12.8:compile + org.scala-lang:scala-reflect:jar:2.12.8:compile org.slf4j:slf4j-api:jar:1.7.25:compile org.typelevel:macro-compat_2.12:jar:1.1.1:compile org.webjars.npm:bytebuffer:jar:5.0.1:compile diff --git a/legal/3rd-party-dependencies/cqs.md b/legal/3rd-party-dependencies/cqs.md index b14c91cb40..1d74199992 100644 --- a/legal/3rd-party-dependencies/cqs.md +++ b/legal/3rd-party-dependencies/cqs.md @@ -17,56 +17,55 @@ |com.github.luben|zstd-jni|1.3.7-1| [19163](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19163) | |com.github.scullxbones|akka-persistence-mongo-common_2.12|2.2.4| [18708](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18708) | |com.github.scullxbones|akka-persistence-mongo-scala_2.12|2.2.4| [18709](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18709) | -|com.lightbend.akka|akka-stream-alpakka-mqtt_2.12|0.20| [17357](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17357) | -|com.lightbend.akka.discovery|akka-discovery_2.12|0.14.0| [16727](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16727) | -|com.lightbend.akka.discovery|akka-discovery-dns_2.12|0.14.0| [16727](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16727) | -|com.lightbend.akka.discovery|akka-discovery-kubernetes-api_2.12|0.14.0| [16727](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16727) | -|com.lightbend.akka.management|akka-management_2.12|0.14.0| [16727](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16727) | -|com.lightbend.akka.management|akka-management-cluster-bootstrap_2.12|0.14.0| [16727](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16727) | +|com.lightbend.akka|akka-stream-alpakka-mqtt_2.12|0.20| [17357](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17357) TODO wait for 1.0 and add CQ | +|com.lightbend.akka.discovery|akka-discovery-kubernetes-api_2.12|1.0.0| [19295](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19295) | +|com.lightbend.akka.management|akka-management_2.12|1.0.0| [19295](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19295) | +|com.lightbend.akka.management|akka-management-cluster-bootstrap_2.12|1.0.0| [19295](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19295) | |com.newmotion|akka-rabbitmq_2.12|5.0.0| [16333](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16333) | |com.rabbitmq|amqp-client|5.4.2| [17744](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17744) | -|com.typesafe.akka|akka-actor_2.12|2.5.17| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | -|com.typesafe.akka|akka-cluster_2.12|2.5.17| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | -|com.typesafe.akka|akka-cluster-sharding_2.12|2.5.17| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | -|com.typesafe.akka|akka-cluster-tools_2.12|2.5.17| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | -|com.typesafe.akka|akka-distributed-data_2.12|2.5.17| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | -|com.typesafe.akka|akka-http_2.12|10.1.5| [16551](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16551) | -|com.typesafe.akka|akka-http-core_2.12|10.1.5| [16551](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16551) | -|com.typesafe.akka|akka-http-spray-json_2.12|10.1.5| [16551](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16551) | -|com.typesafe.akka|akka-parsing_2.12|10.1.5| [16551](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16551) | -|com.typesafe.akka|akka-persistence_2.12|2.5.17| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | -|com.typesafe.akka|akka-persistence-query_2.12|2.5.17| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | -|com.typesafe.akka|akka-protobuf_2.12|2.5.17| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | -|com.typesafe.akka|akka-remote_2.12|2.5.17| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | -|com.typesafe.akka|akka-slf4j_2.12|2.5.17| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | -|com.typesafe.akka|akka-stream_2.12|2.5.17| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe.akka|akka-actor_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | +|com.typesafe.akka|akka-cluster_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | +|com.typesafe.akka|akka-cluster-sharding_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | +|com.typesafe.akka|akka-cluster-tools_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | +|com.typesafe.akka|akka-discovery_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | +|com.typesafe.akka|akka-distributed-data_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | +|com.typesafe.akka|akka-http_2.12|10.1.7| [16551](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16551) | +|com.typesafe.akka|akka-http-core_2.12|10.1.7| [16551](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16551) | +|com.typesafe.akka|akka-http-spray-json_2.12|10.1.7| [16551](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16551) | +|com.typesafe.akka|akka-parsing_2.12|10.1.7| [16551](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16551) | +|com.typesafe.akka|akka-persistence_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | +|com.typesafe.akka|akka-persistence-query_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | +|com.typesafe.akka|akka-protobuf_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | +|com.typesafe.akka|akka-remote_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | +|com.typesafe.akka|akka-slf4j_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | +|com.typesafe.akka|akka-stream_2.12|2.5.21| [18999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18999) | |com.typesafe.akka|akka-stream-kafka_2.12|1.0.1| [19166](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19166) | |com.typesafe|config|1.3.3| [14400](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=14400) | -|com.typesafe|ssl-config-core_2.12|0.2.4| [16314](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16314) | -|io.aeron|aeron-client|1.9.3| [16553](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16553) | -|io.aeron|aeron-driver|1.9.3| [16552](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16552) | +|com.typesafe|ssl-config-core_2.12|0.3.7| [18998](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18998) | +|io.aeron|aeron-client|1.15.1| [18996](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18996) | +|io.aeron|aeron-driver|1.15.1| [18997](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18997) | |io.jsonwebtoken|jjwt-api|0.10.1| [17097](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17097) | |io.jsonwebtoken|jjwt-impl|0.10.1| [17097](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17097) | |io.kamon|kamon-core_2.12|1.1.2| [16740](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16740) | |io.kamon|kamon-prometheus_2.12|1.1.1| [16742](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16742) | |io.kamon|kamon-system-metrics_2.12|1.0.0| [16741](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16741) | -|io.netty|netty-buffer|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | -|io.netty|netty-codec-http|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | -|io.netty|netty-codec|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | -|io.netty|netty-common|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | -|io.netty|netty-handler|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | -|io.netty|netty-resolver|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | -|io.netty|netty-transport|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | -|io.netty|netty-transport-native-epoll|linux-x86_64| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | -|io.netty|netty-transport-native-kqueue|osx-x86_64| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | -|io.netty|netty-transport-native-unix-common|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | -|io.spray|spray-json_2.12|1.3.3| [16555](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16555) | +|io.netty|netty-buffer|4.1.32.Final| [19002](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19002) | +|io.netty|netty-codec-http|4.1.32.Final| [19002](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19002) | +|io.netty|netty-codec|4.1.32.Final| [19002](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19002) | +|io.netty|netty-common|4.1.32.Final| [19002](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19002) | +|io.netty|netty-handler|4.1.32.Final| [19002](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19002) | +|io.netty|netty-resolver|4.1.32.Final| [19002](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19002) | +|io.netty|netty-transport|4.1.32.Final| [19002](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19002) | +|io.netty|netty-transport-native-epoll|linux-x86_64| [19002](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19002) | +|io.netty|netty-transport-native-kqueue|osx-x86_64| [19002](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19002) | +|io.netty|netty-transport-native-unix-common|4.1.32.Final| [19002](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19002) | +|io.spray|spray-json_2.12|1.3.5| [16555](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16555) | |nl.grons|metrics-scala_2.12|3.5.5_a2.4| [14491](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=14491) | -|org.agrona|agrona|0.9.18| [16554](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16554) | +|org.agrona|agrona|0.9.31| [16554](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16554) | |org.apache.geronimo.specs|geronimo-jms_2.0_spec|1.0-alpha-2| [16327](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16327) | |org.apache.kafka|kafka-clients|2.1.1| [19161](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19161) | -|org.apache.qpid|proton-j|0.29.0| [17533](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17533) | -|org.apache.qpid|qpid-jms-client|0.36.0| [17532](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17532) | +|org.apache.qpid|proton-j|0.31.0| [19000](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19000) | +|org.apache.qpid|qpid-jms-client|0.40.0| [19001](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19001) | |org.atteo.classindex|classindex|3.6| [18906](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18906) | |org.eclipse.paho|org.eclipse.paho.client.mqttv3|1.2.0| not required as Eclipse project | |org.hdrhistogram|HdrHistogram|2.1.9| [14471](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=14471) | @@ -103,10 +102,9 @@ |---|---|---|---| |com.google.code.findbugs|jsr305|3.0.1| [14511](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=14511) | |com.github.dnvriend|akka-persistence-inmemory_2.12|2.5.1.1| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | -|commons-io|commons-io|2.4| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | -|com.typesafe.akka|akka-http-testkit_2.12|10.1.5| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | -|com.typesafe.akka|akka-stream-testkit_2.12|2.5.17| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | -|com.typesafe.akka|akka-testkit_2.12|2.5.17| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | +|com.typesafe.akka|akka-http-testkit_2.12|10.1.7| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | +|com.typesafe.akka|akka-stream-testkit_2.12|2.5.21| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | +|com.typesafe.akka|akka-testkit_2.12|2.5.21| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | |de.flapdoodle.embed|de.flapdoodle.embed.mongo|2.0.0| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | |de.flapdoodle.embed|de.flapdoodle.embed.process|2.0.1| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | |junit|junit|4.12| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | @@ -115,7 +113,7 @@ |net.java.dev.jna|jna|4.0.0| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | |net.java.dev.jna|jna-platform|4.0.0| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | |net.sf.jopt-simple|jopt-simple|4.6| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | -|nl.jqno.equalsverifier|equalsverifier|2.3| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | +|nl.jqno.equalsverifier|equalsverifier|3.0.3| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) TODO add "works-with" CQ | |org.apache.commons|commons-compress|1.10| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | |org.apache.commons|commons-lang3|3.1| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | |org.apache.commons|commons-math3|3.2| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | @@ -155,6 +153,7 @@ |org.apache.maven.plugins|maven-surefire-plugin|2.22.0| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | |org.codehaus.mojo|exec-maven-plugin|1.6.0| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | |org.codehaus.mojo|flatten-maven-plugin|1.0.1| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | +|org.codehaus.mojo|license-maven-plugin|1.16| []() TODO add "works-with" CQ | |org.codehaus.mojo|versions-maven-plugin|2.5| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | |org.jacoco|jacoco-maven-plugin|0.8.0| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | |org.sonatype.plugins|port-allocator-maven-plugin|1.2| [17676](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17676) | @@ -180,3 +179,33 @@ Manual step by sending mail to Eclipse IP team - this is a collection of depende |org.mongodb|casbah-core_2.12|3.1.1| [16338](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16338) | |org.mongodb|casbah-gridfs_2.12|3.1.1| [16339](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16339) | |org.mongodb|casbah-query_2.12|3.1.1| [16340](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16340) | +|com.lightbend.akka|akka-stream-alpakka-mqtt_2.12|0.20| [17357](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17357) | +|com.lightbend.akka.discovery|akka-discovery_2.12|0.14.0| [16727](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16727) | +|com.lightbend.akka.discovery|akka-discovery-dns_2.12|0.14.0| [16727](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16727) | +|com.lightbend.akka.discovery|akka-discovery-kubernetes-api_2.12|0.14.0| [16727](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16727) | +|com.lightbend.akka.management|akka-management_2.12|0.14.0| [16727](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16727) | +|com.lightbend.akka.management|akka-management-cluster-bootstrap_2.12|0.14.0| [16727](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16727) | +|com.typesafe.akka|akka-actor_2.12|2.5.13| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe.akka|akka-cluster_2.12|2.5.13| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe.akka|akka-cluster-sharding_2.12|2.5.13| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe.akka|akka-cluster-tools_2.12|2.5.13| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe.akka|akka-distributed-data_2.12|2.5.13| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe.akka|akka-persistence_2.12|2.5.13| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe.akka|akka-persistence-query_2.12|2.5.13| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe.akka|akka-protobuf_2.12|2.5.13| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe.akka|akka-remote_2.12|2.5.13| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe.akka|akka-slf4j_2.12|2.5.13| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe.akka|akka-stream_2.12|2.5.13| [16726](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16726) | +|com.typesafe|ssl-config-core_2.12|0.2.4| [16314](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16314) | +|io.aeron|aeron-client|1.9.3| [16553](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16553) | +|io.aeron|aeron-driver|1.9.3| [16552](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16552) | +|io.netty|netty-buffer|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | +|io.netty|netty-codec-http|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | +|io.netty|netty-codec|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | +|io.netty|netty-common|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | +|io.netty|netty-handler|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | +|io.netty|netty-resolver|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | +|io.netty|netty-transport|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | +|io.netty|netty-transport-native-epoll|linux-x86_64| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | +|io.netty|netty-transport-native-kqueue|osx-x86_64| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | +|io.netty|netty-transport-native-unix-common|4.1.27.Final| [16559](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16559) | diff --git a/legal/3rd-party-dependencies/maven-plugins.txt b/legal/3rd-party-dependencies/maven-plugins.txt index 2244193c0d..6bb54d3a93 100644 --- a/legal/3rd-party-dependencies/maven-plugins.txt +++ b/legal/3rd-party-dependencies/maven-plugins.txt @@ -1,6 +1,6 @@ com.github.siom79.japicmp:japicmp-maven-plugin:maven-plugin:0.11.0:runtime com.mycila:license-maven-plugin:maven-plugin:3.0:runtime - io.fabric8:docker-maven-plugin:maven-plugin:0.23.0:runtime + io.fabric8:docker-maven-plugin:maven-plugin:0.26.0:runtime net.alchim31.maven:scala-maven-plugin:maven-plugin:3.3.1:runtime org.apache.felix:maven-bundle-plugin:maven-plugin:3.5.0:runtime org.apache.maven.plugins:maven-assembly-plugin:maven-plugin:3.1.0:runtime @@ -8,17 +8,20 @@ org.apache.maven.plugins:maven-compiler-plugin:maven-plugin:3.7.0:runtime org.apache.maven.plugins:maven-dependency-plugin:maven-plugin:3.0.2:runtime org.apache.maven.plugins:maven-deploy-plugin:maven-plugin:2.8.2:runtime - org.apache.maven.plugins:maven-failsafe-plugin:maven-plugin:2.20.1:runtime + org.apache.maven.plugins:maven-enforcer-plugin:maven-plugin:1.4.1:runtime + org.apache.maven.plugins:maven-failsafe-plugin:maven-plugin:3.0.0-M1:runtime org.apache.maven.plugins:maven-install-plugin:maven-plugin:2.5.2:runtime org.apache.maven.plugins:maven-jar-plugin:maven-plugin:3.0.2:runtime + org.apache.maven.plugins:maven-javadoc-plugin:maven-plugin:3.0.0:runtime org.apache.maven.plugins:maven-resources-plugin:maven-plugin:3.0.2:runtime org.apache.maven.plugins:maven-scm-plugin:maven-plugin:1.9.5:runtime org.apache.maven.plugins:maven-shade-plugin:maven-plugin:3.1.0:runtime org.apache.maven.plugins:maven-site-plugin:maven-plugin:3.7:runtime - org.apache.maven.plugins:maven-surefire-plugin:maven-plugin:2.22.0:runtime + org.apache.maven.plugins:maven-source-plugin:maven-plugin:3.0.1:runtime + org.apache.maven.plugins:maven-surefire-plugin:maven-plugin:3.0.0-M1:runtime org.codehaus.mojo:exec-maven-plugin:maven-plugin:1.6.0:runtime org.codehaus.mojo:flatten-maven-plugin:maven-plugin:1.0.1:runtime - org.codehaus.mojo:license-maven-plugin:maven-plugin:1.16:runtime + org.codehaus.mojo:license-maven-plugin:maven-plugin:1.17:runtime org.codehaus.mojo:versions-maven-plugin:maven-plugin:2.5:runtime org.jacoco:jacoco-maven-plugin:maven-plugin:0.8.0:runtime org.sonatype.plugins:port-allocator-maven-plugin:maven-plugin:1.2:runtime diff --git a/legal/3rd-party-dependencies/test.txt b/legal/3rd-party-dependencies/test.txt index 23468554fd..92e2b16af3 100755 --- a/legal/3rd-party-dependencies/test.txt +++ b/legal/3rd-party-dependencies/test.txt @@ -1,15 +1,7 @@ - com.101tec:zkclient:jar:0.11:test - com.fasterxml.jackson.core:jackson-annotations:jar:2.9.0:test - com.fasterxml.jackson.core:jackson-core:jar:2.9.8:test - com.fasterxml.jackson.core:jackson-databind:jar:2.9.8:test com.github.dnvriend:akka-persistence-inmemory_2.12:jar:2.5.1.1:test - com.thoughtworks.paranamer:paranamer:jar:2.7:test - com.typesafe.akka:akka-http-testkit_2.12:jar:10.1.5:test - com.typesafe.akka:akka-stream-kafka-testkit_2.12:jar:1.0.1:test - com.typesafe.akka:akka-stream-testkit_2.12:jar:2.5.17:test - com.typesafe.akka:akka-testkit_2.12:jar:2.5.17:test - com.typesafe.scala-logging:scala-logging_2.12:jar:3.9.0:test - com.yammer.metrics:metrics-core:jar:2.2.0:test + com.typesafe.akka:akka-http-testkit_2.12:jar:10.1.7:test + com.typesafe.akka:akka-stream-testkit_2.12:jar:2.5.21:test + com.typesafe.akka:akka-testkit_2.12:jar:2.5.21:test de.flapdoodle.embed:de.flapdoodle.embed.mongo:jar:2.2.0:test de.flapdoodle.embed:de.flapdoodle.embed.process:jar:2.1.2:test junit:junit:jar:4.12:test @@ -17,21 +9,13 @@ net.bytebuddy:byte-buddy:jar:1.7.0:test net.java.dev.jna:jna:jar:4.0.0:test net.java.dev.jna:jna-platform:jar:4.0.0:test - net.manub:scalatest-embedded-kafka_2.12:jar:2.0.0:test net.sf.jopt-simple:jopt-simple:jar:4.6:test - net.sf.jopt-simple:jopt-simple:jar:5.0.4:test nl.jqno.equalsverifier:equalsverifier:jar:3.0.3:test - org.apache.avro:avro:jar:1.8.2:test org.apache.commons:commons-compress:jar:1.18:test org.apache.commons:commons-lang3:jar:3.1:test org.apache.commons:commons-math3:jar:3.2:test - org.apache.kafka:kafka_2.12:jar:2.1.1:test - org.apache.yetus:audience-annotations:jar:0.5.0:test - org.apache.zookeeper:zookeeper:jar:3.4.13:test org.assertj:assertj-core:jar:3.8.0:test org.awaitility:awaitility:jar:3.1.0:test - org.codehaus.jackson:jackson-core-asl:jar:1.9.13:test - org.codehaus.jackson:jackson-mapper-asl:jar:1.9.13:test org.hamcrest:hamcrest-core:jar:1.3:test org.hamcrest:hamcrest-library:jar:1.3:test org.json:json:jar:20090211:test @@ -46,4 +30,3 @@ org.scalaz:scalaz-core_2.12:jar:7.2.12:test org.skyscreamer:jsonassert:jar:1.2.3:test org.slf4j:slf4j-simple:jar:1.7.25:test - org.tukaani:xz:jar:1.5:test diff --git a/legal/NOTICE-THIRD-PARTY.md b/legal/NOTICE-THIRD-PARTY.md index 6d44a924b6..267ad7ec73 100644 --- a/legal/NOTICE-THIRD-PARTY.md +++ b/legal/NOTICE-THIRD-PARTY.md @@ -6,492 +6,512 @@ * License: [EPL-1.0](licenses/EPL-1.0.txt), [LGPL-2.1](licenses/LGPL-2.1.txt) * Project: http://logback.qos.ch/logback-classic * Source: https://github.com/ceki/logback/logback-classic + + ## Logback Core Module (1.2.3) * Maven coordinates: `ch.qos.logback:logback-core:1.2.3` * License: [EPL-1.0](licenses/EPL-1.0.txt), [LGPL-2.1](licenses/LGPL-2.1.txt) * Project: http://logback.qos.ch/logback-core * Source: https://github.com/ceki/logback/logback-core + + ## simple-akka-downing (0.9.2) * Maven coordinates: `com.ajjpj.simple-akka-downing:simple-akka-downing_2.12:0.9.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/arnohaase/simple-akka-downing * Source: https://github.com/arnohaase/simple-akka-downing + + ## core (2.3.2) * Maven coordinates: `com.chuusai:shapeless_2.12:2.3.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/milessabin/shapeless * Source: https://github.com/milessabin/shapeless + + ## minimal-json (0.9.5) * Maven coordinates: `com.eclipsesource.minimal-json:minimal-json:0.9.5` * License: [MIT](licenses/MIT.txt) * Project: https://github.com/ralfstx/minimal-json * Source: https://github.com/ralfstx/minimal-json + + ## Caffeine cache (2.6.2) * Maven coordinates: `com.github.ben-manes.caffeine:caffeine:2.6.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/ben-manes/caffeine * Source: https://github.com/ben-manes/caffeine + + ## jffi (1.2.16) * Maven coordinates: `com.github.jnr:jffi:1.2.16` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://github.com/jnr/jffi - * Source: git@github.com:jnr/jffi.git + * Source: https://github.com/jnr/jffi + + ## jnr-constants (0.9.9) * Maven coordinates: `com.github.jnr:jnr-constants:0.9.9` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://github.com/jnr/jnr-constants - * Source: git@github.com:jnr/jnr-constants.git + * Source: https://github.com/jnr/jnr-constants + + ## jnr-ffi (2.1.7) * Maven coordinates: `com.github.jnr:jnr-ffi:2.1.7` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://github.com/jnr/jnr-ffi - * Source: git@github.com:jnr/jnr-ffi.git + * Source: https://github.com/jnr/jnr-ffi + + ## jnr-x86asm (1.0.2) * Maven coordinates: `com.github.jnr:jnr-x86asm:1.0.2` * License: [MIT](licenses/MIT.txt) * Project: http://github.com/jnr/jnr-x86asm - * Source: git@github.com:jnr/jnr-x86asm.git + * Source: https://github.com/jnr/jnr-x86asm + + ## zstd-jni (1.3.7-1) * Maven coordinates: `com.github.luben:zstd-jni:1.3.7-1` * License: [BSD 2-Clause License](licenses/BSD 2-Clause License.txt) * Project: https://github.com/luben/zstd-jni - * Source: git@github.com:luben/zstd-jni.git + * Source: https://github.com/luben/zstd-jni + + ## akka-persistence-mongo-common (2.2.4) * Maven coordinates: `com.github.scullxbones:akka-persistence-mongo-common_2.12:2.2.4` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/scullxbones/akka-persistence-mongo - * Source: github.com/scullxbones/akka-persistence-mongo.git + * Source: github.com/scullxbones/akka-persistence-mongo + + ## akka-persistence-mongo-scala (2.2.4) * Maven coordinates: `com.github.scullxbones:akka-persistence-mongo-scala_2.12:2.2.4` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/scullxbones/akka-persistence-mongo - * Source: github.com/scullxbones/akka-persistence-mongo.git + * Source: github.com/scullxbones/akka-persistence-mongo + + ## akka-stream-alpakka-mqtt (0.20) * Maven coordinates: `com.lightbend.akka:akka-stream-alpakka-mqtt_2.12:0.20` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/akka/alpakka * Source: https://github.com/akka/alpakka -## akka-discovery-dns (0.14.0) - * Maven coordinates: `com.lightbend.akka.discovery:akka-discovery-dns_2.12:0.14.0` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: https://github.com/akka/akka-management - * Source: https://github.com/akka/akka-management -## akka-discovery-kubernetes-api (0.14.0) - * Maven coordinates: `com.lightbend.akka.discovery:akka-discovery-kubernetes-api_2.12:0.14.0` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: https://github.com/akka/akka-management - * Source: https://github.com/akka/akka-management -## akka-discovery (0.14.0) +## akka-discovery-kubernetes-api (1.0.0) - * Maven coordinates: `com.lightbend.akka.discovery:akka-discovery_2.12:0.14.0` + * Maven coordinates: `com.lightbend.akka.discovery:akka-discovery-kubernetes-api_2.12:1.0.0` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/akka/akka-management * Source: https://github.com/akka/akka-management -## akka-management-cluster-bootstrap (0.14.0) - * Maven coordinates: `com.lightbend.akka.management:akka-management-cluster-bootstrap_2.12:0.14.0` + +## akka-management-cluster-bootstrap (1.0.0) + + * Maven coordinates: `com.lightbend.akka.management:akka-management-cluster-bootstrap_2.12:1.0.0` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/akka/akka-management * Source: https://github.com/akka/akka-management -## akka-management (0.14.0) - * Maven coordinates: `com.lightbend.akka.management:akka-management_2.12:0.14.0` + +## akka-management (1.0.0) + + * Maven coordinates: `com.lightbend.akka.management:akka-management_2.12:1.0.0` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/akka/akka-management * Source: https://github.com/akka/akka-management + + ## akka-rabbitmq (5.0.0) * Maven coordinates: `com.newmotion:akka-rabbitmq_2.12:5.0.0` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/NewMotion/akka-rabbitmq - * Source: git@github.com:NewMotion/akka-rabbitmq.git + * Source: https://github.com/NewMotion/akka-rabbitmq + + ## RabbitMQ Java Client (5.1.1) * Maven coordinates: `com.rabbitmq:amqp-client:5.1.1` * License: [Apache-2.0](licenses/Apache-2.0.txt), [GPL-2.0](licenses/GPL-2.0.txt), [MPL 1.1](licenses/MPL 1.1.txt) * Project: http://www.rabbitmq.com * Source: https://github.com/rabbitmq/rabbitmq-java-client -## config (1.3.1) - * Maven coordinates: `com.typesafe:config:1.3.1` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: https://github.com/typesafehub/config - * Source: git://github.com/typesafehub/config.git + ## config (1.3.3) * Maven coordinates: `com.typesafe:config:1.3.3` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/lightbend/config - * Source: git://github.com/lightbend/config.git -## ssl-config-core (0.2.2) + * Source: https://github.com/lightbend/config - * Maven coordinates: `com.typesafe:ssl-config-core_2.12:0.2.2` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: https://github.com/typesafehub/ssl-config - * Source: git://github.com/typesafehub/ssl-config.git -## ssl-config-core (0.2.4) - * Maven coordinates: `com.typesafe:ssl-config-core_2.12:0.2.4` +## ssl-config-core (0.3.7) + + * Maven coordinates: `com.typesafe:ssl-config-core_2.12:0.3.7` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/lightbend/ssl-config - * Source: git://github.com/lightbend/ssl-config.git -## akka-actor (2.5.17) + * Source: https://github.com/lightbend/ssl-config + - * Maven coordinates: `com.typesafe.akka:akka-actor_2.12:2.5.17` +## akka-actor (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-actor_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-cluster-sharding (2.5.17) - * Maven coordinates: `com.typesafe.akka:akka-cluster-sharding_2.12:2.5.17` + +## akka-cluster-sharding (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-cluster-sharding_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-cluster-tools (2.5.17) - * Maven coordinates: `com.typesafe.akka:akka-cluster-tools_2.12:2.5.17` + +## akka-cluster-tools (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-cluster-tools_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-cluster (2.5.17) - * Maven coordinates: `com.typesafe.akka:akka-cluster_2.12:2.5.17` + +## akka-cluster (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-cluster_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-cluster (2.5.7) - * Maven coordinates: `com.typesafe.akka:akka-cluster_2.12:2.5.7` + +## akka-discovery (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-discovery_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-distributed-data (2.5.17) - * Maven coordinates: `com.typesafe.akka:akka-distributed-data_2.12:2.5.17` + +## akka-distributed-data (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-distributed-data_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-http-core (10.0.13) - * Maven coordinates: `com.typesafe.akka:akka-http-core_2.12:10.0.13` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: https://akka.io - * Source: https://github.com/akka/akka-http -## akka-http-core (10.1.5) - * Maven coordinates: `com.typesafe.akka:akka-http-core_2.12:10.1.5` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: https://akka.io - * Source: https://github.com/akka/akka-http -## akka-http-spray-json (10.0.13) +## akka-http-core (10.1.7) - * Maven coordinates: `com.typesafe.akka:akka-http-spray-json_2.12:10.0.13` + * Maven coordinates: `com.typesafe.akka:akka-http-core_2.12:10.1.7` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://akka.io * Source: https://github.com/akka/akka-http -## akka-http (10.0.13) - * Maven coordinates: `com.typesafe.akka:akka-http_2.12:10.0.13` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: https://akka.io - * Source: https://github.com/akka/akka-http -## akka-http (10.1.5) - * Maven coordinates: `com.typesafe.akka:akka-http_2.12:10.1.5` +## akka-http-spray-json (10.1.7) + + * Maven coordinates: `com.typesafe.akka:akka-http-spray-json_2.12:10.1.7` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://akka.io * Source: https://github.com/akka/akka-http -## akka-parsing (10.0.13) - * Maven coordinates: `com.typesafe.akka:akka-parsing_2.12:10.0.13` + +## akka-http (10.1.7) + + * Maven coordinates: `com.typesafe.akka:akka-http_2.12:10.1.7` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://akka.io * Source: https://github.com/akka/akka-http -## akka-parsing (10.1.5) - * Maven coordinates: `com.typesafe.akka:akka-parsing_2.12:10.1.5` + +## akka-parsing (10.1.7) + + * Maven coordinates: `com.typesafe.akka:akka-parsing_2.12:10.1.7` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://akka.io * Source: https://github.com/akka/akka-http -## akka-persistence-query (2.5.17) - * Maven coordinates: `com.typesafe.akka:akka-persistence-query_2.12:2.5.17` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: http://akka.io/ - * Source: https://github.com/akka/akka -## akka-persistence (2.5.17) - * Maven coordinates: `com.typesafe.akka:akka-persistence_2.12:2.5.17` +## akka-persistence-query (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-persistence-query_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-protobuf (2.5.17) - * Maven coordinates: `com.typesafe.akka:akka-protobuf_2.12:2.5.17` + +## akka-persistence (2.5.1) + + * Maven coordinates: `com.typesafe.akka:akka-persistence_2.12:2.5.1` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-protobuf (2.5.7) - * Maven coordinates: `com.typesafe.akka:akka-protobuf_2.12:2.5.7` + +## akka-persistence (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-persistence_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-remote (2.5.17) - * Maven coordinates: `com.typesafe.akka:akka-remote_2.12:2.5.17` + +## akka-protobuf (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-protobuf_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-remote (2.5.7) - * Maven coordinates: `com.typesafe.akka:akka-remote_2.12:2.5.7` + +## akka-remote (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-remote_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-slf4j (2.5.17) - * Maven coordinates: `com.typesafe.akka:akka-slf4j_2.12:2.5.17` + +## akka-slf4j (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-slf4j_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka + + ## akka-stream-kafka (1.0.1) * Maven coordinates: `com.typesafe.akka:akka-stream-kafka_2.12:1.0.1` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://doc.akka.io/docs/alpakka-kafka/current/ * Source: https://github.com/akka/alpakka-kafka + + ## akka-stream (2.5.1) * Maven coordinates: `com.typesafe.akka:akka-stream_2.12:2.5.1` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ - * Source: git://github.com/akka/akka.git -## akka-stream (2.5.17) - - * Maven coordinates: `com.typesafe.akka:akka-stream_2.12:2.5.17` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: http://akka.io/ * Source: https://github.com/akka/akka -## akka-stream (2.5.7) - * Maven coordinates: `com.typesafe.akka:akka-stream_2.12:2.5.7` + +## akka-stream (2.5.21) + + * Maven coordinates: `com.typesafe.akka:akka-stream_2.12:2.5.21` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://akka.io/ * Source: https://github.com/akka/akka -## aeron (1.3.0) - * Maven coordinates: `io.aeron:aeron-client:1.3.0` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: https://github.com/real-logic/Aeron - * Source: https://github.com/real-logic/Aeron.git -## aeron (1.9.3) - * Maven coordinates: `io.aeron:aeron-client:1.9.3` +## aeron (1.15.1) + + * Maven coordinates: `io.aeron:aeron-client:1.15.1` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/real-logic/aeron - * Source: https://github.com/real-logic/aeron.git -## aeron (1.3.0) + * Source: https://github.com/real-logic/aeron - * Maven coordinates: `io.aeron:aeron-driver:1.3.0` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: https://github.com/real-logic/Aeron - * Source: https://github.com/real-logic/Aeron.git -## aeron (1.9.3) - * Maven coordinates: `io.aeron:aeron-driver:1.9.3` +## aeron (1.15.1) + + * Maven coordinates: `io.aeron:aeron-driver:1.15.1` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/real-logic/aeron - * Source: https://github.com/real-logic/aeron.git + * Source: https://github.com/real-logic/aeron + + ## Metrics Core (3.1.2) * Maven coordinates: `io.dropwizard.metrics:metrics-core:3.1.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://metrics.codahale.com/metrics-core/ - * Source: http://github.com/dropwizard/metrics/metrics-core/ + * Source: https://github.com/dropwizard/metrics/metrics-core/ + + ## Metrics Health Checks (3.1.2) * Maven coordinates: `io.dropwizard.metrics:metrics-healthchecks:3.1.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://metrics.codahale.com/metrics-healthchecks/ - * Source: http://github.com/dropwizard/metrics/metrics-healthchecks/ + * Source: https://github.com/dropwizard/metrics/metrics-healthchecks/ + + ## JJWT :: API (0.10.1) * Maven coordinates: `io.jsonwebtoken:jjwt-api:0.10.1` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/jwtk/jjwt/jjwt-api - * Source: git@github.com:jwtk/jjwt.git/jjwt-api + * Source: https://github.com/jwtk/jjwt/jjwt-api + + ## JJWT :: Impl (0.10.1) * Maven coordinates: `io.jsonwebtoken:jjwt-impl:0.10.1` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/jwtk/jjwt/jjwt-impl - * Source: git@github.com:jwtk/jjwt.git/jjwt-impl + * Source: https://github.com/jwtk/jjwt/jjwt-impl + + ## core (1.1.2) * Maven coordinates: `io.kamon:kamon-core_2.12:1.1.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://kamon.io - * Source: git://github.com/kamon-io/core.git + * Source: https://github.com/kamon-io/core + + ## kamon-prometheus (1.1.1) * Maven coordinates: `io.kamon:kamon-prometheus_2.12:1.1.1` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://kamon.io - * Source: git://github.com/kamon-io/kamon-prometheus.git + * Source: https://github.com/kamon-io/kamon-prometheus + + ## kamon-system-metrics (1.0.0) * Maven coordinates: `io.kamon:kamon-system-metrics_2.12:1.0.0` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://kamon.io - * Source: git://github.com/kamon-io/kamon-system-metrics.git + * Source: https://github.com/kamon-io/kamon-system-metrics + + ## Netty (3.10.6.Final) * Maven coordinates: `io.netty:netty:3.10.6.Final` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://netty.io/ * Source: https://github.com/netty/netty -## Netty/Buffer (4.1.27.Final) - * Maven coordinates: `io.netty:netty-buffer:4.1.27.Final` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: http://netty.io/netty-buffer/ - * Source: https://github.com/netty/netty/netty-buffer -## Netty/Buffer (4.1.31.Final) - * Maven coordinates: `io.netty:netty-buffer:4.1.31.Final` +## Netty/Buffer (4.1.32.Final) + + * Maven coordinates: `io.netty:netty-buffer:4.1.32.Final` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://netty.io/netty-buffer/ * Source: https://github.com/netty/netty/netty-buffer -## Netty/Codec (4.1.27.Final) - * Maven coordinates: `io.netty:netty-codec:4.1.27.Final` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: http://netty.io/netty-codec/ - * Source: https://github.com/netty/netty/netty-codec -## Netty/Codec (4.1.31.Final) - * Maven coordinates: `io.netty:netty-codec:4.1.31.Final` +## Netty/Codec (4.1.32.Final) + + * Maven coordinates: `io.netty:netty-codec:4.1.32.Final` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://netty.io/netty-codec/ * Source: https://github.com/netty/netty/netty-codec -## Netty/Codec/HTTP (4.1.31.Final) - * Maven coordinates: `io.netty:netty-codec-http:4.1.31.Final` + +## Netty/Codec/HTTP (4.1.32.Final) + + * Maven coordinates: `io.netty:netty-codec-http:4.1.32.Final` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://netty.io/netty-codec-http/ * Source: https://github.com/netty/netty/netty-codec-http -## Netty/Common (4.1.27.Final) - * Maven coordinates: `io.netty:netty-common:4.1.27.Final` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: http://netty.io/netty-common/ - * Source: https://github.com/netty/netty/netty-common -## Netty/Common (4.1.31.Final) - * Maven coordinates: `io.netty:netty-common:4.1.31.Final` +## Netty/Common (4.1.32.Final) + + * Maven coordinates: `io.netty:netty-common:4.1.32.Final` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://netty.io/netty-common/ * Source: https://github.com/netty/netty/netty-common -## Netty/Handler (4.1.27.Final) - * Maven coordinates: `io.netty:netty-handler:4.1.27.Final` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: http://netty.io/netty-handler/ - * Source: https://github.com/netty/netty/netty-handler -## Netty/Handler (4.1.31.Final) - * Maven coordinates: `io.netty:netty-handler:4.1.31.Final` +## Netty/Handler (4.1.32.Final) + + * Maven coordinates: `io.netty:netty-handler:4.1.32.Final` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://netty.io/netty-handler/ * Source: https://github.com/netty/netty/netty-handler -## Netty/Resolver (4.1.27.Final) - * Maven coordinates: `io.netty:netty-resolver:4.1.27.Final` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: http://netty.io/netty-resolver/ - * Source: https://github.com/netty/netty/netty-resolver -## Netty/Resolver (4.1.31.Final) - * Maven coordinates: `io.netty:netty-resolver:4.1.31.Final` +## Netty/Resolver (4.1.32.Final) + + * Maven coordinates: `io.netty:netty-resolver:4.1.32.Final` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://netty.io/netty-resolver/ * Source: https://github.com/netty/netty/netty-resolver -## Netty/Transport (4.1.27.Final) - * Maven coordinates: `io.netty:netty-transport:4.1.27.Final` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: http://netty.io/netty-transport/ - * Source: https://github.com/netty/netty/netty-transport -## Netty/Transport (4.1.31.Final) - * Maven coordinates: `io.netty:netty-transport:4.1.31.Final` +## Netty/Transport (4.1.32.Final) + + * Maven coordinates: `io.netty:netty-transport:4.1.32.Final` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://netty.io/netty-transport/ * Source: https://github.com/netty/netty/netty-transport -## Netty/Transport/Native/Epoll (4.1.31.Final) - * Maven coordinates: `io.netty:netty-transport-native-epoll:4.1.31.Final` + +## Netty/Transport/Native/Epoll (4.1.32.Final) + + * Maven coordinates: `io.netty:netty-transport-native-epoll:4.1.32.Final` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://netty.io/netty-transport-native-epoll/ * Source: https://github.com/netty/netty/netty-transport-native-epoll -## Netty/Transport/Native/KQueue (4.1.31.Final) - * Maven coordinates: `io.netty:netty-transport-native-kqueue:4.1.31.Final` + +## Netty/Transport/Native/KQueue (4.1.32.Final) + + * Maven coordinates: `io.netty:netty-transport-native-kqueue:4.1.32.Final` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://netty.io/netty-transport-native-kqueue/ * Source: https://github.com/netty/netty/netty-transport-native-kqueue -## Netty/Transport/Native/Unix/Common (4.1.31.Final) - * Maven coordinates: `io.netty:netty-transport-native-unix-common:4.1.31.Final` + +## Netty/Transport/Native/Unix/Common (4.1.32.Final) + + * Maven coordinates: `io.netty:netty-transport-native-unix-common:4.1.32.Final` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://netty.io/netty-transport-native-unix-common/ * Source: https://github.com/netty/netty/netty-transport-native-unix-common -## spray-json (1.3.3) - * Maven coordinates: `io.spray:spray-json_2.12:1.3.3` + +## spray-json (1.3.5) + + * Maven coordinates: `io.spray:spray-json_2.12:1.3.5` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/spray/spray-json - * Source: git://github.com/spray/spray.git + * Source: https://github.com/spray/spray + + ## metrics-scala (3.5.5_a2.4) * Maven coordinates: `nl.grons:metrics-scala_2.12:3.5.5_a2.4` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/erikvanoosten/metrics-scala - * Source: git@github.com:erikvanoosten/metrics-scala.git -## agrona (0.9.18) + * Source: https://github.com/erikvanoosten/metrics-scala - * Maven coordinates: `org.agrona:agrona:0.9.18` + +## agrona (0.9.31) + + * Maven coordinates: `org.agrona:agrona:0.9.31` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/real-logic/agrona - * Source: https://github.com/real-logic/agrona.git -## agrona (0.9.6) + * Source: https://github.com/real-logic/agrona + - * Maven coordinates: `org.agrona:agrona:0.9.6` - * License: [Apache-2.0](licenses/Apache-2.0.txt) - * Project: https://github.com/real-logic/Agrona - * Source: https://github.com/real-logic/Agrona.git ## Apache Geronimo JMS Spec 2.0 (1.0-alpha-2) * Maven coordinates: `org.apache.geronimo.specs:geronimo-jms_2.0_spec:1.0-alpha-2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://geronimo.apache.org/maven/specs/geronimo-jms_2.0_spec/1.0-alpha-2 - * Source: http://svn.apache.org/viewcvs.cgi/geronimo/specs/tags/geronimo-jms_2.0_spec-1.0-alpha-2 + * Source: https://svn.apache.org/viewcvs.cgi/geronimo/specs/tags/geronimo-jms_2.0_spec-1.0-alpha-2 + + ## Apache Kafka (2.1.1) * Maven coordinates: `org.apache.kafka:kafka-clients:2.1.1` @@ -505,208 +525,270 @@ * Maven coordinates: `org.apache.qpid:proton-j:0.31.0` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://qpid.apache.org/proton/proton-j - * Source: https://git-wip-us.apache.org/repos/asf?p=qpid-proton-j.git/proton-j -## QpidJMS Client (0.39.0) + * Source: https://git-wip-us.apache.org/repos/asf?p=qpid-proton-j/proton-j + - * Maven coordinates: `org.apache.qpid:qpid-jms-client:0.39.0` +## QpidJMS Client (0.40.0) + + * Maven coordinates: `org.apache.qpid:qpid-jms-client:0.40.0` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://qpid.apache.org/qpid-jms-client - * Source: https://git-wip-us.apache.org/repos/asf?p=qpid-jms.git/qpid-jms-client + * Source: https://gitbox.apache.org/repos/asf?p=qpid-jms/qpid-jms-client + + ## Atteo Class Index (3.6) * Maven coordinates: `org.atteo.classindex:classindex:3.6` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://atteo.org/static/classindex/classindex * Source: https://github.com/atteo/classindex/classindex + + ## org.eclipse.paho.client.mqttv3 (1.2.0) * Maven coordinates: `org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0` * License: [EPL-1.0](licenses/EPL-1.0.txt) * Project: http://www.eclipse.org/paho/org.eclipse.paho.client.mqttv3 - * Source: http://git.eclipse.org/c/paho/org.eclipse.paho.mqtt.java.git/org.eclipse.paho.client.mqttv3 + * Source: https://git.eclipse.org/c/paho/org.eclipse.paho.mqtt.java/org.eclipse.paho.client.mqttv3 + + ## HdrHistogram (2.1.9) * Maven coordinates: `org.hdrhistogram:HdrHistogram:2.1.9` * License: [CC0](licenses/CC0.txt) * Project: http://hdrhistogram.github.io/HdrHistogram/ - * Source: scm:git:git://github.com/HdrHistogram/HdrHistogram.git + * Source: https://github.com/HdrHistogram/HdrHistogram + + ## LmdbJava (0.6.1) * Maven coordinates: `org.lmdbjava:lmdbjava:0.6.1` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/lmdbjava/lmdbjava/lmdbjava - * Source: git@github.com:lmdbjava/lmdbjava.git + * Source: https://github.com/lmdbjava/lmdbjava + + ## LZ4 and xxHash (1.5.0) * Maven coordinates: `org.lz4:lz4-java:1.5.0` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/lz4/lz4-java - * Source: git://github.com/lz4/lz4-java.git + * Source: https://github.com/lz4/lz4-java + + ## BSON (3.8.2) * Maven coordinates: `org.mongodb:bson:3.8.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://bsonspec.org * Source: https://github.com/mongodb/mongo-java-driver + + ## MongoDB Java Driver (3.8.2) * Maven coordinates: `org.mongodb:mongo-java-driver:3.8.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://www.mongodb.org * Source: https://github.com/mongodb/mongo-java-driver + + ## MongoDB Asynchronous Driver (3.8.2) * Maven coordinates: `org.mongodb:mongodb-driver-async:3.8.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://www.mongodb.org * Source: https://github.com/mongodb/mongo-java-driver + + ## MongoDB Java Driver Core (3.8.2) * Maven coordinates: `org.mongodb:mongodb-driver-core:3.8.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://www.mongodb.org * Source: https://github.com/mongodb/mongo-java-driver + + ## MongoDB Reactive Streams Driver (1.9.2) * Maven coordinates: `org.mongodb:mongodb-driver-reactivestreams:1.9.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://www.mongodb.org * Source: https://github.com/mongodb/mongo-java-driver-reactivestreams + + ## mongo-scala-bson (2.4.2) * Maven coordinates: `org.mongodb.scala:mongo-scala-bson_2.12:2.4.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://mongodb.github.io/mongo-scala-driver - * Source: git@github.com:mongodb/mongo-scala-driver.git + * Source: https://github.com/mongodb/mongo-scala-driver + + ## mongo-scala-driver (2.4.2) * Maven coordinates: `org.mongodb.scala:mongo-scala-driver_2.12:2.4.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://mongodb.github.io/mongo-scala-driver - * Source: git@github.com:mongodb/mongo-scala-driver.git + * Source: https://github.com/mongodb/mongo-scala-driver + + ## Mozilla Rhino (1.7.10) * Maven coordinates: `org.mozilla:rhino:1.7.10` * License: [MPL-2.0](licenses/MPL-2.0.txt) * Project: https://developer.mozilla.org/en/Rhino - * Source: git@github.com:mozilla/rhino.git + * Source: https://github.com/mozilla/rhino + + ## NanoHttpd-Core (2.3.1) * Maven coordinates: `org.nanohttpd:nanohttpd:2.3.1` * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) * Project: http://www.nanohttpd.org/nanohttpd * Source: https://github.com/NanoHttpd/nanohttpd/nanohttpd + + ## ASM Core (5.0.3) * Maven coordinates: `org.ow2.asm:asm:5.0.3` * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) * Project: http://asm.objectweb.org/asm/ - * Source: http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/asm/ + * Source: https://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/asm/ + + ## ASM Analysis (5.0.3) * Maven coordinates: `org.ow2.asm:asm-analysis:5.0.3` * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) * Project: http://asm.objectweb.org/asm-analysis/ - * Source: http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/asm-analysis/ + * Source: https://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/asm-analysis/ + + ## ASM Commons (5.0.3) * Maven coordinates: `org.ow2.asm:asm-commons:5.0.3` * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) * Project: http://asm.objectweb.org/asm-commons/ - * Source: http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/asm-commons/ + * Source: https://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/asm-commons/ + + ## ASM Tree (5.0.3) * Maven coordinates: `org.ow2.asm:asm-tree:5.0.3` * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) * Project: http://asm.objectweb.org/asm-tree/ - * Source: http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/asm-tree/ + * Source: https://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/asm-tree/ + + ## ASM Util (5.0.3) * Maven coordinates: `org.ow2.asm:asm-util:5.0.3` * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) * Project: http://asm.objectweb.org/asm-util/ - * Source: http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/asm-util/ + * Source: https://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/asm-util/ + + ## parboiled (2.1.4) * Maven coordinates: `org.parboiled:parboiled_2.12:2.1.4` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://parboiled.org - * Source: git@github.com:sirthias/parboiled2.git -## reactive-streams (1.0.1) + * Source: https://github.com/sirthias/parboiled2 + - * Maven coordinates: `org.reactivestreams:reactive-streams:1.0.1` - * License: [CC0](licenses/CC0.txt) - * Project: http://www.reactive-streams.org/ - * Source: git@github.com:reactive-streams/reactive-streams.git ## reactive-streams (1.0.2) * Maven coordinates: `org.reactivestreams:reactive-streams:1.0.2` * License: [CC0](licenses/CC0.txt) * Project: http://www.reactive-streams.org/ - * Source: git@github.com:reactive-streams/reactive-streams.git + * Source: https://github.com/reactive-streams/reactive-streams + + ## Scala Library (2.12.1) * Maven coordinates: `org.scala-lang:scala-library:2.12.1` * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) * Project: http://www.scala-lang.org/ - * Source: https://github.com/scala/scala.git -## Scala Library (2.12.6) + * Source: https://github.com/scala/scala - * Maven coordinates: `org.scala-lang:scala-library:2.12.6` - * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) + +## Scala Library (2.12.8) + + * Maven coordinates: `org.scala-lang:scala-library:2.12.8` + * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://www.scala-lang.org/ - * Source: https://github.com/scala/scala.git + * Source: https://github.com/scala/scala + + ## Scala Compiler (2.12.6) * Maven coordinates: `org.scala-lang:scala-reflect:2.12.6` * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) * Project: http://www.scala-lang.org/ - * Source: https://github.com/scala/scala.git + * Source: https://github.com/scala/scala + + ## scala-java8-compat (0.8.0) * Maven coordinates: `org.scala-lang.modules:scala-java8-compat_2.12:0.8.0` * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) * Project: http://www.scala-lang.org/ * Source: https://github.com/scala/scala-java8-compat + + ## scala-parser-combinators (1.0.4) * Maven coordinates: `org.scala-lang.modules:scala-parser-combinators_2.12:1.0.4` * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) * Project: http://www.scala-lang.org/ * Source: https://github.com/scala/scala-parser-combinators + + ## scala-parser-combinators (1.1.1) * Maven coordinates: `org.scala-lang.modules:scala-parser-combinators_2.12:1.1.1` * License: [BSD-3-Clause](licenses/BSD-3-Clause.txt) * Project: http://www.scala-lang.org/ * Source: https://github.com/scala/scala-parser-combinators + + ## SLF4J API Module (1.7.25) * Maven coordinates: `org.slf4j:slf4j-api:1.7.25` * License: [MIT](licenses/MIT.txt) * Project: http://www.slf4j.org * Source: https://github.com/qos-ch/slf4j/slf4j-api + + ## core (1.1.1) * Maven coordinates: `org.typelevel:macro-compat_2.12:1.1.1` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/milessabin/macro-compat * Source: https://github.com/milessabin/macro-compat + + ## bytebuffer (5.0.1) * Maven coordinates: `org.webjars.npm:bytebuffer:5.0.1` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://webjars.org * Source: https://github.com/dcodeIO/bytebuffer.js + + ## long (3.2.0) * Maven coordinates: `org.webjars.npm:long:3.2.0` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: http://webjars.org * Source: https://github.com/dcodeIO/long.js + + ## snappy-java (1.1.7.2) * Maven coordinates: `org.xerial.snappy:snappy-java:1.1.7.2` * License: [Apache-2.0](licenses/Apache-2.0.txt) * Project: https://github.com/xerial/snappy-java - * Source: git@github.com:xerial/snappy-java.git + * Source: https://github.com/xerial/snappy-java + + diff --git a/legal/templates/third-party-file.ftl b/legal/templates/third-party-file.ftl index 4f6dcf4ceb..feccdcb54e 100644 --- a/legal/templates/third-party-file.ftl +++ b/legal/templates/third-party-file.ftl @@ -13,7 +13,7 @@ + "\n\n * Maven coordinates: `" + p.groupId + ":" + p.artifactId + ":" + p.version + "`" + "\n * License: " + licenseFormat(licenses) + "\n * Project: " + p.url - + "\n * Source: " + (p.scm.url)!"not declared" + + "\n * Source: " + ((p.scm.url)!"not declared") ?replace('(git@|scm:git:git://|git://|http://)','https://','r') ?replace('.git','') ?replace('https://github.com:','https://github.com/') diff --git a/model/query/pom.xml b/model/query/pom.xml index 3d5130c8ad..89fff010ac 100644 --- a/model/query/pom.xml +++ b/model/query/pom.xml @@ -20,6 +20,7 @@ ditto-model-query + bundle Eclipse Ditto :: Model :: Query @@ -37,4 +38,30 @@ + + + + org.apache.felix + maven-bundle-plugin + true + + + + !org.eclipse.ditto.utils.jsr305.annotations, + org.eclipse.ditto.* + + + org.eclipse.ditto.model.query.* + + + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + + diff --git a/pom.xml b/pom.xml index e29e063cdf..2d0e045f68 100755 --- a/pom.xml +++ b/pom.xml @@ -352,7 +352,7 @@ org.codehaus.mojo license-maven-plugin - 1.16 + 1.17 org.apache.maven.plugins diff --git a/services/base/src/main/java/org/eclipse/ditto/services/base/DittoService.java b/services/base/src/main/java/org/eclipse/ditto/services/base/DittoService.java index 390414b39a..1c65973071 100644 --- a/services/base/src/main/java/org/eclipse/ditto/services/base/DittoService.java +++ b/services/base/src/main/java/org/eclipse/ditto/services/base/DittoService.java @@ -55,8 +55,8 @@ import akka.http.javadsl.Http; import akka.http.javadsl.ServerBinding; import akka.http.javadsl.server.Route; -import akka.management.AkkaManagement; import akka.management.cluster.bootstrap.ClusterBootstrap; +import akka.management.javadsl.AkkaManagement; import akka.stream.ActorMaterializer; import kamon.Kamon; import kamon.prometheus.PrometheusReporter; diff --git a/services/base/src/main/java/org/eclipse/ditto/services/base/DockerSwarmServiceDiscovery.java b/services/base/src/main/java/org/eclipse/ditto/services/base/DockerSwarmServiceDiscovery.java new file mode 100644 index 0000000000..fb52f9fa18 --- /dev/null +++ b/services/base/src/main/java/org/eclipse/ditto/services/base/DockerSwarmServiceDiscovery.java @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2017-2018 Bosch Software Innovations GmbH. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/org/documents/epl-2.0/index.php + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.eclipse.ditto.services.base; + +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; + +import akka.actor.ExtendedActorSystem; +import akka.discovery.Lookup; +import akka.discovery.ServiceDiscovery; +import akka.dispatch.Futures; +import akka.pattern.Patterns; +import scala.Option; +import scala.collection.JavaConverters; +import scala.concurrent.Future; +import scala.concurrent.duration.FiniteDuration; + +/** + * ServiceDiscovery usable for a Docker swarm based cluster. + *

+ * One speciality of a Docker swarm based cluster is that the Docker swarm DNS sets a TTL of DNS entries to 600 seconds + * (10 minutes) - so if a cluster forms and not all DNS entries are "there" from the beginning, it takes 10 minutes + * until DNS caches used by the default Akka {@link akka.discovery.dns.DnsServiceDiscovery DnsServiceDiscovery} are + * evicted and another DNS lookup is done. + *

+ * This implementation does not cache DNS entries and can therefore be used for bootstrapping in Docker swarm. + */ +public final class DockerSwarmServiceDiscovery extends ServiceDiscovery { + + private final ExtendedActorSystem system; + + /** + * Constructs a new instance of DockerSwarmServiceDiscovery. + * + * @param system the ActorSystem. + */ + public DockerSwarmServiceDiscovery(final ExtendedActorSystem system) { + this.system = system; + } + + @Override + public Future lookup(final Lookup lookup, final FiniteDuration resolveTimeout) { + + return Futures.firstCompletedOf(Arrays.asList( + resolveService(lookup), + scheduleTimeout(lookup, resolveTimeout) + ), system.dispatcher()); + } + + private Future resolveService(final Lookup lookup) { + + final String serviceName = lookup.serviceName(); + return Futures.future(() -> { + final InetAddress[] allResolvedHosts; + try { + allResolvedHosts = InetAddress.getAllByName(serviceName); + } catch (final UnknownHostException e) { + return new Resolved(serviceName, + JavaConverters.asScalaBuffer(Collections.emptyList()).toList()); + } + final List resolvedTargets = Arrays.stream(allResolvedHosts) + .map(a -> new ResolvedTarget(a.getCanonicalHostName(), Option.empty(), Option.apply(a))) + .collect(Collectors.toList()); + + final Resolved resolved = new Resolved(serviceName, JavaConverters.asScalaBuffer(resolvedTargets).toList()); + system.log().debug("[DockerSwarmServiceDiscovery] Resolved <{}> via InetAddress to: {}", lookup, + resolved); + return resolved; + }, system.dispatcher()); + } + + private Future scheduleTimeout(final Lookup lookup, final FiniteDuration resolveTimeout) { + + return Patterns.after(resolveTimeout, system.scheduler(), system.dispatcher(), + Futures.failed( + new TimeoutException("Lookup <" + lookup + "> timed out after " + resolveTimeout))); + } +} diff --git a/services/base/src/main/resources/ditto-akka-config.conf b/services/base/src/main/resources/ditto-akka-config.conf index 7dedd232d9..08fa01739e 100644 --- a/services/base/src/main/resources/ditto-akka-config.conf +++ b/services/base/src/main/resources/ditto-akka-config.conf @@ -8,33 +8,59 @@ akka { log-config-on-start = off + io.dns { + + resolver = "inet-address" + + inet-address { + # To set the time to cache name resolutions + # Possible values: + # default: sun.net.InetAddressCachePolicy.get() and getNegative() + # forever: cache forever + # never: no caching + # n [time unit]: positive timeout with unit, for example "30 s" + positive-ttl = never + negative-ttl = never + } + } + discovery { # pick the discovery method you'd like to use: method = akka-dns method = ${?DISCOVERY_METHOD} kubernetes-api { - pod-namespace = "default" // in which namespace cluster is running - pod-namespace = ${?K8S_NAMESPACE} - - pod-label-selector = "actorSystemName=ditto-cluster" - pod-label-selector = ${?K8S_LABEL_SELECTOR} + pod-label-selector = "actorSystemName=%s" + } - pod-port-name = "akka-mgmt-http" // name of cluster management port - pod-port-name = ${?K8S_MANAGEMENT_PORT} + # DNS based service discovery in docker swarm (without DNS ttl caching) + docker-swarm-dns { + class = org.eclipse.ditto.services.base.DockerSwarmServiceDiscovery } } coordinated-shutdown.exit-jvm=on management { + http { + bind-hostname = "0.0.0.0" + } + cluster.bootstrap { + + new-cluster-enabled = on + new-cluster-enabled = ${?CLUSTER_NEW_CLUSTER_ENABLED} + contact-point-discovery { service-name = "ditto-cluster" service-name = ${?CLUSTER_BS_SERVICE_NAME} service-namespace = ${?CLUSTER_BS_SERVICE_NAMESPACE} effective-name = ${?CLUSTER_BS_EFFECTIVE_NAME} + discovery-method = akka-dns + discovery-method = ${?DISCOVERY_METHOD} + discovery-method = ${?BOOTSTRAP_DISCOVERY_METHOD} + required-contact-point-nr = ${?CLUSTER_BS_REQUIRED_CONTACTS} } } diff --git a/services/concierge/starter/pom.xml b/services/concierge/starter/pom.xml index db7b974913..8ea929dfcc 100644 --- a/services/concierge/starter/pom.xml +++ b/services/concierge/starter/pom.xml @@ -104,10 +104,6 @@ com.lightbend.akka.management akka-management-cluster-bootstrap_${scala.version} - - com.lightbend.akka.discovery - akka-discovery-dns_${scala.version} - com.lightbend.akka.discovery akka-discovery-kubernetes-api_${scala.version} diff --git a/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/SocketFactoryExtension.java b/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/SocketFactoryExtension.java index c1052a4c39..f6f84997a2 100644 --- a/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/SocketFactoryExtension.java +++ b/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/SocketFactoryExtension.java @@ -20,6 +20,10 @@ */ final class SocketFactoryExtension { + private SocketFactoryExtension() { + throw new AssertionError(); + } + /** * Extend the MQTT connection settings by adding an SSL socket factory. * @@ -28,6 +32,8 @@ final class SocketFactoryExtension { * @return a copy of {@code s} with {@code sf}. */ static MqttConnectionSettings withSocketFactory(final MqttConnectionSettings s, final SSLSocketFactory sf) { + // with Alpakka-MQTT 1.0 this will become: + // return s.withSocketFactory(sf); return s.copy(s.broker(), s.clientId(), s.persistence(), s.auth(), Some.apply(sf), s.cleanSession(), s.will(), s.automaticReconnect(), s.keepAliveInterval(), s.connectionTimeout(), s.disconnectQuiesceTimeout(), s.disconnectTimeout(), s.maxInFlight(), s.mqttVersion(), s.serverUris(), s.sslHostnameVerifier(), diff --git a/services/connectivity/starter/pom.xml b/services/connectivity/starter/pom.xml index 155e1d805a..a3e42a442c 100644 --- a/services/connectivity/starter/pom.xml +++ b/services/connectivity/starter/pom.xml @@ -90,10 +90,6 @@ com.lightbend.akka.management akka-management-cluster-bootstrap_${scala.version} - - com.lightbend.akka.discovery - akka-discovery-dns_${scala.version} - com.lightbend.akka.discovery akka-discovery-kubernetes-api_${scala.version} diff --git a/services/gateway/endpoints/pom.xml b/services/gateway/endpoints/pom.xml index b9a19036de..fbee3d5d20 100755 --- a/services/gateway/endpoints/pom.xml +++ b/services/gateway/endpoints/pom.xml @@ -148,6 +148,11 @@ jjwt-api + + com.typesafe.akka + akka-testkit_${scala.version} + test + com.typesafe.akka akka-http-testkit_${scala.version} diff --git a/services/gateway/starter/pom.xml b/services/gateway/starter/pom.xml index 1213ea08e1..94b8c05ee6 100755 --- a/services/gateway/starter/pom.xml +++ b/services/gateway/starter/pom.xml @@ -126,10 +126,6 @@ com.lightbend.akka.management akka-management-cluster-bootstrap_${scala.version} - - com.lightbend.akka.discovery - akka-discovery-dns_${scala.version} - com.lightbend.akka.discovery akka-discovery-kubernetes-api_${scala.version} diff --git a/services/policies/starter/pom.xml b/services/policies/starter/pom.xml index 038478ed2c..0b829d38a8 100755 --- a/services/policies/starter/pom.xml +++ b/services/policies/starter/pom.xml @@ -97,10 +97,6 @@ com.lightbend.akka.management akka-management-cluster-bootstrap_${scala.version} - - com.lightbend.akka.discovery - akka-discovery-dns_${scala.version} - com.lightbend.akka.discovery akka-discovery-kubernetes-api_${scala.version} diff --git a/services/things/starter/pom.xml b/services/things/starter/pom.xml index 21f0d1431b..efe3a7bc18 100755 --- a/services/things/starter/pom.xml +++ b/services/things/starter/pom.xml @@ -97,10 +97,6 @@ com.lightbend.akka.management akka-management-cluster-bootstrap_${scala.version} - - com.lightbend.akka.discovery - akka-discovery-dns_${scala.version} - com.lightbend.akka.discovery akka-discovery-kubernetes-api_${scala.version} diff --git a/services/thingsearch/starter/pom.xml b/services/thingsearch/starter/pom.xml index 88217509bd..6d614920bf 100755 --- a/services/thingsearch/starter/pom.xml +++ b/services/thingsearch/starter/pom.xml @@ -101,10 +101,6 @@ com.lightbend.akka.management akka-management-cluster-bootstrap_${scala.version} - - com.lightbend.akka.discovery - akka-discovery-dns_${scala.version} - com.lightbend.akka.discovery akka-discovery-kubernetes-api_${scala.version} diff --git a/services/utils/cluster/src/main/java/org/eclipse/ditto/services/utils/cluster/AbstractJsonifiableWithDittoHeadersSerializer.java b/services/utils/cluster/src/main/java/org/eclipse/ditto/services/utils/cluster/AbstractJsonifiableWithDittoHeadersSerializer.java index 5c63fc7eb8..2accccd472 100755 --- a/services/utils/cluster/src/main/java/org/eclipse/ditto/services/utils/cluster/AbstractJsonifiableWithDittoHeadersSerializer.java +++ b/services/utils/cluster/src/main/java/org/eclipse/ditto/services/utils/cluster/AbstractJsonifiableWithDittoHeadersSerializer.java @@ -133,10 +133,14 @@ public void toBinary(final Object object, final ByteBuffer buf) { } jsonObjectBuilder.set(JSON_PAYLOAD, jsonValue); + final String jsonStr = jsonObjectBuilder.build().toString(); - buf.put(UTF8_CHARSET.encode(jsonObjectBuilder.build() - .toString()) - ); + try { + buf.put(UTF8_CHARSET.encode(jsonStr)); + } catch (final BufferOverflowException e) { + LOG.warn("Could not put bytes of JSON string <{}> into ByteBuffer due to BufferOverflow", jsonStr, e); + throw e; + } } else { LOG.error("Could not serialize class <{}> as it does not implement <{}>!", object.getClass(), Jsonifiable.WithPredicate.class);