diff --git a/.3rd-party/compile.txt b/.3rd-party/compile.txt index ffa5afe3a..0bf20e358 100644 --- a/.3rd-party/compile.txt +++ b/.3rd-party/compile.txt @@ -6,6 +6,7 @@ com.esotericsoftware:minlog:jar:1.3.0:compile com.fasterxml.jackson.core:jackson-annotations:jar:2.9.0:compile com.fasterxml.jackson.core:jackson-core:jar:2.9.8:compile com.fasterxml.jackson.core:jackson-databind:jar:2.9.8:compile +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:2.9.8:compile com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.9.8:compile com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.9.8:compile com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.9.8:compile @@ -15,7 +16,7 @@ com.github.gwtd3:gwt-d3-api:jar:1.2.0:compile com.github.gwtd3:gwt-d3-js:jar:3.5.11:compile com.github.gwtd3:gwt-d3-js:jar:sources:3.5.11:compile com.google.guava:guava:jar:25.0-jre:compile -com.h2database:h2:jar:1.4.197:compile +com.h2database:h2:jar:1.4.199:compile com.microsoft.sqlserver:mssql-jdbc:jar:6.4.0.jre8:compile com.rabbitmq:amqp-client:jar:5.4.3:compile com.vaadin.external.atmosphere:atmosphere-runtime:jar:2.2.9.vaadin2:compile @@ -34,7 +35,7 @@ com.vaadin:vaadin-themes:jar:7.7.13:compile com.zaxxer:HikariCP:jar:3.2.0:compile commons-io:commons-io:jar:2.5:compile cz.jirutka.rsql:rsql-parser:jar:2.1.0:compile -io.projectreactor:reactor-core:jar:3.2.6.RELEASE:compile +io.projectreactor:reactor-core:jar:3.2.8.RELEASE:compile io.protostuff:protostuff-api:jar:1.5.6:compile io.protostuff:protostuff-collectionschema:jar:1.5.6:compile io.protostuff:protostuff-core:jar:1.5.6:compile @@ -50,7 +51,7 @@ org.apache.commons:commons-lang3:jar:3.7:compile org.apache.logging.log4j:log4j-api:jar:2.11.2:compile org.apache.logging.log4j:log4j-to-slf4j:jar:2.11.2:compile org.flywaydb:flyway-core:jar:5.2.4:compile -org.hibernate.validator:hibernate-validator:jar:6.0.14.Final:compile +org.hibernate.validator:hibernate-validator:jar:6.0.16.Final:compile org.jboss.logging:jboss-logging:jar:3.3.2.Final:compile org.jsoup:jsoup:jar:1.8.3:compile org.mortbay.jasper:apache-el:jar:8.5.35.1:compile @@ -59,54 +60,54 @@ org.ow2.asm:asm-commons:jar:7.0:compile org.ow2.asm:asm-tree:jar:7.0:compile org.ow2.asm:asm:jar:7.0:compile org.reactivestreams:reactive-streams:jar:1.0.2:compile -org.slf4j:jul-to-slf4j:jar:1.7.25:compile -org.slf4j:slf4j-api:jar:1.7.25:compile -org.springframework.amqp:spring-amqp:jar:2.1.4.RELEASE:compile -org.springframework.amqp:spring-rabbit:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-autoconfigure:jar:2.1.3.RELEASE:compile -org.springframework.boot:spring-boot-starter-aop:jar:2.1.3.RELEASE:compile +org.slf4j:jul-to-slf4j:jar:1.7.26:compile +org.slf4j:slf4j-api:jar:1.7.26:compile +org.springframework.amqp:spring-amqp:jar:2.1.5.RELEASE:compile +org.springframework.amqp:spring-rabbit:jar:2.1.5.RELEASE:compile +org.springframework.boot:spring-boot-autoconfigure:jar:2.1.4.RELEASE:compile +org.springframework.boot:spring-boot-starter-aop:jar:2.1.4.RELEASE:compile org.springframework.boot:spring-boot-starter-data-jpa:jar:2.1.3.RELEASE:compile -org.springframework.boot:spring-boot-starter-jdbc:jar:2.1.3.RELEASE:compile -org.springframework.boot:spring-boot-starter-jetty:jar:2.1.3.RELEASE:compile -org.springframework.boot:spring-boot-starter-json:jar:2.1.3.RELEASE:compile -org.springframework.boot:spring-boot-starter-logging:jar:2.1.3.RELEASE:compile -org.springframework.boot:spring-boot-starter-validation:jar:2.1.3.RELEASE:compile +org.springframework.boot:spring-boot-starter-jdbc:jar:2.1.4.RELEASE:compile +org.springframework.boot:spring-boot-starter-jetty:jar:2.1.4.RELEASE:compile +org.springframework.boot:spring-boot-starter-json:jar:2.1.4.RELEASE:compile +org.springframework.boot:spring-boot-starter-logging:jar:2.1.4.RELEASE:compile +org.springframework.boot:spring-boot-starter-validation:jar:2.1.4.RELEASE:compile org.springframework.boot:spring-boot-starter-web:jar:2.1.3.RELEASE:compile org.springframework.boot:spring-boot-starter:jar:2.1.3.RELEASE:compile -org.springframework.boot:spring-boot:jar:2.1.3.RELEASE:compile +org.springframework.boot:spring-boot:jar:2.1.4.RELEASE:compile org.springframework.cloud:spring-cloud-bus:jar:2.1.0.RELEASE:compile org.springframework.cloud:spring-cloud-commons:jar:2.1.0.RELEASE:compile org.springframework.cloud:spring-cloud-context:jar:2.1.0.RELEASE:compile org.springframework.cloud:spring-cloud-starter:jar:2.1.0.RELEASE:compile org.springframework.cloud:spring-cloud-stream:jar:2.1.0.RELEASE:compile -org.springframework.data:spring-data-commons:jar:2.1.5.RELEASE:compile -org.springframework.data:spring-data-jpa:jar:2.1.5.RELEASE:compile +org.springframework.data:spring-data-commons:jar:2.1.6.RELEASE:compile +org.springframework.data:spring-data-jpa:jar:2.1.6.RELEASE:compile org.springframework.hateoas:spring-hateoas:jar:0.25.1.RELEASE:compile -org.springframework.integration:spring-integration-core:jar:5.1.3.RELEASE:compile -org.springframework.integration:spring-integration-jmx:jar:5.1.3.RELEASE:compile +org.springframework.integration:spring-integration-core:jar:5.1.4.RELEASE:compile +org.springframework.integration:spring-integration-jmx:jar:5.1.4.RELEASE:compile org.springframework.integration:spring-integration-tuple:jar:1.0.0.RELEASE:compile org.springframework.plugin:spring-plugin-core:jar:1.2.0.RELEASE:compile org.springframework.retry:spring-retry:jar:1.2.4.RELEASE:compile -org.springframework.security:spring-security-aspects:jar:5.1.4.RELEASE:compile -org.springframework.security:spring-security-config:jar:5.1.4.RELEASE:compile -org.springframework.security:spring-security-core:jar:5.1.4.RELEASE:compile -org.springframework.security:spring-security-crypto:jar:5.1.4.RELEASE:compile -org.springframework.security:spring-security-web:jar:5.1.4.RELEASE:compile -org.springframework:spring-aop:jar:5.1.5.RELEASE:compile -org.springframework:spring-aspects:jar:5.1.5.RELEASE:compile -org.springframework:spring-beans:jar:5.1.5.RELEASE:compile -org.springframework:spring-context-support:jar:5.1.5.RELEASE:compile -org.springframework:spring-context:jar:5.1.5.RELEASE:compile -org.springframework:spring-core:jar:5.1.5.RELEASE:compile -org.springframework:spring-expression:jar:5.1.5.RELEASE:compile -org.springframework:spring-jcl:jar:5.1.5.RELEASE:compile -org.springframework:spring-jdbc:jar:5.1.5.RELEASE:compile -org.springframework:spring-messaging:jar:5.1.5.RELEASE:compile -org.springframework:spring-orm:jar:5.1.5.RELEASE:compile +org.springframework.security:spring-security-aspects:jar:5.1.5.RELEASE:compile +org.springframework.security:spring-security-config:jar:5.1.5.RELEASE:compile +org.springframework.security:spring-security-core:jar:5.1.5.RELEASE:compile +org.springframework.security:spring-security-crypto:jar:5.1.5.RELEASE:compile +org.springframework.security:spring-security-web:jar:5.1.5.RELEASE:compile +org.springframework:spring-aop:jar:5.1.6.RELEASE:compile +org.springframework:spring-aspects:jar:5.1.6.RELEASE:compile +org.springframework:spring-beans:jar:5.1.6.RELEASE:compile +org.springframework:spring-context-support:jar:5.1.6.RELEASE:compile +org.springframework:spring-context:jar:5.1.6.RELEASE:compile +org.springframework:spring-core:jar:5.1.6.RELEASE:compile +org.springframework:spring-expression:jar:5.1.6.RELEASE:compile +org.springframework:spring-jcl:jar:5.1.6.RELEASE:compile +org.springframework:spring-jdbc:jar:5.1.6.RELEASE:compile +org.springframework:spring-messaging:jar:5.1.6.RELEASE:compile +org.springframework:spring-orm:jar:5.1.6.RELEASE:compile org.springframework:spring-tuple:jar:1.0.0.RELEASE:compile -org.springframework:spring-tx:jar:5.1.5.RELEASE:compile -org.springframework:spring-web:jar:5.1.5.RELEASE:compile -org.springframework:spring-webmvc:jar:5.1.5.RELEASE:compile +org.springframework:spring-tx:jar:5.1.6.RELEASE:compile +org.springframework:spring-web:jar:5.1.6.RELEASE:compile +org.springframework:spring-webmvc:jar:5.1.6.RELEASE:compile org.vaadin.addons.lazyquerycontainer:vaadin-lazyquerycontainer:jar:7.6.1.3:compile org.vaadin.addons:flexibleoptiongroup:jar:2.2.0:compile org.vaadin.addons:tokenfield:jar:7.0.1:compile diff --git a/.3rd-party/test.txt b/.3rd-party/test.txt index c586d5e39..dd79e1ab1 100644 --- a/.3rd-party/test.txt +++ b/.3rd-party/test.txt @@ -22,8 +22,8 @@ io.qameta.allure:allure2-model-pojo:jar:1.0.0:test javax.el:javax.el-api:jar:2.2.4:test junit:junit:jar:4.12:test net._01001111:jlorem:jar:1.1:test -net.bytebuddy:byte-buddy-agent:jar:1.9.10:test -net.bytebuddy:byte-buddy:jar:1.9.10:test +net.bytebuddy:byte-buddy-agent:jar:1.9.12:test +net.bytebuddy:byte-buddy:jar:1.9.12:test net.minidev:accessors-smart:jar:1.2:test net.minidev:json-smart:jar:2.3:test net.sourceforge.htmlunit:htmlunit-core-js:jar:2.33:test @@ -35,7 +35,7 @@ org.apache.httpcomponents:httpclient:jar:4.5.6:test org.apache.httpcomponents:httpcore:jar:4.4.11:test org.apache.httpcomponents:httpmime:jar:4.5.6:test org.apache.tika:tika-core:jar:1.14:test -org.apache.tomcat.embed:tomcat-embed-el:jar:9.0.16:test +org.apache.tomcat.embed:tomcat-embed-el:jar:9.0.17:test org.aspectj:aspectjrt:jar:1.9.2:test org.aspectj:aspectjweaver:jar:1.9.2:test org.assertj:assertj-core:jar:3.11.1:test @@ -47,7 +47,7 @@ org.javassist:javassist:jar:3.22.0-GA:test org.jooq:joor-java-8:jar:0.9.9:test org.mariadb.jdbc:mariadb-java-client:jar:2.3.0:test org.mockito:mockito-core:jar:2.23.4:test -org.mortbay.jasper:apache-jsp:jar:8.5.33.1:test +org.mortbay.jasper:apache-jsp:jar:8.5.35.1:test org.objenesis:objenesis:jar:2.6:test org.ow2.asm:asm-commons:jar:5.0.3:test org.ow2.asm:asm-tree:jar:5.0.3:test @@ -55,20 +55,20 @@ org.ow2.asm:asm-util:jar:5.0.3:test org.ow2.asm:asm:jar:5.0.3:test org.ow2.asm:asm:jar:5.0.4:test org.skyscreamer:jsonassert:jar:1.5.0:test -org.springframework.amqp:spring-rabbit-junit:jar:2.1.4.RELEASE:test -org.springframework.amqp:spring-rabbit-test:jar:2.1.4.RELEASE:test +org.springframework.amqp:spring-rabbit-junit:jar:2.1.5.RELEASE:test +org.springframework.amqp:spring-rabbit-test:jar:2.1.5.RELEASE:test org.springframework.boot:spring-boot-starter-test:jar:2.1.3.RELEASE:test -org.springframework.boot:spring-boot-test-autoconfigure:jar:2.1.3.RELEASE:test -org.springframework.boot:spring-boot-test:jar:2.1.3.RELEASE:test +org.springframework.boot:spring-boot-test-autoconfigure:jar:2.1.4.RELEASE:test +org.springframework.boot:spring-boot-test:jar:2.1.4.RELEASE:test org.springframework.cloud:spring-cloud-function-context:jar:2.0.0.RELEASE:test org.springframework.cloud:spring-cloud-function-core:jar:2.0.0.RELEASE:test org.springframework.cloud:spring-cloud-stream-binder-test:jar:2.1.0.RELEASE:test org.springframework.cloud:spring-cloud-stream-test-support:jar:2.1.0.RELEASE:test -org.springframework.integration:spring-integration-test-support:jar:5.1.3.RELEASE:test -org.springframework.integration:spring-integration-test:jar:5.1.3.RELEASE:test +org.springframework.integration:spring-integration-test-support:jar:5.1.4.RELEASE:test +org.springframework.integration:spring-integration-test:jar:5.1.4.RELEASE:test org.springframework.restdocs:spring-restdocs-core:jar:2.0.3.RELEASE:test org.springframework.restdocs:spring-restdocs-mockmvc:jar:2.0.3.RELEASE:test -org.springframework:spring-test:jar:5.1.5.RELEASE:test +org.springframework:spring-test:jar:5.1.6.RELEASE:test org.xmlunit:xmlunit-core:jar:2.6.2:test org.yaml:snakeyaml:jar:1.23:test tapestry:tapestry:jar:4.0.2:test diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java index 011ed0309..58592b566 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java @@ -34,6 +34,7 @@ import com.vaadin.navigator.ViewProvider; import com.vaadin.server.ClientConnector.DetachListener; import com.vaadin.server.Responsive; import com.vaadin.server.VaadinRequest; +import com.vaadin.spring.navigator.SpringNavigator; import com.vaadin.spring.navigator.SpringViewProvider; import com.vaadin.ui.Alignment; import com.vaadin.ui.Component; @@ -201,7 +202,7 @@ public abstract class AbstractHawkbitUI extends UI implements DetachListener { return cssLayout; } - private class ManagementViewProvider implements ViewProvider { + private class ManagementViewProvider extends SpringNavigator implements ViewProvider { private static final long serialVersionUID = 1L; diff --git a/pom.xml b/pom.xml index bf92ce684..438569e5a 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.1.4.RELEASE org.eclipse.hawkbit