Browse Source

Merge branch 'master' of github.com:thingsboard/thingsboard

pull/4901/head
Andrii Shvaika 5 years ago
parent
commit
a91d23351f
  1. 5
      docker/tb-coap-transport.env
  2. 5
      docker/tb-http-transport.env
  3. 3
      docker/tb-lwm2m-transport.env
  4. 5
      docker/tb-mqtt-transport.env
  5. 3
      docker/tb-snmp-transport.env
  6. 8
      transport/lwm2m/pom.xml

5
docker/tb-coap-transport.env

@ -9,4 +9,7 @@ METRICS_ENABLED=true
METRICS_ENDPOINTS_EXPOSE=prometheus METRICS_ENDPOINTS_EXPOSE=prometheus
WEB_APPLICATION_ENABLE=true WEB_APPLICATION_ENABLE=true
WEB_APPLICATION_TYPE=servlet WEB_APPLICATION_TYPE=servlet
HTTP_BIND_PORT=8081 HTTP_BIND_PORT=8081
CACHE_TYPE=redis
REDIS_HOST=redis

5
docker/tb-http-transport.env

@ -6,4 +6,7 @@ HTTP_BIND_PORT=8081
HTTP_REQUEST_TIMEOUT=60000 HTTP_REQUEST_TIMEOUT=60000
METRICS_ENABLED=true METRICS_ENABLED=true
METRICS_ENDPOINTS_EXPOSE=prometheus METRICS_ENDPOINTS_EXPOSE=prometheus
CACHE_TYPE=redis
REDIS_HOST=redis

3
docker/tb-lwm2m-transport.env

@ -10,3 +10,6 @@ METRICS_ENDPOINTS_EXPOSE=prometheus
WEB_APPLICATION_ENABLE=true WEB_APPLICATION_ENABLE=true
WEB_APPLICATION_TYPE=servlet WEB_APPLICATION_TYPE=servlet
HTTP_BIND_PORT=8081 HTTP_BIND_PORT=8081
CACHE_TYPE=redis
REDIS_HOST=redis

5
docker/tb-mqtt-transport.env

@ -9,4 +9,7 @@ METRICS_ENABLED=true
METRICS_ENDPOINTS_EXPOSE=prometheus METRICS_ENDPOINTS_EXPOSE=prometheus
WEB_APPLICATION_ENABLE=true WEB_APPLICATION_ENABLE=true
WEB_APPLICATION_TYPE=servlet WEB_APPLICATION_TYPE=servlet
HTTP_BIND_PORT=8081 HTTP_BIND_PORT=8081
CACHE_TYPE=redis
REDIS_HOST=redis

3
docker/tb-snmp-transport.env

@ -6,3 +6,6 @@ METRICS_ENDPOINTS_EXPOSE=prometheus
WEB_APPLICATION_ENABLE=true WEB_APPLICATION_ENABLE=true
WEB_APPLICATION_TYPE=servlet WEB_APPLICATION_TYPE=servlet
HTTP_BIND_PORT=8081 HTTP_BIND_PORT=8081
CACHE_TYPE=redis
REDIS_HOST=redis

8
transport/lwm2m/pom.xml

@ -45,10 +45,10 @@
</properties> </properties>
<dependencies> <dependencies>
<!-- <dependency>--> <dependency>
<!-- <groupId>org.thingsboard.common.transport</groupId>--> <groupId>org.springframework.boot</groupId>
<!-- <artifactId>transport-api</artifactId>--> <artifactId>spring-boot-starter-web</artifactId>
<!-- </dependency>--> </dependency>
<dependency> <dependency>
<groupId>org.thingsboard.common.transport</groupId> <groupId>org.thingsboard.common.transport</groupId>
<artifactId>lwm2m</artifactId> <artifactId>lwm2m</artifactId>

Loading…
Cancel
Save