diff --git a/3rd-dependencies/Release_0_2_0.md b/3rd-dependencies/Release_0_2_0.md new file mode 100644 index 000000000..069ab2e75 --- /dev/null +++ b/3rd-dependencies/Release_0_2_0.md @@ -0,0 +1,178 @@ +# 3rd party dependencies for Release 0.2.0 + +## Eclipse CQs - Provided/compile + +| Group ID | Artifact ID | Version | CQ | +|---|---|---|---| +|aopalliance|aopalliance|1.0| [CQ10346](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10346) | +|ch.qos.logback|logback-classic|1.1.3| [CQ10347](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10347) | +|ch.qos.logback|logback-core|1.1.3| [CQ12925](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12925) | +|com.fasterxml.jackson.core|jackson-annotations|2.8.2| [CQ12927](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12927) | +|com.fasterxml.jackson.core|jackson-core|2.8.2| [CQ12928](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12928) | +|com.fasterxml.jackson.core|jackson-databind|2.8.2| [CQ12930](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12930) | +|com.fasterxml|classmate|1.3.3| [CQ10368](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10368) | +|com.github.gwtd3|gwt-d3-api|1.2.0| [CQ13029](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13029) | +|com.github.gwtd3|gwt-d3-js|3.5.11| [CQ13030](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13030) | +|com.google.guava|guava|19.0| [CQ12931](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12931) | +|com.h2database|h2|1.4.186| [CQ10365](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10365) | +|com.rabbitmq|amqp-client|4.0.2| [CQ13041](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13041) | +|com.rabbitmq|http-client|1.1.1.RELEASE| [CQ13042](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13042) | +|com.vaadin.external.atmosphere|atmosphere-runtime|2.2.9.vaadin2| [CQ10714](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10714) | +|com.vaadin.external.flute|flute|1.3.0.gg2| [CQ11039](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11039) | +|com.vaadin.external.gwt|gwt-elemental|2.7.0.vaadin4| [CQ13031](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13031) | +|com.vaadin.external.gwt|gwt-user|2.7.0.vaadin4| [CQ13033](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13033) | +|com.vaadin.external.slf4j|vaadin-slf4j-jdk14|1.6.1| [CQ10715](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10715) | +|com.vaadin|vaadin-client|7.7.7| [CQ12956](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12956) | +|com.vaadin|vaadin-push|7.7.7| [CQ12957](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12957) | +|com.vaadin|vaadin-sass-compiler|0.9.12| [CQ12958](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12958) | +|com.vaadin|vaadin-server|7.7.7| [CQ12959](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12959) | +|com.vaadin|vaadin-shared|7.7.7| [CQ12960](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12960) | +|com.vaadin|vaadin-spring-boot|1.1.1| [CQ12962](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12962) | +|com.vaadin|vaadin-spring|1.1.1| [CQ12963](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12963) | +|com.vaadin|vaadin-themes|7.7.7| [CQ12961](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12961) | +|commons-codec|commons-codec|1.10| [CQ12933](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12933) | +|commons-io|commons-io|2.4| [CQ10354](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10354) | +|cz.jirutka.rsql|rsql-parser|2.1.0| [CQ12964](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12964) | +|io.protostuff|protostuff-api|1.5.3| [CQ12965](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12965) | +|io.protostuff|protostuff-collectionschema|1.5.3| [CQ12966](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12966) | +|io.protostuff|protostuff-core|1.5.3| [CQ12967](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12967) | +|io.protostuff|protostuff-runtime|1.5.3| [CQ12968](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12968) | +|javax.annotation|javax.annotation-api|1.2| [CQ12934](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12934) | +|javax.servlet|javax.servlet-api|3.1.0| [CQ10362](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10362) | +|javax.transaction|javax.transaction-api|1.2| [CQ10363](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10363) | +|javax.validation|validation-api|1.1.0.Final| [CQ10364](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10364) | +|javax.validation|validation-api|sources| [CQ10364](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10364) | +|javax.websocket|javax.websocket-api|1.0| [CQ12943](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12943) | +|org.apache.commons|commons-lang3|3.4| [CQ10356](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10356) | +|org.apache.httpcomponents|httpclient|4.5.2| [CQ12941](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12941) | +|org.apache.httpcomponents|httpcore|4.4.6| [CQ12942](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12942) | +|org.apache.tomcat.embed|tomcat-embed-el|8.0.28| [CQ11060](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11060) | +|org.apache.tomcat|tomcat-jdbc|8.0.28| [CQ10617](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10617) | +|org.apache.tomcat|tomcat-juli|8.0.28| [CQ10618](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10618) | +|org.flywaydb|flyway-core|4.0.3| [CQ12947](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12947) | +|org.glassfish|javax.json|1.0.4| [CQ10619](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10619) | +|org.hibernate|hibernate-validator|5.2.2.Final| [CQ10371](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10371) | +|org.jboss.logging|jboss-logging|3.2.1.Final| [CQ10621](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10621) | +|org.jsoup|jsoup|1.8.3| [CQ12936](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12936) | +|org.ow2.asm|asm-commons|5.0.1| [CQ12945](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12945) | +|org.ow2.asm|asm-tree|5.0.1| [CQ12945](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12945) | +|org.ow2.asm|asm|5.0.1| [CQ12945](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12945) | +|org.slf4j|jcl-over-slf4j|1.7.22| [CQ12938](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12938) | +|org.slf4j|jul-to-slf4j|1.7.22| [CQ12937](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12937) | +|org.slf4j|log4j-over-slf4j|1.7.22| [CQ12939](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12939) | +|org.slf4j|slf4j-api|1.7.22| [CQ12940](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12940) | +|org.springframework.amqp|spring-amqp|1.7.1.RELEASE| [CQ13043](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13043) | +|org.springframework.amqp|spring-rabbit|1.7.1.RELEASE| [CQ13044](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13044) | +|org.springframework.boot|spring-boot-actuator|1.4.5.RELEASE| [CQ12992](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12992) | +|org.springframework.boot|spring-boot-autoconfigure|1.4.5.RELEASE| [CQ12971](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12971) | +|org.springframework.boot|spring-boot-starter-actuator|1.4.5.RELEASE| [CQ12973](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12973) | +|org.springframework.boot|spring-boot-starter-aop|1.4.5.RELEASE| [CQ12974](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12974) | +|org.springframework.boot|spring-boot-starter-data-jpa|1.4.5.RELEASE| [CQ12975](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12975) | +|org.springframework.boot|spring-boot-starter-jdbc|1.4.5.RELEASE| [CQ12976](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12976) | +|org.springframework.boot|spring-boot-starter-jetty|1.4.5.RELEASE| [CQ12977](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12977) | +|org.springframework.boot|spring-boot-starter-logging|1.4.5.RELEASE| [CQ12981](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12981) | +|org.springframework.boot|spring-boot-starter-validation|1.4.5.RELEASE| [CQ12982](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12982) | +|org.springframework.boot|spring-boot-starter-web|1.4.5.RELEASE| [CQ12983](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12983) | +|org.springframework.boot|spring-boot-starter|1.4.5.RELEASE| [CQ12984](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12984) | +|org.springframework.boot|spring-boot|1.4.5.RELEASE| [CQ12985](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12985) | +|org.springframework.cloud|spring-cloud-bus|1.2.2.RELEASE| [CQ12986](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12986) | +|org.springframework.cloud|spring-cloud-context|1.1.8.RELEASE| [CQ12987](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12987) | +|org.springframework.cloud|spring-cloud-stream|1.1.2.RELEASE| [CQ12989](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12989) | +|org.springframework.data|spring-data-commons|1.12.8.RELEASE| [CQ12991](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12991) | +|org.springframework.data|spring-data-jpa|1.10.8.RELEASE| [CQ12972](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12972) | +|org.springframework.hateoas|spring-hateoas|0.23.0.RELEASE| [CQ12993](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12993) | +|org.springframework.integration|spring-integration-core|4.3.8.RELEASE| [CQ12994](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12994) | +|org.springframework.integration|spring-integration-jmx|4.3.8.RELEASE| [CQ12995](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12995) | +|org.springframework.integration|spring-integration-tuple|1.0.0.RELEASE| [CQ12996](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12996) | +|org.springframework.plugin|spring-plugin-core|1.2.0.RELEASE| [CQ12997](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12997) | +|org.springframework.retry|spring-retry|1.1.2.RELEASE| [CQ10781](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10781) | +|org.springframework.security|spring-security-aspects|4.1.4.RELEASE| [CQ12999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12999) | +|org.springframework.security|spring-security-config|4.1.4.RELEASE| [CQ13000](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13000) | +|org.springframework.security|spring-security-core|4.1.4.RELEASE| [CQ13001](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13001) | +|org.springframework.security|spring-security-crypto|4.1.4.RELEASE| [CQ](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13002) | +|org.springframework.security|spring-security-web|4.1.4.RELEASE| [CQ13005](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13005) | +|org.springframework|spring-aop|4.3.7.RELEASE| [CQ13003](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13003) | +|org.springframework|spring-aspects|4.3.7.RELEASE| [CQ13006](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13006) | +|org.springframework|spring-beans|4.3.7.RELEASE| [CQ13007](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13007) | +|org.springframework|spring-context-support|4.3.7.RELEASE| [CQ13008](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13008) | +|org.springframework|spring-context|4.3.7.RELEASE| [CQ13009](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13009) | +|org.springframework|spring-core|4.3.7.RELEASE| [CQ13010](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13010) | +|org.springframework|spring-expression|4.3.7.RELEASE| [CQ13011](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13011) | +|org.springframework|spring-jdbc|4.3.7.RELEASE| [CQ13019](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13019) | +|org.springframework|spring-messaging|4.3.7.RELEASE| [CQ13020](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13020) | +|org.springframework|spring-orm|4.3.7.RELEASE| [CQ13021](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13021) | +|org.springframework|spring-tuple|1.0.0.RELEASE| [CQ12998](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12998) | +|org.springframework|spring-tx|4.3.7.RELEASE| [CQ13022](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13022) | +|org.springframework|spring-web|4.3.7.RELEASE| [CQ13023](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13023) | +|org.springframework|spring-webmvc|4.3.7.RELEASE| [CQ13024](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13024) | +|org.vaadin.addons.lazyquerycontainer|vaadin-lazyquerycontainer|7.6.1.3| [CQ13025](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13025) | +|org.vaadin.addons|flexibleoptiongroup|2.2.0| [CQ11050](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11050) | +|org.vaadin.addons|tokenfield|7.0.1| [CQ11051](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11051) | +|org.vaadin.alump.distributionbar|dbar-addon|2.0.0| [CQ13026](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13026) | +|org.vaadin.spring.addons|vaadin-spring-addon-eventbus|0.0.6.RELEASE| [CQ11047](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11047) | +|org.vaadin.spring.extensions|vaadin-spring-ext-core|0.0.6.RELEASE| [CQ11048](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11048) | +|org.vaadin.spring.extensions|vaadin-spring-ext-security|0.0.6.RELEASE| [CQ11049](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11049) | +|org.w3c.css|sac|1.3| [CQ11052](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11052) | +|javax.servlet|javax.servlet-api|3.1.0| [CQ10362](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10362) | + +## Test and build dependencies + +Works with CQ: [CQ13040](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13040) + +| Group ID | Artifact ID | Version | +|---|---|---| +|asm|asm|3.3.1| +|cglib|cglib-nodep|3.1| +|com.google.gwt.gwtmockito|gwtmockito|1.1.6| +|com.google.gwt|gwt-dev|2.7.0| +|com.google.gwt|gwt-user|2.7.0| +|com.jayway.awaitility|awaitility|1.7.0| +|com.jayway.jsonpath|json-path|2.0.0| +|commons-beanutils|commons-beanutils-core|1.8.3| +|commons-logging|commons-logging|1.1.1| +|javax.el|javax.el-api|2.2.4| +|junit|junit|4.12| +|net._01001111|jlorem|1.1| +|net.minidev|asm|1.0.2| +|net.minidev|json-smart|2.1.1| +|org.apache.tika|tika-core|1.7| +|org.aspectj|aspectjrt|1.8.9| +|org.assertj|assertj-core|3.6.2| +|org.atteo|evo-inflector|1.2.1| +|org.hamcrest|hamcrest-all|1.3| +|org.hamcrest|hamcrest-core|1.3| +|org.hamcrest|hamcrest-library|1.3| +|org.javassist|javassist|3.20.0-GA| +|org.json|json|20141113| +|org.jvnet.jaxb2_commons|jaxb2-basics-runtime|0.9.3| +|org.mariadb.jdbc|mariadb-java-client|1.5.7| +|org.mockito|mockito-core|1.10.19| +|org.objenesis|objenesis|2.1| +|org.objenesis|objenesis|2.5.1| +|org.ow2.asm|asm-commons|5.0.3| +|org.ow2.asm|asm-tree|5.0.3| +|org.ow2.asm|asm-util|5.0.3| +|org.ow2.asm|asm|5.0.3| +|org.powermock|powermock-api-mockito-common|1.6.5| +|org.powermock|powermock-api-mockito|1.6.5| +|org.powermock|powermock-api-support|1.6.5| +|org.powermock|powermock-core|1.6.5| +|org.powermock|powermock-module-junit4-common|1.6.5| +|org.powermock|powermock-module-junit4|1.6.5| +|org.powermock|powermock-reflect|1.6.5| +|org.skyscreamer|jsonassert|1.3.0| +|org.springframework.boot|spring-boot-starter-test|1.4.5.RELEASE| +|org.springframework.boot|spring-boot-test-autoconfigure|1.4.5.RELEASE| +|org.springframework.boot|spring-boot-test|1.4.5.RELEASE| +|org.springframework.cloud|spring-cloud-stream-binder-test|1.1.2.RELEASE| +|org.springframework.cloud|spring-cloud-stream-test-support|1.1.2.RELEASE| +|org.springframework.data|spring-data-rest-core|2.5.8.RELEASE| +|org.springframework.data|spring-data-rest-webmvc|2.5.8.RELEASE| +|org.springframework.integration|spring-integration-test|4.3.8.RELEASE| +|org.springframework|spring-test|4.3.7.RELEASE| +|ru.yandex.qatools.allure|allure-java-adaptor-api|1.4.22| +|ru.yandex.qatools.allure|allure-java-annotations|1.4.22| +|ru.yandex.qatools.allure|allure-java-aspects|1.4.22| +|ru.yandex.qatools.allure|allure-junit-adaptor|1.4.22| +|ru.yandex.qatools.allure|allure-model|1.4.22| +|ru.yandex.qatools.properties|properties-loader|1.5| diff --git a/3rd-dependencies/compile.txt b/3rd-dependencies/compile.txt index 6969c7735..9a8dcc2e3 100644 --- a/3rd-dependencies/compile.txt +++ b/3rd-dependencies/compile.txt @@ -1,130 +1,112 @@ aopalliance:aopalliance:jar:1.0:compile ch.qos.logback:logback-classic:jar:1.1.3:compile ch.qos.logback:logback-core:jar:1.1.3:compile - com.fasterxml.jackson.core:jackson-annotations:jar:2.5.5:compile - com.fasterxml.jackson.core:jackson-core:jar:2.5.5:compile - com.fasterxml.jackson.core:jackson-databind:jar:2.5.5:compile - com.fasterxml:classmate:jar:1.1.0:compile - com.fasterxml:classmate:jar:1.2.0:compile - com.google.collections:google-collections:jar:1.0-rc2:compile + com.fasterxml.jackson.core:jackson-annotations:jar:2.8.2:compile + com.fasterxml.jackson.core:jackson-core:jar:2.8.2:compile + com.fasterxml.jackson.core:jackson-databind:jar:2.8.2:compile + com.fasterxml:classmate:jar:1.3.0:compile + 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:19.0:compile - com.h2database:h2:jar:1.4.190:compile - com.jayway.jsonpath:json-path:jar:0.9.1:compile - com.netflix.feign:feign-core:jar:8.12.1:compile - com.netflix.feign:feign-core:jar:8.14.2:compile - com.netflix.feign:feign-jackson:jar:8.14.1:compile - com.netflix.feign:feign-ribbon:jar:8.1.1:compile - com.netflix.feign:feign-slf4j:jar:8.1.1:compile - com.netflix.ribbon:ribbon-core:jar:2.0.0:compile - com.netflix.ribbon:ribbon-httpclient:jar:2.0.0:compile - com.netflix.ribbon:ribbon-loadbalancer:jar:2.0.0:compile - com.netflix.ribbon:ribbon:jar:2.0.0:compile - com.rabbitmq:amqp-client:jar:3.5.5:compile - com.vaadin.external.atmosphere:atmosphere-runtime:jar:2.2.7.vaadin1:compile + com.h2database:h2:jar:1.4.186:compile + com.rabbitmq:amqp-client:jar:4.0.2:compile + com.rabbitmq:http-client:jar:1.1.1.RELEASE:compile + com.vaadin.external.atmosphere:atmosphere-runtime:jar:2.2.9.vaadin2:compile com.vaadin.external.flute:flute:jar:1.3.0.gg2:compile - com.vaadin.external.google:guava:jar:16.0.1.vaadin1:compile + com.vaadin.external.gwt:gwt-elemental:jar:2.7.0.vaadin4:compile + com.vaadin.external.gwt:gwt-user:jar:2.7.0.vaadin4:compile com.vaadin.external.slf4j:vaadin-slf4j-jdk14:jar:1.6.1:compile - com.vaadin.external.streamhtmlparser:streamhtmlparser-jsilver:jar:0.0.10.vaadin1:compile - com.vaadin:vaadin-client-compiled:jar:7.6.3:compile - com.vaadin:vaadin-push:jar:7.6.3:compile + com.vaadin:vaadin-client:jar:7.7.7:compile + com.vaadin:vaadin-push:jar:7.7.7:compile com.vaadin:vaadin-sass-compiler:jar:0.9.13:compile - com.vaadin:vaadin-server:jar:7.6.3:compile - com.vaadin:vaadin-shared:jar:7.6.3:compile - com.vaadin:vaadin-spring-boot-starter:jar:1.0.0:compile - com.vaadin:vaadin-spring-boot:jar:1.0.0:compile - com.vaadin:vaadin-spring:jar:1.0.0:compile - com.vaadin:vaadin-themes:jar:7.6.3:compile - com.yahoo.platform.yui:yuicompressor:jar:2.4.8:compile + com.vaadin:vaadin-server:jar:7.7.7:compile + com.vaadin:vaadin-shared:jar:7.7.7:compile + com.vaadin:vaadin-spring-boot:jar:1.1.1:compile + com.vaadin:vaadin-spring:jar:1.1.1:compile + com.vaadin:vaadin-themes:jar:7.7.7:compile + commons-codec:commons-codec:jar:1.10:compile commons-io:commons-io:jar:2.4:compile - cz.jirutka.rsql:rsql-parser:jar:2.0.0:compile - io.reactivex:rxjava:jar:1.0.11:compile - io.springfox:springfox-core:jar:2.0.3:compile + cz.jirutka.rsql:rsql-parser:jar:2.1.0:compile + io.protostuff:protostuff-api:jar:1.5.3:compile + io.protostuff:protostuff-collectionschema:jar:1.5.3:compile + io.protostuff:protostuff-core:jar:1.5.3:compile + io.protostuff:protostuff-runtime:jar:1.5.3:compile + javax.annotation:javax.annotation-api:jar:1.2:compile javax.servlet:javax.servlet-api:jar:3.1.0:compile javax.transaction:javax.transaction-api:jar:1.2:compile javax.validation:validation-api:jar:1.1.0.Final:compile - joda-time:joda-time:jar:2.5:compile - net._01001111:jlorem:jar:1.1:compile - net.minidev:json-smart:jar:1.2:compile + javax.validation:validation-api:jar:sources:1.0.0.GA:compile + javax.websocket:javax.websocket-api:jar:1.0:compile org.apache.commons:commons-lang3:jar:3.4:compile - org.apache.commons:commons-pool2:jar:2.2:compile - org.apache.logging.log4j:log4j-api:jar:2.1:compile - org.apache.logging.log4j:log4j-core:jar:2.1:compile - org.apache.logging.log4j:log4j-slf4j-impl:jar:2.1:compile - org.apache.tomcat:tomcat-jdbc:jar:8.0.30:compile - org.apache.tomcat:tomcat-juli:jar:8.0.30:compile - org.aspectj:aspectjrt:jar:1.8.5:compile - org.aspectj:aspectjweaver:jar:1.8.5:compile - org.eclipse.persistence:javax.persistence:jar:2.1.1:compile - org.eclipse.persistence:org.eclipse.persistence.antlr:jar:2.6.2:compile - org.eclipse.persistence:org.eclipse.persistence.asm:jar:2.6.2:compile - org.eclipse.persistence:org.eclipse.persistence.core:jar:2.6.2:compile - org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:jar:2.6.2:compile - org.eclipse.persistence:org.eclipse.persistence.jpa:jar:2.6.2:compile - org.flywaydb:flyway-core:jar:3.1:compile + org.apache.httpcomponents:httpclient:jar:4.5.3:compile + org.apache.httpcomponents:httpcore:jar:4.4.6:compile + org.apache.tomcat.embed:tomcat-embed-el:jar:8.0.28:compile + org.apache.tomcat:tomcat-jdbc:jar:8.0.28:compile + org.apache.tomcat:tomcat-juli:jar:8.0.28:compile + org.aspectj:aspectjweaver:jar:1.8.9:compile + org.flywaydb:flyway-core:jar:4.0.3:compile org.glassfish:javax.json:jar:1.0.4:compile - org.hibernate:hibernate-validator:jar:5.2.4.Final:compile + org.hibernate:hibernate-validator:jar:5.2.2.Final:compile org.jboss.logging:jboss-logging:jar:3.2.1.Final:compile - org.json:json:jar:20141113:compile org.jsoup:jsoup:jar:1.8.3:compile - org.mongodb:mongo-java-driver:jar:3.2.2:compile - org.objenesis:objenesis:jar:2.1:compile - org.slf4j:jcl-over-slf4j:jar:1.7.13:compile - org.slf4j:jul-to-slf4j:jar:1.7.13:compile - org.slf4j:log4j-over-slf4j:jar:1.7.13:compile - org.slf4j:slf4j-api:jar:1.7.13:compile - org.springframework.amqp:spring-amqp:jar:1.4.6.RELEASE:compile - org.springframework.amqp:spring-rabbit:jar:1.4.6.RELEASE:compile - org.springframework.boot:spring-boot-autoconfigure:jar:1.2.8.RELEASE:compile - org.springframework.boot:spring-boot-configuration-processor:jar:1.2.8.RELEASE:compile - org.springframework.boot:spring-boot-starter-aop:jar:1.2.8.RELEASE:compile - org.springframework.boot:spring-boot-starter-data-jpa:jar:1.2.8.RELEASE:compile - org.springframework.boot:spring-boot-starter-jdbc:jar:1.2.8.RELEASE:compile - org.springframework.boot:spring-boot-starter-log4j2:jar:1.2.8.RELEASE:compile - org.springframework.boot:spring-boot-starter-logging:jar:1.2.8.RELEASE:compile - org.springframework.boot:spring-boot-starter-web:jar:1.2.8.RELEASE:compile - org.springframework.boot:spring-boot-starter:jar:1.2.8.RELEASE:compile - org.springframework.boot:spring-boot:jar:1.2.8.RELEASE:compile - org.springframework.cloud:spring-cloud-commons:jar:1.0.5.RELEASE:compile - org.springframework.cloud:spring-cloud-context:jar:1.0.5.RELEASE:compile - org.springframework.cloud:spring-cloud-netflix-core:jar:1.0.7.RELEASE:compile - org.springframework.cloud:spring-cloud-starter-feign:jar:1.0.6.RELEASE:compile - org.springframework.cloud:spring-cloud-starter-ribbon:jar:1.0.6.RELEASE:compile - org.springframework.cloud:spring-cloud-starter:jar:1.0.5.RELEASE:compile - org.springframework.data:spring-data-commons:jar:1.10.1.RELEASE:compile - org.springframework.data:spring-data-jpa:jar:1.8.1.RELEASE:compile - org.springframework.data:spring-data-mongodb:jar:1.7.1.RELEASE:compile - org.springframework.data:spring-data-redis:jar:1.5.1.RELEASE:compile - org.springframework.hateoas:spring-hateoas:jar:0.16.0.RELEASE:compile - org.springframework.plugin:spring-plugin-core:jar:1.1.0.RELEASE:compile - org.springframework.plugin:spring-plugin-metadata:jar:1.2.0.RELEASE:compile + org.mortbay.jasper:apache-el:jar:8.0.33:compile + org.ow2.asm:asm-commons:jar:5.0.1:compile + org.ow2.asm:asm-tree:jar:5.0.1:compile + org.ow2.asm:asm:jar:5.0.1:compile + org.slf4j:jcl-over-slf4j:jar:1.7.22:compile + org.slf4j:jul-to-slf4j:jar:1.7.22:compile + org.slf4j:log4j-over-slf4j:jar:1.7.22:compile + org.slf4j:slf4j-api:jar:1.7.22:compile + org.springframework.amqp:spring-amqp:jar:1.7.1.RELEASE:compile + org.springframework.amqp:spring-rabbit:jar:1.7.1.RELEASE:compile + org.springframework.boot:spring-boot-actuator:jar:1.4.5.RELEASE:compile + org.springframework.boot:spring-boot-autoconfigure:jar:1.4.5.RELEASE:compile + org.springframework.boot:spring-boot-starter-actuator:jar:1.4.5.RELEASE:compile + org.springframework.boot:spring-boot-starter-aop:jar:1.4.5.RELEASE:compile + org.springframework.boot:spring-boot-starter-data-jpa:jar:1.4.5.RELEASE:compile + org.springframework.boot:spring-boot-starter-jdbc:jar:1.4.5.RELEASE:compile + org.springframework.boot:spring-boot-starter-jetty:jar:1.4.5.RELEASE:compile + org.springframework.boot:spring-boot-starter-logging:jar:1.4.5.RELEASE:compile + org.springframework.boot:spring-boot-starter-validation:jar:1.4.5.RELEASE:compile + org.springframework.boot:spring-boot-starter-web:jar:1.4.5.RELEASE:compile + org.springframework.boot:spring-boot-starter:jar:1.4.5.RELEASE:compile + org.springframework.boot:spring-boot:jar:1.4.5.RELEASE:compile + org.springframework.cloud:spring-cloud-bus:jar:1.2.2.RELEASE:compile + org.springframework.cloud:spring-cloud-context:jar:1.1.8.RELEASE:compile + org.springframework.cloud:spring-cloud-stream:jar:1.1.2.RELEASE:compile + org.springframework.data:spring-data-commons:jar:1.12.8.RELEASE:compile + org.springframework.data:spring-data-jpa:jar:1.10.8.RELEASE:compile + org.springframework.hateoas:spring-hateoas:jar:0.23.0.RELEASE:compile + org.springframework.integration:spring-integration-core:jar:4.3.8.RELEASE:compile + org.springframework.integration:spring-integration-jmx:jar:4.3.8.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.1.2.RELEASE:compile - org.springframework.security:spring-security-aspects:jar:3.2.9.RELEASE:compile - org.springframework.security:spring-security-config:jar:3.2.9.RELEASE:compile - org.springframework.security:spring-security-core:jar:3.2.9.RELEASE:compile - org.springframework.security:spring-security-crypto:jar:3.2.9.RELEASE:compile - org.springframework.security:spring-security-web:jar:3.2.9.RELEASE:compile - org.springframework:spring-aop:jar:4.1.9.RELEASE:compile - org.springframework:spring-aspects:jar:4.1.9.RELEASE:compile - org.springframework:spring-beans:jar:4.1.9.RELEASE:compile - org.springframework:spring-context-support:jar:4.1.9.RELEASE:compile - org.springframework:spring-context:jar:4.1.9.RELEASE:compile - org.springframework:spring-core:jar:4.1.9.RELEASE:compile - org.springframework:spring-expression:jar:4.1.9.RELEASE:compile - org.springframework:spring-jdbc:jar:4.1.9.RELEASE:compile - org.springframework:spring-messaging:jar:4.1.9.RELEASE:compile - org.springframework:spring-orm:jar:4.1.9.RELEASE:compile - org.springframework:spring-tx:jar:4.1.9.RELEASE:compile - org.springframework:spring-web:jar:4.1.9.RELEASE:compile - org.springframework:spring-webmvc:jar:4.1.9.RELEASE:compile - org.vaadin.addons.lazyquerycontainer:vaadin-lazyquerycontainer:jar:7.4.0.1:compile - org.vaadin.addons:contextmenu:jar:4.5:compile + org.springframework.security:spring-security-aspects:jar:4.1.4.RELEASE:compile + org.springframework.security:spring-security-config:jar:4.1.4.RELEASE:compile + org.springframework.security:spring-security-core:jar:4.1.4.RELEASE:compile + org.springframework.security:spring-security-crypto:jar:4.1.4.RELEASE:compile + org.springframework.security:spring-security-web:jar:4.1.4.RELEASE:compile + org.springframework:spring-aop:jar:4.3.7.RELEASE:compile + org.springframework:spring-aspects:jar:4.3.7.RELEASE:compile + org.springframework:spring-beans:jar:4.3.7.RELEASE:compile + org.springframework:spring-context-support:jar:4.3.7.RELEASE:compile + org.springframework:spring-context:jar:4.3.7.RELEASE:compile + org.springframework:spring-core:jar:4.3.7.RELEASE:compile + org.springframework:spring-expression:jar:4.3.7.RELEASE:compile + org.springframework:spring-jdbc:jar:4.3.7.RELEASE:compile + org.springframework:spring-messaging:jar:4.3.7.RELEASE:compile + org.springframework:spring-orm:jar:4.3.7.RELEASE:compile + org.springframework:spring-tuple:jar:1.0.0.RELEASE:compile + org.springframework:spring-tx:jar:4.3.7.RELEASE:compile + org.springframework:spring-web:jar:4.3.7.RELEASE:compile + org.springframework:spring-webmvc:jar:4.3.7.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 - org.vaadin.alump.distributionbar:dbar-addon:jar:1.2.0:compile + org.vaadin.alump.distributionbar:dbar-addon:jar:2.0.0:compile org.vaadin.spring.addons:vaadin-spring-addon-eventbus:jar:0.0.6.RELEASE:compile org.vaadin.spring.extensions:vaadin-spring-ext-core:jar:0.0.6.RELEASE:compile org.vaadin.spring.extensions:vaadin-spring-ext-security:jar:0.0.6.RELEASE:compile org.w3c.css:sac:jar:1.3:compile - org.yaml:snakeyaml:jar:1.14:compile - redis.clients:jedis:jar:2.5.2:compile - rhino:js:jar:1.7R2:compile diff --git a/3rd-dependencies/generateReleaseMd.sh b/3rd-dependencies/generateReleaseMd.sh new file mode 100644 index 000000000..bf42df71b --- /dev/null +++ b/3rd-dependencies/generateReleaseMd.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# +# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +echo "# 3rd party dependencies for Release X.X.X" +echo "" +echo "## Eclipse CQs - Provided/compile" +echo "" +echo "| Group ID | Artifact ID | Version | CQ |" +echo "|---|---|---|---|---|" +cat compile.txt provided.txt|cut -d':' -f1,2,4|sed -e 's/:/|/g'|while read i; do echo "|$i| []() |";done +echo "" +echo "## Test and build dependencies" +echo "" +echo "CQ: " +echo "" +echo "| Group ID | Artifact ID | Version |" +echo "|---|---|---|" +cut -d':' -f1,2,4 test.txt|sed -e 's/:/|/g'|while read i; do echo "|$i|";done diff --git a/3rd-dependencies/listDeps.sh b/3rd-dependencies/listDeps.sh index ed7bf5903..7cdb9a855 100755 --- a/3rd-dependencies/listDeps.sh +++ b/3rd-dependencies/listDeps.sh @@ -8,7 +8,7 @@ # http://www.eclipse.org/legal/epl-v10.html # cd .. -mvn dependency:list -DexcludeGroupIds=org.eclipse.hawkbit -Dsort=true -DoutputFile=dependencies.txt +mvn dependency:list -DexcludeGroupIds=org.eclipse -Dsort=true -DoutputFile=dependencies.txt find . -name dependencies.txt|while read i; do cat $i;done|grep '.*:.*:compile'|sort|uniq > 3rd-dependencies/compile.txt find . -name dependencies.txt|while read i; do cat $i;done|grep '.*:.*:test'|sort|uniq > 3rd-dependencies/test.txt find . -name dependencies.txt|while read i; do cat $i;done|grep '.*:.*:provided'|sort|uniq > 3rd-dependencies/provided.txt diff --git a/3rd-dependencies/provided.txt b/3rd-dependencies/provided.txt index 48ea20ba5..06770f23b 100644 --- a/3rd-dependencies/provided.txt +++ b/3rd-dependencies/provided.txt @@ -1,6 +1 @@ javax.servlet:javax.servlet-api:jar:3.1.0:provided - org.apache.tomcat.embed:tomcat-embed-core:jar:8.0.30:provided - org.apache.tomcat.embed:tomcat-embed-el:jar:8.0.30:provided - org.apache.tomcat.embed:tomcat-embed-logging-juli:jar:8.0.30:provided - org.apache.tomcat.embed:tomcat-embed-websocket:jar:8.0.30:provided - org.springframework.boot:spring-boot-starter-tomcat:jar:1.2.8.RELEASE:provided diff --git a/3rd-dependencies/test.txt b/3rd-dependencies/test.txt index dc4f579ea..f6a7fe02f 100644 --- a/3rd-dependencies/test.txt +++ b/3rd-dependencies/test.txt @@ -1,33 +1,51 @@ - com.github.fge:btf:jar:1.2:test - com.github.fge:jackson-coreutils:jar:1.6:test - com.github.fge:json-patch:jar:1.7:test - com.github.fge:msg-simple:jar:1.1:test - com.google.code.findbugs:jsr305:jar:2.0.1:test - com.sun.jersey:jersey-client:jar:1.18.1:test - com.sun.jersey:jersey-core:jar:1.13:test + asm:asm:jar:3.3.1:test + cglib:cglib-nodep:jar:3.1:test + com.google.gwt.gwtmockito:gwtmockito:jar:1.1.6:test + com.google.gwt:gwt-dev:jar:2.7.0:test + com.google.gwt:gwt-user:jar:2.7.0:test + com.jayway.awaitility:awaitility:jar:1.7.0:test + com.jayway.jsonpath:json-path:jar:2.0.0:test commons-beanutils:commons-beanutils-core:jar:1.8.3:test commons-logging:commons-logging:jar:1.1.1:test - de.flapdoodle.embed:de.flapdoodle.embed.mongo:jar:1.50.2:test - de.flapdoodle.embed:de.flapdoodle.embed.process:jar:1.50.1:test javax.el:javax.el-api:jar:2.2.4:test junit:junit:jar:4.12:test - net.java.dev.jna:jna-platform:jar:4.0.0:test - net.java.dev.jna:jna:jar:4.0.0:test - org.apache.commons:commons-compress:jar:1.3:test + net._01001111:jlorem:jar:1.1:test + net.minidev:asm:jar:1.0.2:test + net.minidev:json-smart:jar:2.1.1:test org.apache.tika:tika-core:jar:1.7:test + org.aspectj:aspectjrt:jar:1.8.9:test + org.assertj:assertj-core:jar:3.6.2:test org.atteo:evo-inflector:jar:1.2.1:test - org.easytesting:fest-assert-core:jar:2.0M10:test - org.easytesting:fest-assert:jar:1.4:test - org.easytesting:fest-util:jar:1.2.5:test + org.hamcrest:hamcrest-all:jar:1.3:test org.hamcrest:hamcrest-core:jar:1.3:test org.hamcrest:hamcrest-library:jar:1.3:test + org.javassist:javassist:jar:3.20.0-GA:test + org.json:json:jar:20141113:test org.jvnet.jaxb2_commons:jaxb2-basics-runtime:jar:0.9.3:test - org.mariadb.jdbc:mariadb-java-client:jar:1.3.5:test + org.mariadb.jdbc:mariadb-java-client:jar:1.5.7:test org.mockito:mockito-core:jar:1.10.19:test - org.springframework.boot:spring-boot-starter-test:jar:1.2.8.RELEASE:test - org.springframework.data:spring-data-rest-core:jar:2.3.1.RELEASE:test - org.springframework.data:spring-data-rest-webmvc:jar:2.3.1.RELEASE:test - org.springframework:spring-test:jar:4.1.9.RELEASE:test + org.objenesis:objenesis:jar:2.1:test + org.ow2.asm:asm-commons:jar:5.0.3:test + org.ow2.asm:asm-tree:jar:5.0.3:test + org.ow2.asm:asm-util:jar:5.0.3:test + org.ow2.asm:asm:jar:5.0.3:test + org.powermock:powermock-api-mockito-common:jar:1.6.5:test + org.powermock:powermock-api-mockito:jar:1.6.5:test + org.powermock:powermock-api-support:jar:1.6.5:test + org.powermock:powermock-core:jar:1.6.5:test + org.powermock:powermock-module-junit4-common:jar:1.6.5:test + org.powermock:powermock-module-junit4:jar:1.6.5:test + org.powermock:powermock-reflect:jar:1.6.5:test + org.skyscreamer:jsonassert:jar:1.3.0:test + org.springframework.boot:spring-boot-starter-test:jar:1.4.5.RELEASE:test + org.springframework.boot:spring-boot-test-autoconfigure:jar:1.4.5.RELEASE:test + org.springframework.boot:spring-boot-test:jar:1.4.5.RELEASE:test + org.springframework.cloud:spring-cloud-stream-binder-test:jar:1.1.2.RELEASE:test + org.springframework.cloud:spring-cloud-stream-test-support:jar:1.1.2.RELEASE:test + org.springframework.data:spring-data-rest-core:jar:2.5.8.RELEASE:test + org.springframework.data:spring-data-rest-webmvc:jar:2.5.8.RELEASE:test + org.springframework.integration:spring-integration-test:jar:4.3.8.RELEASE:test + org.springframework:spring-test:jar:4.3.7.RELEASE:test ru.yandex.qatools.allure:allure-java-adaptor-api:jar:1.4.22:test ru.yandex.qatools.allure:allure-java-annotations:jar:1.4.22:test ru.yandex.qatools.allure:allure-java-aspects:jar:1.4.22:test diff --git a/README.md b/README.md index 46eab6ed8..92434a58f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Eclipse [hawkBit](https://projects.eclipse.org/projects/iot.hawkbit) is an domain independent back end solution for rolling out software updates to constrained edge devices as well as more powerful controllers and gateways connected to IP based networking infrastructure. -Build: [![Circle CI](https://circleci.com/gh/eclipse/hawkbit.svg?style=shield)](https://circleci.com/gh/eclipse/hawkbit) +Build: [![Circle CI](https://circleci.com/gh/eclipse/hawkbit.svg?style=shield)](https://circleci.com/gh/eclipse/hawkbit) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/83b1ace1fba94ea2aec93b202b52f39a)](https://www.codacy.com/app/kai-zimmermann/hawkbit?utm_source=github.com&utm_medium=referral&utm_content=eclipse/hawkbit&utm_campaign=Badge_Grade) [![SonarQuality](https://sonar.ops.bosch-iot-rollouts.com/api/badges/gate?key=org.eclipse.hawkbit:hawkbit-parent)](https://sonar.ops.bosch-iot-rollouts.com) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.eclipse.hawkbit/hawkbit-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.eclipse.hawkbit/hawkbit-parent) # Documentation @@ -25,7 +25,9 @@ https://hawkbit.eu-gb.mybluemix.net/UI/ # Compile, Run and Getting Started -We are not providing an off the shelf installation ready hawkBit update server. However, we recommend to check out the [Example Application](examples/hawkbit-example-app) for a runtime ready Spring Boot based update server that is empowered by hawkBit. In addition we have [guide](https://github.com/eclipse/hawkbit/wiki/Run-hawkBit) for setting up a complete landscape. +We are not providing an off the shelf installation ready hawkBit update server. In addition we have [guide](http://www.eclipse.org/hawkbit/documentation/guide/runhawkbit.html) for setting up a complete landscape. + +Docker support by means of ready to go images is currently missing but we will look into this as soon as we can. # API stability @@ -43,10 +45,10 @@ $ git clone https://github.com/eclipse/hawkbit.git $ cd hawkbit $ mvn clean install ``` -#### Start hawkBit example app -[Example Application](examples/hawkbit-example-app) +#### Start hawkBit Update Server +[Update Server](hawkbit-runtime/hawkbit-update-server) ``` -$ java -jar ./examples/hawkbit-example-app/target/hawkbit-example-app-#version#.jar +$ java -jar ./hawkbit-runtime/hawkbit-update-server/target/hawkbit-update-server-#version#.jar ``` #### Start hawkBit device simulator [Device Simulator](examples/hawkbit-device-simulator) @@ -61,9 +63,17 @@ $ java -jar ./examples/hawkbit-example-mgmt-simulator/target/hawkbit-example-mgm # Releases and Roadmap -* We are currently working on the first formal release under the Eclipse banner: 0.1 (see [Release 0.1 branch](https://github.com/eclipse/hawkbit/tree/release-train-0.1)). -* The master branch contains future development towards 0.2. We are currently focusing on: - * Rollout Management for large scale rollouts. +* In the upcoming release [0.2](https://github.com/eclipse/hawkbit/issues/390): + * Rollout management for large scale update campaigns. * Clustering capabilities for the update server. - * Upgrade of Spring Boot and Vaadin dependencies. - * And of course tons of usability improvements and bug fixes. \ No newline at end of file + * Upgrade of Spring Boot and Vaadin dependencies (Boot 1.4, Vaadin 7.7). + * Improvements on modularization and customizability based on Spring's auto-configuration mechanism. + * Provide Spring Boot Starters for custom apps based on hawkBit. + * Provide standard runtime by means of Spring Boot based hawkBit update server (and hopefully a docker image). + * And of course tons of usability improvements and bug fixes. +* Future releases + * Complete repository refactoring. + * Integrate with Eclipse hono as DMF provider. + * Flexible DMF messaging infrastructure (e.g. with Spring Cloud Stream). + * Migrate to Spring Framework 5, Spring Boot 2 and Vaadin 8 + * Re-evaluate JPA as persistence provider (e.g. look into jOOQ) diff --git a/docs/src/main/resources/documentation/guide/clustering.md b/docs/src/main/resources/documentation/guide/clustering.md index a90cb7150..380772378 100644 --- a/docs/src/main/resources/documentation/guide/clustering.md +++ b/docs/src/main/resources/documentation/guide/clustering.md @@ -7,7 +7,7 @@ title: Clustering # Cluster -_hawkBit_ is able to run in a cluster with some constraints. This guide provides insights in the basic concepts and how to setup your own cluster. You can find additional information in the [hawkbit example app's README](https://github.com/eclipse/hawkbit/blob/master/examples/hawkbit-example-app/README.md). +_hawkBit_ is able to run in a cluster with some constraints. This guide provides insights in the basic concepts and how to setup your own cluster. You can find additional information in the [hawkbit runtimes's README](https://github.com/eclipse/hawkbit/blob/master/hawkbit-runtime/hawkbit-update-server/README.md). # Big picture @@ -15,7 +15,7 @@ _hawkBit_ is able to run in a cluster with some constraints. This guide provides # Events -Event communication between nodes is based on [Spring Cloud Bus](https://cloud.spring.io/spring-cloud-bus/) and [Spring Cloud Stream](http://docs.spring.io/spring-cloud-stream/docs/current/reference/htmlsingle/). There are different [binder implementations](http://docs.spring.io/spring-cloud-stream/docs/current/reference/htmlsingle/#_binders) available. The _hawkbit example app_ uses RabbitMQ binder. Every node gets his own queue to receive cluster events, the default payload is JSON. +Event communication between nodes is based on [Spring Cloud Bus](https://cloud.spring.io/spring-cloud-bus/) and [Spring Cloud Stream](http://docs.spring.io/spring-cloud-stream/docs/current/reference/htmlsingle/). There are different [binder implementations](http://docs.spring.io/spring-cloud-stream/docs/current/reference/htmlsingle/#_binders) available. The _hawkbit Update Server_ uses RabbitMQ binder. Every node gets his own queue to receive cluster events, the default payload is JSON. If an event is thrown locally at one node, it will be automatically delivered to all other available nodes via the Spring Cloud Bus's topic exchange: ![](../images/eventing-within-cluster.png){:width="100%"} diff --git a/docs/src/main/resources/documentation/guide/runhawkbit.md b/docs/src/main/resources/documentation/guide/runhawkbit.md index 9944ad9af..b00d58121 100644 --- a/docs/src/main/resources/documentation/guide/runhawkbit.md +++ b/docs/src/main/resources/documentation/guide/runhawkbit.md @@ -7,27 +7,25 @@ title: Run hawkBit # Run hawkBit -In this guide we describe how to run a full featured hawkBit setup based on a production ready infrastructure. It is based on the _hawkBit_ example modules. We call these _examples_ as we expect that developers who intend to create a _hawkBit_ based IoT application on their own will create a custom [Spring Boot](http://projects.spring.io/spring-boot/) app based on _hawkBit_ as demonstrated with the [hawkBit example app](https://github.com/eclipse/hawkbit/tree/master/examples/hawkbit-example-app). +In this guide we describe how to run a full featured hawkBit setup based on a production ready infrastructure. It is based on the _hawkBit_ example modules and update server. -Note: the example app can in fact be run [stand alone](https://github.com/eclipse/hawkbit/tree/master/examples/hawkbit-example-app). However, only with an embedded H2, no [Device Management Federation API](../interfaces/dmf-api.html) and no artifact storage. +Note: the update server can in fact be run [stand alone](https://github.com/eclipse/hawkbit/tree/master/hawkbit-runtime/hawkbit-update-server). However, only with an embedded H2, no [Device Management Federation API](../interfaces/dmf-api.html) and no artifact storage. This guide will focus on a complete setup that includes all _hawkBit_ features. # System Architecture This guide describes a target architecture that is more like one that you will expect in a production system. -- hawkBit Update Server [example app](https://github.com/eclipse/hawkbit/tree/master/examples/hawkbit-example-app). +- hawkBit [Update Server](https://github.com/eclipse/hawkbit/tree/master/hawkbit-runtime/hawkbit-update-server). - [MariaDB](https://mariadb.org) for the repository. -- [MongoDB](https://www.mongodb.org) for artifact storage. - [RabbitMQ](https://www.rabbitmq.com) for DMF communication. - For testing and demonstration purposes we will also use: - [hawkBit Device Simulator](https://github.com/eclipse/hawkbit/tree/master/examples/hawkbit-device-simulator). - [hawkBit Management API example client](https://github.com/eclipse/hawkbit/tree/master/examples/hawkbit-mgmt-api-client). # Prerequisites - -- You have a MongoDB (>= 3.0), RabbitMQ and MariaDB/MySQL installed and running in your environment. -- You have a working [hawkBit build](https://github.com/eclipse/hawkbit). +- You have a working [hawkBit core build](https://github.com/eclipse/hawkbit). +- You have a working [hawkBit examples build](https://github.com/eclipse/hawkbit/examples). # Steps @@ -35,7 +33,7 @@ This guide describes a target architecture that is more like one that you will e As mentioned you can create your own application with _hawkBit_ inside or adapt the existing example app. The second option will be shown here. -### Set MariaDB dependency to compile in the [example App POM](https://github.com/eclipse/hawkbit/blob/master/examples/hawkbit-example-app/pom.xml) +### Set MariaDB dependency to compile in the [update server POM](https://github.com/eclipse/hawkbit/blob/master/hawkbit-runtime/hawkbit-update-server/pom.xml) {% highlight plaintext %} org.mariadb.jdbc @@ -44,7 +42,7 @@ As mentioned you can create your own application with _hawkBit_ inside or adapt {% endhighlight %} -### Configure MariaDB/MySQL and MongoDB connection settings. +### Configure MariaDB/MySQL connection settings. For this you can either edit the existing *application.properties* or create a [new profile](http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-external-config-profile-specific-properties). @@ -54,7 +52,6 @@ spring.datasource.url=jdbc:mysql://localhost:3306/YOUR_SCHEMA spring.datasource.username=YOUR_USER spring.datasource.password=YOUR_PWD spring.datasource.driverClassName=org.mariadb.jdbc.Driver -spring.data.mongodb.uri=mongodb://localhost/hawkbitArtifactRepository {% endhighlight %} ### Configure RabbitMQ connection settings for update server and device simulator (optional). @@ -87,7 +84,7 @@ hawkbit-example-mgmt-simulator-##VERSION##.jar --hawkbit.url=YOUR_HOST:PORT ### Compile & Run your _"production ready"_ app. -see [example app](https://github.com/eclipse/hawkbit/tree/master/examples/hawkbit-example-app) +see [update server](https://github.com/eclipse/hawkbit/tree/master/hawkbit-runtime/hawkbit-update-server) ### Compile & Run example scenario [creation script](https://github.com/eclipse/hawkbit/tree/master/examples/hawkbit-mgmt-api-client) (optional). diff --git a/docs/src/main/resources/documentation/overview/getting-started.md b/docs/src/main/resources/documentation/overview/getting-started.md index fe01d71ff..93e4ee9b6 100644 --- a/docs/src/main/resources/documentation/overview/getting-started.md +++ b/docs/src/main/resources/documentation/overview/getting-started.md @@ -13,8 +13,6 @@ We offer a sandbox installation that is free for everyone to try out hawkBit. Ho # Compile, Run and Getting Started -We are not providing an off the shelf installation ready hawkBit update server. However, we recommend to check out the [Example Application](examples/hawkbit-example-app) for a runtime ready Spring Boot based update server that is empowered by hawkBit. In addition we have [guide](../guide/runhawkbit.html) for setting up a complete landscape. - #### Clone and build hawkBit {% highlight bash %} $ git clone https://github.com/eclipse/hawkbit.git @@ -22,11 +20,18 @@ $ cd hawkbit $ mvn clean install {% endhighlight %} -#### Start hawkBit example app +#### Start hawkBit update server [Example Application](https://github.com/eclipse/hawkbit/tree/master/examples/hawkbit-example-app) {% highlight bash %} -$ java -jar ./examples/hawkbit-example-app/target/hawkbit-example-app-#version#.jar +$ java -jar ./hawkbit-runtime/hawkbit-update-server/target/hawkbit-update-server-#version#-SNAPSHOT.jar +{% endhighlight %} + +#### Build hawkBit examples +{% highlight bash %} +$ git clone https://github.com/eclipse/hawkbit.git +$ cd hawkbit/examples +$ mvn clean install {% endhighlight %} #### Start hawkBit device simulator @@ -39,4 +44,4 @@ $ java -jar ./examples/hawkbit-device-simulator/target/hawkbit-device-simulator- [Example Management API Client](https://github.com/eclipse/hawkbit/tree/master/examples/hawkbit-example-mgmt-simulator) {% highlight bash %} $ java -jar ./examples/hawkbit-example-mgmt-simulator/target/hawkbit-example-mgmt-simulator-#version#.jar -{% endhighlight %} \ No newline at end of file +{% endhighlight %} diff --git a/examples/hawkbit-custom-theme-example/pom.xml b/examples/hawkbit-custom-theme-example/pom.xml index b26e92366..9baacc96c 100644 --- a/examples/hawkbit-custom-theme-example/pom.xml +++ b/examples/hawkbit-custom-theme-example/pom.xml @@ -17,7 +17,7 @@ 0.2.0-SNAPSHOT hawkbit-custom-theme-example - hawkBit :: Custom Theme Example App + hawkBit :: Examples :: Custom Theme Example App diff --git a/examples/hawkbit-device-simulator/pom.xml b/examples/hawkbit-device-simulator/pom.xml index 3e66ea798..1415e4dfd 100644 --- a/examples/hawkbit-device-simulator/pom.xml +++ b/examples/hawkbit-device-simulator/pom.xml @@ -19,7 +19,7 @@ hawkbit-device-simulator - hawkBit-example :: Device Simulator + hawkBit :: Examples :: Device Simulator Device Management Federation API based simulator @@ -90,7 +90,6 @@ com.vaadin vaadin-spring-boot-starter - 1.0.0 com.vaadin @@ -116,11 +115,6 @@ com.jayway.jsonpath json-path - - org.springframework.boot - spring-boot-configuration-processor - true - org.apache.httpcomponents httpclient diff --git a/examples/hawkbit-example-app/.gitignore b/examples/hawkbit-example-app/.gitignore deleted file mode 100644 index 362e864a1..000000000 --- a/examples/hawkbit-example-app/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target/ -/artifactrepo/* -/.springBeans diff --git a/examples/hawkbit-example-core-feign-client/pom.xml b/examples/hawkbit-example-core-feign-client/pom.xml index 4121cd095..38b0754f3 100644 --- a/examples/hawkbit-example-core-feign-client/pom.xml +++ b/examples/hawkbit-example-core-feign-client/pom.xml @@ -18,7 +18,7 @@ hawkbit-example-core-feign-client - hawkBit-example :: Feign Core Client + hawkBit :: Examples :: Feign Core Client diff --git a/examples/hawkbit-example-ddi-feign-client/pom.xml b/examples/hawkbit-example-ddi-feign-client/pom.xml index d1ab01df6..a749b40e5 100644 --- a/examples/hawkbit-example-ddi-feign-client/pom.xml +++ b/examples/hawkbit-example-ddi-feign-client/pom.xml @@ -18,7 +18,7 @@ hawkbit-example-ddi-feign-client - hawkBit-example :: DDI Feign Client + hawkBit :: Examples :: DDI Feign Client diff --git a/examples/hawkbit-example-mgmt-feign-client/pom.xml b/examples/hawkbit-example-mgmt-feign-client/pom.xml index 3d0a69bc7..36c531ad6 100644 --- a/examples/hawkbit-example-mgmt-feign-client/pom.xml +++ b/examples/hawkbit-example-mgmt-feign-client/pom.xml @@ -18,7 +18,7 @@ jar hawkbit-example-mgmt-feign-client - hawkBit-example :: Management client API + hawkBit :: Examples :: Management client API diff --git a/examples/hawkbit-example-mgmt-simulator/pom.xml b/examples/hawkbit-example-mgmt-simulator/pom.xml index 0fa7458f9..d7e7b38e9 100644 --- a/examples/hawkbit-example-mgmt-simulator/pom.xml +++ b/examples/hawkbit-example-mgmt-simulator/pom.xml @@ -18,7 +18,7 @@ jar hawkbit-example-mgmt-simulator - hawkBit-example :: Management feign client simulator + hawkBit :: Examples :: Management feign client simulator @@ -61,10 +61,5 @@ org.springframework.boot spring-boot-starter-logging - - org.springframework.boot - spring-boot-configuration-processor - true - \ No newline at end of file diff --git a/examples/pom.xml b/examples/pom.xml index 60c82cdd4..25c22c9fc 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,28 +18,56 @@ hawkbit-examples-parent - hawkBit-example :: Parent + hawkBit :: Examples pom - + - repo.eclipse.org + eclipserel hawkBit Repository - Release https://repo.eclipse.org/content/repositories/hawkbit-releases - repo.eclipse.org - hawkBit Repository - Release + eclipsesnap + hawkBit Repository - Snapshots https://repo.eclipse.org/content/repositories/hawkbit-snapshots hawkbit-device-simulator - hawkbit-example-app hawkbit-example-core-feign-client hawkbit-example-ddi-feign-client hawkbit-example-mgmt-feign-client hawkbit-example-mgmt-simulator - \ No newline at end of file + + + 9.3.1 + + + + + + io.github.openfeign + feign-jackson + ${feign.extension.version} + + + io.github.openfeign + feign-gson + ${feign.extension.version} + + + io.github.openfeign + feign-jaxrs + ${feign.extension.version} + + + com.vaadin + vaadin-spring-boot-starter + ${vaadin.spring.version} + + + + diff --git a/extensions/hawkbit-extension-artifact-repository-s3/pom.xml b/extensions/hawkbit-extension-artifact-repository-s3/pom.xml index ceec22373..ecd10e049 100644 --- a/extensions/hawkbit-extension-artifact-repository-s3/pom.xml +++ b/extensions/hawkbit-extension-artifact-repository-s3/pom.xml @@ -59,10 +59,5 @@ allure-junit-adaptor test - - org.springframework.boot - spring-boot-configuration-processor - true - \ No newline at end of file diff --git a/extensions/hawkbit-extension-uaa/pom.xml b/extensions/hawkbit-extension-uaa/pom.xml index b709e0dfd..41516afbd 100644 --- a/extensions/hawkbit-extension-uaa/pom.xml +++ b/extensions/hawkbit-extension-uaa/pom.xml @@ -37,10 +37,6 @@ org.springframework.boot spring-boot-autoconfigure - - org.springframework.boot - spring-boot-starter-actuator - org.springframework.boot spring-boot-starter-security diff --git a/extensions/pom.xml b/extensions/pom.xml index 80f93caad..6d47eaa45 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -20,6 +20,19 @@ hawkBit :: Extensions Parent pom for hawkBit extensions + + + eclipserel + hawkBit Repository - Release + https://repo.eclipse.org/content/repositories/hawkbit-releases + + + eclipsesnap + hawkBit Repository - Snapshots + https://repo.eclipse.org/content/repositories/hawkbit-snapshots + + + ${project.basedir}/../../target/ diff --git a/hawkbit-artifact-repository-filesystem/pom.xml b/hawkbit-artifact-repository-filesystem/pom.xml index c1dff0001..148caa0ee 100644 --- a/hawkbit-artifact-repository-filesystem/pom.xml +++ b/hawkbit-artifact-repository-filesystem/pom.xml @@ -16,6 +16,7 @@ 0.2.0-SNAPSHOT hawkbit-artifact-repository-filesystem + hawkBit :: Artifact Repository :: Filesystem @@ -49,11 +50,6 @@ allure-junit-adaptor test - - org.springframework.boot - spring-boot-configuration-processor - true - diff --git a/hawkbit-autoconfigure/pom.xml b/hawkbit-autoconfigure/pom.xml index e9b102a88..5c4b6c7a1 100644 --- a/hawkbit-autoconfigure/pom.xml +++ b/hawkbit-autoconfigure/pom.xml @@ -77,11 +77,6 @@ org.springframework spring-context-support - - org.springframework.boot - spring-boot-configuration-processor - true - io.protostuff protostuff-core diff --git a/hawkbit-core/pom.xml b/hawkbit-core/pom.xml index f9e140d40..b56d30075 100644 --- a/hawkbit-core/pom.xml +++ b/hawkbit-core/pom.xml @@ -43,11 +43,6 @@ allure-junit-adaptor test - - org.springframework.boot - spring-boot-configuration-processor - true - \ No newline at end of file diff --git a/hawkbit-dmf-amqp/pom.xml b/hawkbit-dmf-amqp/pom.xml index 6f69afdc3..19a7ade69 100644 --- a/hawkbit-dmf-amqp/pom.xml +++ b/hawkbit-dmf-amqp/pom.xml @@ -67,14 +67,6 @@ slf4j-api - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.eclipse.hawkbit diff --git a/hawkbit-repository/hawkbit-repository-api/pom.xml b/hawkbit-repository/hawkbit-repository-api/pom.xml index d76c8d5b6..2ad57fd86 100644 --- a/hawkbit-repository/hawkbit-repository-api/pom.xml +++ b/hawkbit-repository/hawkbit-repository-api/pom.xml @@ -17,7 +17,7 @@ 0.2.0-SNAPSHOT hawkbit-repository-api - hawkBit :: Repository API + hawkBit :: Repository :: API @@ -45,16 +45,13 @@ org.springframework.boot spring-boot-starter-tomcat + + com.esotericsoftware + kryo-shaded + - - - org.springframework.boot - spring-boot-configuration-processor - true - - ru.yandex.qatools.allure diff --git a/hawkbit-repository/hawkbit-repository-core/pom.xml b/hawkbit-repository/hawkbit-repository-core/pom.xml index 5a17c97aa..7980d4652 100644 --- a/hawkbit-repository/hawkbit-repository-core/pom.xml +++ b/hawkbit-repository/hawkbit-repository-core/pom.xml @@ -16,7 +16,7 @@ 0.2.0-SNAPSHOT hawkbit-repository-core - hawkBit :: Repository Core Implementation Support + hawkBit :: Repository :: Core Implementation Support diff --git a/hawkbit-repository/hawkbit-repository-jpa/pom.xml b/hawkbit-repository/hawkbit-repository-jpa/pom.xml index 00001f600..d4b43c67c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/pom.xml +++ b/hawkbit-repository/hawkbit-repository-jpa/pom.xml @@ -17,7 +17,7 @@ hawkbit-repository hawkbit-repository-jpa - hawkBit :: Repository JPA Implementation + hawkBit :: Repository :: JPA Implementation @@ -71,11 +71,6 @@ org.flywaydb flyway-core - - org.springframework.boot - spring-boot-configuration-processor - true - cz.jirutka.rsql rsql-parser diff --git a/hawkbit-repository/hawkbit-repository-test/pom.xml b/hawkbit-repository/hawkbit-repository-test/pom.xml index bfc953477..1832e4640 100644 --- a/hawkbit-repository/hawkbit-repository-test/pom.xml +++ b/hawkbit-repository/hawkbit-repository-test/pom.xml @@ -17,7 +17,7 @@ 0.2.0-SNAPSHOT hawkbit-repository-test - hawkBit :: Repository Test Utilities + hawkBit :: Repository :: Test Utilities true @@ -61,6 +61,11 @@ org.springframework spring-context-support + + org.objenesis + objenesis + 2.5.1 + org.springframework spring-tx diff --git a/hawkbit-rest-core/pom.xml b/hawkbit-rest-core/pom.xml index 567b8e179..6bd07e2a0 100644 --- a/hawkbit-rest-core/pom.xml +++ b/hawkbit-rest-core/pom.xml @@ -50,11 +50,6 @@ javax.servlet-api provided - - org.apache.tomcat.embed - tomcat-embed-core - provided - diff --git a/examples/hawkbit-example-app/README.md b/hawkbit-runtime/hawkbit-update-server/README.md similarity index 82% rename from examples/hawkbit-example-app/README.md rename to hawkbit-runtime/hawkbit-update-server/README.md index a495f2d2b..87f1aa464 100644 --- a/examples/hawkbit-example-app/README.md +++ b/hawkbit-runtime/hawkbit-update-server/README.md @@ -1,9 +1,7 @@ -# hawkBit Example Application -The hawkBit example application is a standalone spring-boot application with an embedded servlet container to host the hawkBit Update Server. +# hawkBit Update Server +The hawkBit Update Server is a standalone spring-boot application with an embedded servlet container . -We have have described several options for you to get access to the example. - -## Try out the example application in our hawkBit sandbox on Bluemix +## Try out the update server in our hawkBit sandbox on Bluemix - try out Management UI https://hawkbit.eu-gb.mybluemix.net/UI (username: admin, passwd: admin) - try out Management API https://hawkbit.eu-gb.mybluemix.net/rest/v1/targets (don't forget basic auth header; username: admin, passwd: admin) - try out DDI API https://hawkbit.eu-gb.mybluemix.net/DEFAULT/controller/v1/MYTESTDEVICE (authentication disabled) @@ -11,7 +9,7 @@ We have have described several options for you to get access to the example. ## On your own workstation ### Run ``` -java -jar examples/hawkbit-example-app/target/hawkbit-example-app-*-SNAPSHOT.jar +java -jar hawkbit-runtime/hawkbit-update-server/target/hawkbit-update-server-*-SNAPSHOT.jar ``` _(Note: you have to add the JDBC driver also to your class path if you intend to use another database than H2.)_ @@ -19,7 +17,7 @@ _(Note: you have to add the JDBC driver also to your class path if you intend to Or: ``` -run org eclipse.hawkbit.app.Start +run org.eclipse.hawkbit.app.Start ``` ### Usage diff --git a/examples/hawkbit-example-app/cf/manifest-simple.yml b/hawkbit-runtime/hawkbit-update-server/cf/manifest-simple.yml similarity index 100% rename from examples/hawkbit-example-app/cf/manifest-simple.yml rename to hawkbit-runtime/hawkbit-update-server/cf/manifest-simple.yml diff --git a/examples/hawkbit-example-app/cf/manifest.yml b/hawkbit-runtime/hawkbit-update-server/cf/manifest.yml similarity index 100% rename from examples/hawkbit-example-app/cf/manifest.yml rename to hawkbit-runtime/hawkbit-update-server/cf/manifest.yml diff --git a/examples/hawkbit-example-app/pom.xml b/hawkbit-runtime/hawkbit-update-server/pom.xml similarity index 92% rename from examples/hawkbit-example-app/pom.xml rename to hawkbit-runtime/hawkbit-update-server/pom.xml index 4af34a227..1d6d087ac 100644 --- a/examples/hawkbit-example-app/pom.xml +++ b/hawkbit-runtime/hawkbit-update-server/pom.xml @@ -13,11 +13,11 @@ 4.0.0 org.eclipse.hawkbit - hawkbit-examples-parent + hawkbit-runtime-parent 0.2.0-SNAPSHOT - hawkbit-example-app - hawkBit-example :: Update Server + hawkbit-update-server + hawkBit :: Runtime :: Update Server @@ -61,12 +61,12 @@ hawkbit-boot-starter ${project.version} - + com.h2database h2 - - + + diff --git a/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java similarity index 100% rename from examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java rename to hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java diff --git a/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyUI.java b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyUI.java similarity index 100% rename from examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyUI.java rename to hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyUI.java diff --git a/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/RedirectController.java b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/RedirectController.java similarity index 100% rename from examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/RedirectController.java rename to hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/RedirectController.java diff --git a/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/Start.java b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java similarity index 100% rename from examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/Start.java rename to hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java diff --git a/examples/hawkbit-example-app/src/main/resources/application-cloudsandbox.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties similarity index 100% rename from examples/hawkbit-example-app/src/main/resources/application-cloudsandbox.properties rename to hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties diff --git a/examples/hawkbit-example-app/src/main/resources/application-mysql.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mysql.properties similarity index 100% rename from examples/hawkbit-example-app/src/main/resources/application-mysql.properties rename to hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mysql.properties diff --git a/examples/hawkbit-example-app/src/main/resources/application.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties similarity index 100% rename from examples/hawkbit-example-app/src/main/resources/application.properties rename to hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties diff --git a/examples/hawkbit-example-app/src/main/resources/logback-spring.xml b/hawkbit-runtime/hawkbit-update-server/src/main/resources/logback-spring.xml similarity index 100% rename from examples/hawkbit-example-app/src/main/resources/logback-spring.xml rename to hawkbit-runtime/hawkbit-update-server/src/main/resources/logback-spring.xml diff --git a/hawkbit-runtime/pom.xml b/hawkbit-runtime/pom.xml new file mode 100644 index 000000000..31f9d42a6 --- /dev/null +++ b/hawkbit-runtime/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + + org.eclipse.hawkbit + hawkbit-parent + 0.2.0-SNAPSHOT + + + hawkbit-runtime-parent + hawkBit :: Runtime + pom + + + hawkbit-update-server + + diff --git a/hawkbit-security-core/pom.xml b/hawkbit-security-core/pom.xml index 8567648e2..608fa732b 100644 --- a/hawkbit-security-core/pom.xml +++ b/hawkbit-security-core/pom.xml @@ -59,11 +59,6 @@ org.springframework.boot spring-boot - - org.springframework.boot - spring-boot-configuration-processor - true - diff --git a/hawkbit-starters/README.md b/hawkbit-starters/README.md index 121094e02..f52f91dfc 100644 --- a/hawkbit-starters/README.md +++ b/hawkbit-starters/README.md @@ -2,4 +2,4 @@ This is a set of [Spring Boot Starters](http://docs.spring.io/spring-boot/docs/c The [all in one](hawkbit-boot-starter) starter contains the complete feature set in addition we provide four starters for the hawkBit interfaces. They can be combined in any order. -Check out the hawkBit [example application](../examples/hawkbit-example-app) as a reference. \ No newline at end of file +Check out the hawkBit [update server](../hawkbit-runtime/hawkbit-update-server) as a reference. \ No newline at end of file diff --git a/hawkbit-starters/pom.xml b/hawkbit-starters/pom.xml index 111ac401f..2b38f44b9 100644 --- a/hawkbit-starters/pom.xml +++ b/hawkbit-starters/pom.xml @@ -17,7 +17,7 @@ 0.2.0-SNAPSHOT hawkbit-starters - hawkBit :: Spring Boot Starters Parent + hawkBit :: Spring Boot Starters pom hawkbit-boot-starter diff --git a/hawkbit-ui/pom.xml b/hawkbit-ui/pom.xml index f263b87f8..9cd5e18e0 100644 --- a/hawkbit-ui/pom.xml +++ b/hawkbit-ui/pom.xml @@ -16,7 +16,7 @@ 0.2.0-SNAPSHOT hawkbit-ui - hawkBit :: UI + hawkBit :: Mgmt UI Bosch IoT Software Provisioning server web application @@ -161,11 +161,6 @@ - - - org.apache.logging.log4j - log4j-api - org.eclipse.hawkbit hawkbit-repository-api @@ -212,20 +207,6 @@ org.vaadin.addons.lazyquerycontainer vaadin-lazyquerycontainer - - - org.eclipse.persistence - javax.persistence - - - com.vaadin - vaadin-client-compiled - - - com.vaadin - vaadin-themes - - org.vaadin.addons @@ -239,16 +220,6 @@ org.vaadin.alump.distributionbar dbar-addon - - org.vaadin.addons - contextmenu - - - - org.springframework.boot - spring-boot-configuration-processor - true - com.github.gwtd3 gwt-d3-api diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AppWidgetSet.gwt.xml b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AppWidgetSet.gwt.xml index c722cf56e..81e3d36a3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AppWidgetSet.gwt.xml +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AppWidgetSet.gwt.xml @@ -25,7 +25,7 @@ - + diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/CustomRendererWidgetSet.gwt.xml b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/CustomRendererWidgetSet.gwt.xml index b61cbbb0f..04e0de679 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/CustomRendererWidgetSet.gwt.xml +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/CustomRendererWidgetSet.gwt.xml @@ -18,7 +18,7 @@ - + diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/dd/CustomAcceptCriteria.gwt.xml b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/dd/CustomAcceptCriteria.gwt.xml index 400ee98b3..fe4a19781 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/dd/CustomAcceptCriteria.gwt.xml +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/dd/CustomAcceptCriteria.gwt.xml @@ -20,7 +20,7 @@ - + diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.gwt.xml b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.gwt.xml index a4b19152f..3686658f9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.gwt.xml +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.gwt.xml @@ -15,7 +15,7 @@ - + diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.gwt.xml b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.gwt.xml index e0b075e41..bf6f30341 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.gwt.xml +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.gwt.xml @@ -14,7 +14,7 @@ - + diff --git a/pom.xml b/pom.xml index 6f78a17bb..e12ea0ef7 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.4.RELEASE + 1.4.5.RELEASE org.eclipse.hawkbit @@ -41,9 +41,10 @@ hawkbit-artifact-repository-filesystem hawkbit-autoconfigure hawkbit-test-report + hawkbit-runtime + hawkbit-starters examples extensions - hawkbit-starters @@ -101,30 +102,44 @@ 1.8 - 1.4.4.RELEASE + 1.4.5.RELEASE + Camden.SR6 true - 0.23.0.RELEASE + + 0.23.0.RELEASE + 3.6.2 + + 4.0.3 + + 1.7.1.RELEASE 2.0.0 - 9.3.14.v20161028 - 1.7.1.RELEASE + + 1.1.3 + 2.8.2 + 1.3.0 + 1.4.186 + 5.2.2.Final + 3.2.1.Final + 1.1.2.RELEASE + 8.0.28 + 1.7.22 1.1.1 0.0.6.RELEASE - 7.7.6 + 7.7.7 ${vaadin.version} 7.6.1.3 - 2.3.0 + 2.2.0 7.0.1 2.0.0 - 4.5 3.1.0 @@ -148,11 +163,8 @@ 3.4 20141113 2.1.0 - Camden.SR1 - 9.3.1 1.7.0 - 1.5.2 - + 1.5.3 @@ -482,16 +494,42 @@ org.vaadin.spring.addons vaadin-spring-addon-eventbus ${vaadin.spring.addon.version} + + + com.vaadin + vaadin-spring + + org.vaadin.spring.extensions vaadin-spring-ext-security ${vaadin.spring.addon.version} + + + com.vaadin + vaadin-spring + + org.vaadin.addons.lazyquerycontainer vaadin-lazyquerycontainer ${vaadin.addon.vaadin-lazyquerycontainer.version} + + + org.eclipse.persistence + javax.persistence + + + com.vaadin + vaadin-client-compiled + + + com.vaadin + vaadin-themes + + org.vaadin.addons @@ -508,11 +546,6 @@ dbar-addon ${vaadin.addon.dbar-addon.version} - - org.vaadin.addons - contextmenu - ${vaadin.addon.contextmenu.version} - @@ -544,6 +577,10 @@ com.google.gwt gwt-user + + junit + junit + @@ -554,11 +591,6 @@ pom import - - org.springframework.boot - spring-boot-starter-actuator - ${spring.boot.version} - org.springframework.boot spring-boot-starter-web @@ -614,21 +646,6 @@ org.eclipse.persistence.jpa ${eclipselink.version} - - io.github.openfeign - feign-jackson - ${feign.extension.version} - - - io.github.openfeign - feign-gson - ${feign.extension.version} - - - io.github.openfeign - feign-jaxrs - ${feign.extension.version} -