diff --git a/.3rd-party/compile.txt b/.3rd-party/compile.txt index c10dace2b..ffa5afe3a 100644 --- a/.3rd-party/compile.txt +++ b/.3rd-party/compile.txt @@ -6,7 +6,6 @@ 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 @@ -35,7 +34,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.5.RELEASE:compile +io.projectreactor:reactor-core:jar:3.2.6.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 @@ -48,8 +47,8 @@ javax.validation:validation-api:jar:2.0.1.Final:compile javax.validation:validation-api:jar:sources:1.0.0.GA:compile javax.websocket:javax.websocket-api:jar:1.1:compile org.apache.commons:commons-lang3:jar:3.7:compile -org.apache.logging.log4j:log4j-api:jar:2.11.1:compile -org.apache.logging.log4j:log4j-to-slf4j:jar:2.11.1: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.jboss.logging:jboss-logging:jar:3.3.2.Final:compile @@ -62,52 +61,52 @@ 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.3.RELEASE:compile -org.springframework.amqp:spring-rabbit:jar:2.1.3.RELEASE:compile -org.springframework.boot:spring-boot-autoconfigure:jar:2.1.2.RELEASE:compile -org.springframework.boot:spring-boot-starter-aop:jar:2.1.2.RELEASE:compile -org.springframework.boot:spring-boot-starter-data-jpa:jar:2.1.2.RELEASE:compile -org.springframework.boot:spring-boot-starter-jdbc:jar:2.1.2.RELEASE:compile -org.springframework.boot:spring-boot-starter-jetty:jar:2.1.2.RELEASE:compile -org.springframework.boot:spring-boot-starter-json:jar:2.1.2.RELEASE:compile -org.springframework.boot:spring-boot-starter-logging:jar:2.1.2.RELEASE:compile -org.springframework.boot:spring-boot-starter-validation:jar:2.1.2.RELEASE:compile -org.springframework.boot:spring-boot-starter-web:jar:2.1.2.RELEASE:compile -org.springframework.boot:spring-boot-starter:jar:2.1.2.RELEASE:compile -org.springframework.boot:spring-boot:jar:2.1.2.RELEASE: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.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-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.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.4.RELEASE:compile -org.springframework.data:spring-data-jpa:jar:2.1.4.RELEASE:compile -org.springframework.hateoas:spring-hateoas:jar:0.25.0.RELEASE:compile -org.springframework.integration:spring-integration-core:jar:5.1.2.RELEASE:compile -org.springframework.integration:spring-integration-jmx:jar:5.1.2.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.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-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.3.RELEASE:compile -org.springframework.security:spring-security-aspects:jar:5.1.3.RELEASE:compile -org.springframework.security:spring-security-config:jar:5.1.3.RELEASE:compile -org.springframework.security:spring-security-core:jar:5.1.3.RELEASE:compile -org.springframework.security:spring-security-crypto:jar:5.1.3.RELEASE:compile -org.springframework.security:spring-security-web:jar:5.1.3.RELEASE:compile -org.springframework:spring-aop:jar:5.1.4.RELEASE:compile -org.springframework:spring-aspects:jar:5.1.4.RELEASE:compile -org.springframework:spring-beans:jar:5.1.4.RELEASE:compile -org.springframework:spring-context-support:jar:5.1.4.RELEASE:compile -org.springframework:spring-context:jar:5.1.4.RELEASE:compile -org.springframework:spring-core:jar:5.1.4.RELEASE:compile -org.springframework:spring-expression:jar:5.1.4.RELEASE:compile -org.springframework:spring-jcl:jar:5.1.4.RELEASE:compile -org.springframework:spring-jdbc:jar:5.1.4.RELEASE:compile -org.springframework:spring-messaging:jar:5.1.4.RELEASE:compile -org.springframework:spring-orm:jar:5.1.4.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:spring-tuple:jar:1.0.0.RELEASE:compile -org.springframework:spring-tx:jar:5.1.4.RELEASE:compile -org.springframework:spring-web:jar:5.1.4.RELEASE:compile -org.springframework:spring-webmvc:jar:5.1.4.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.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 cbd806794..c586d5e39 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.7:test -net.bytebuddy:byte-buddy:jar:1.9.7:test +net.bytebuddy:byte-buddy-agent:jar:1.9.10:test +net.bytebuddy:byte-buddy:jar:1.9.10: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 @@ -32,10 +32,10 @@ net.sourceforge.htmlunit:htmlunit:jar:2.33:test net.sourceforge.htmlunit:neko-htmlunit:jar:2.33:test org.apache.commons:commons-text:jar:1.4:test org.apache.httpcomponents:httpclient:jar:4.5.6:test -org.apache.httpcomponents:httpcore:jar:4.4.10: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.14:test +org.apache.tomcat.embed:tomcat-embed-el:jar:9.0.16: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 @@ -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.3.RELEASE:test -org.springframework.amqp:spring-rabbit-test:jar:2.1.3.RELEASE:test -org.springframework.boot:spring-boot-starter-test:jar:2.1.2.RELEASE:test -org.springframework.boot:spring-boot-test-autoconfigure:jar:2.1.2.RELEASE:test -org.springframework.boot:spring-boot-test:jar:2.1.2.RELEASE: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.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.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.2.RELEASE:test -org.springframework.integration:spring-integration-test:jar:5.1.2.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.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.4.RELEASE:test +org.springframework:spring-test:jar:5.1.5.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-runtime/hawkbit-update-server/src/main/resources/banner.txt b/hawkbit-runtime/hawkbit-update-server/src/main/resources/banner.txt new file mode 100644 index 000000000..fca127758 --- /dev/null +++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/banner.txt @@ -0,0 +1,14 @@ + ______ _ _ _ _ ____ _ _ + | ____| | (_) | | | | | _ \(_) | + | |__ ___| |_ _ __ ___ ___ | |__ __ ___ _| | _| |_) |_| |_ + | __| / __| | | '_ \/ __|/ _ \ | '_ \ / _` \ \ /\ / / |/ / _ <| | __| + | |___| (__| | | |_) \__ \ __/ | | | | (_| |\ V V /| <| |_) | | |_ + |______\___|_|_| .__/|___/\___| |_| |_|\__,_| \_/\_/ |_|\_\____/|_|\__| + | | + |_| + +Eclipse hawkBit Update Server ${application.formatted-version} +using Spring Boot ${spring-boot.formatted-version} + +Go to https://www.eclipse.org/hawkbit for more information. + \ No newline at end of file diff --git a/pom.xml b/pom.xml index fcb259d94..9e90f3a49 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.2.RELEASE + 2.1.3.RELEASE org.eclipse.hawkbit @@ -128,7 +128,7 @@ 1.8 - 2.1.2.RELEASE + 2.1.3.RELEASE Greenwich.RELEASE true @@ -142,6 +142,8 @@ 3.7 1.3.4 + + 4.5.6 @@ -324,6 +326,8 @@ licenses/LICENSE_HEADER_TEMPLATE_BOSCH_18.txt + **/banner.txt + **/helm/** **/README .3rd-party/** .github/**