100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Fixed Java deb versions, minor warning fixes
Christian Bauer9ab2c3199834
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfileindex 0aa1fe86a..612928c4c 100644--- a/keycloak/Dockerfile+++ b/keycloak/Dockerfile@@ -31,7 +31,8 @@ ENV JAVA_DEBIAN_VERSION 8u181-b13-2~deb9u1# see https://bugs.debian.org/775775# and https://github.com/docker-library/java/issues/19#issuecomment-70546872-ENV CA_CERTIFICATES_JAVA_VERSION 20170531+nmu1+# and https://packages.debian.org/stretch/ca-certificates-java+ENV CA_CERTIFICATES_JAVA_VERSION 20170929~deb9u1RUN set -ex; \\diff --git a/keycloak/dev.Dockerfile b/keycloak/dev.Dockerfileindex 1d31bd761..b6c7f3970 100644--- a/keycloak/dev.Dockerfile+++ b/keycloak/dev.Dockerfile@@ -31,7 +31,8 @@ ENV JAVA_DEBIAN_VERSION 8u181-b13-2~deb9u1# see https://bugs.debian.org/775775# and https://github.com/docker-library/java/issues/19#issuecomment-70546872-ENV CA_CERTIFICATES_JAVA_VERSION 20170531+nmu1+# and https://packages.debian.org/stretch/ca-certificates-java+ENV CA_CERTIFICATES_JAVA_VERSION 20170929~deb9u1RUN set -ex; \\diff --git a/manager/Dockerfile b/manager/Dockerfileindex fad5dd0fb..338422ee2 100644--- a/manager/Dockerfile+++ b/manager/Dockerfile@@ -35,7 +35,8 @@ ENV JAVA_DEBIAN_VERSION 8u181-b13-2~deb9u1# see https://bugs.debian.org/775775# and https://github.com/docker-library/java/issues/19#issuecomment-70546872-ENV CA_CERTIFICATES_JAVA_VERSION 20170531+nmu1+# and https://packages.debian.org/stretch/ca-certificates-java+ENV CA_CERTIFICATES_JAVA_VERSION 20170929~deb9u1RUN set -ex; \\diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.javaindex c818c246e..9cd99b03d 100644--- a/manager/src/main/java/org/openremote/manager/map/MapService.java+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java@@ -177,6 +177,7 @@ public class MapService implements ContainerService {.host(tileServerHost).port(tileServerPort);+ @SuppressWarnings("deprecation")ProxyHandler proxyHandler = new ProxyHandler(new io.undertow.server.handlers.proxy.SimpleProxyClientProvider(tileServerUri.build()),getInteger(container.getConfig(), MAP_TILESERVER_REQUEST_TIMEOUT, MAP_TILESERVER_REQUEST_TIMEOUT_DEFAULT),diff --git a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.javaindex 1d0e62814..3b303e51d 100644--- a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java+++ b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java@@ -59,11 +59,12 @@ public class AssetQueryPredicate implements Predicate<AssetState> {final protected AssetStorageService assetStorageService;// TODO: Remove this ctor once asset queries merged+ @SuppressWarnings("unchecked")public AssetQueryPredicate(TimerService timerService, AssetStorageService assetStorageService, BaseAssetQuery query) {this.timerService = timerService;this.assetStorageService = assetStorageService;this.query = new NewAssetQuery();- this.query.ids = query.ids != null ? (String[])query.ids.toArray(new String[query.ids.size()]) : null;+ this.query.ids = query.ids != null ? (String[])query.ids.toArray(new String[0]) : null;this.query.names = query.name != null ? new StringPredicate[] {query.name} : null;this.query.parents = query.parent != null ? new ParentPredicate[] {query.parent} : null;this.query.paths = query.path != null ? new PathPredicate[] {query.path} : null;