diff --git a/README.md b/README.md index 2e2b805f8..6be9038ec 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ The following vendors offer free trial accounts for their hawkBit compatible pro # Device Integration (Client libraries) -hawkBit exposes HTTP/JSON based [Direct Device Integration (API) API](https://www.eclipse.org/hawkbit/apis/ddi_api/) +hawkBit exposes HTTP/JSON based [Direct Device Integration (API) API](https://hawkbit.eclipse.dev/#/direct-device-integration-api) that allow any update client to integrate quite easily. The [Eclipse Hara subproject](https://projects.eclipse.org/projects/iot.hawkbit.hara) aims to provide a reference agent diff --git a/docker/mysql/docker-compose-micro-services-dbinit-mysql.yml b/docker/mysql/docker-compose-micro-services-dbinit-mysql.yml index b63eebe95..bda4f53e3 100644 --- a/docker/mysql/docker-compose-micro-services-dbinit-mysql.yml +++ b/docker/mysql/docker-compose-micro-services-dbinit-mysql.yml @@ -57,6 +57,8 @@ services: condition: service_healthy labels: NAME: "hawkbit-ddi" + volumes: + - artifactrepo:/app/artifactrepo # --------------------- # HawkBit DMF @@ -90,8 +92,6 @@ services: - 'SPRING_RABBITMQ_HOST=rabbitmq' - 'SPRING_RABBITMQ_USERNAME=guest' - 'SPRING_RABBITMQ_PASSWORD=guest' - volumes: - - artifactrepo:/app/artifactrepo restart: always ports: - "8080:8080" @@ -100,6 +100,8 @@ services: condition: service_healthy labels: NAME: "hawkbit-mgmt" + volumes: + - artifactrepo:/app/artifactrepo volumes: artifactrepo: diff --git a/docker/mysql/docker-compose-micro-services-with-ui-dbinit-mysql.yml b/docker/mysql/docker-compose-micro-services-dbinit-with-ui-mysql.yml similarity index 100% rename from docker/mysql/docker-compose-micro-services-with-ui-dbinit-mysql.yml rename to docker/mysql/docker-compose-micro-services-dbinit-with-ui-mysql.yml diff --git a/docker/mysql/docker-compose-micro-services-mysql.yml b/docker/mysql/docker-compose-micro-services-mysql.yml index 64710d63f..527555ef5 100644 --- a/docker/mysql/docker-compose-micro-services-mysql.yml +++ b/docker/mysql/docker-compose-micro-services-mysql.yml @@ -34,6 +34,8 @@ services: condition: service_healthy labels: NAME: "hawkbit-ddi" + volumes: + - artifactrepo:/app/artifactrepo # --------------------- # HawkBit DMF @@ -66,8 +68,6 @@ services: - 'SPRING_RABBITMQ_HOST=rabbitmq' - 'SPRING_RABBITMQ_USERNAME=guest' - 'SPRING_RABBITMQ_PASSWORD=guest' - volumes: - - artifactrepo:/app/artifactrepo restart: always ports: - "8080:8080" @@ -76,6 +76,8 @@ services: condition: service_healthy labels: NAME: "hawkbit-mgmt" + volumes: + - artifactrepo:/app/artifactrepo volumes: artifactrepo: diff --git a/docker/mysql/docker-compose-monolith-dbinit-mysql.yml b/docker/mysql/docker-compose-monolith-dbinit-mysql.yml index c7acc86eb..383ca34e4 100644 --- a/docker/mysql/docker-compose-monolith-dbinit-mysql.yml +++ b/docker/mysql/docker-compose-monolith-dbinit-mysql.yml @@ -50,8 +50,6 @@ services: - 'SPRING_RABBITMQ_HOST=rabbitmq' - 'SPRING_RABBITMQ_USERNAME=guest' - 'SPRING_RABBITMQ_PASSWORD=guest' - volumes: - - artifactrepo:/app/artifactrepo restart: always ports: - "8080:8080" @@ -60,6 +58,8 @@ services: condition: service_healthy labels: NAME: "hawkbit" + volumes: + - artifactrepo:/app/artifactrepo volumes: artifactrepo: diff --git a/docker/mysql/docker-compose-monolith-mysql.yml b/docker/mysql/docker-compose-monolith-mysql.yml index 40f7fac67..6d5e92bc4 100644 --- a/docker/mysql/docker-compose-monolith-mysql.yml +++ b/docker/mysql/docker-compose-monolith-mysql.yml @@ -26,8 +26,6 @@ services: - 'SPRING_RABBITMQ_HOST=rabbitmq' - 'SPRING_RABBITMQ_USERNAME=guest' - 'SPRING_RABBITMQ_PASSWORD=guest' - volumes: - - artifactrepo:/app/artifactrepo restart: always ports: - "8080:8080" @@ -36,6 +34,8 @@ services: condition: service_healthy labels: NAME: "hawkbit" + volumes: + - artifactrepo:/app/artifactrepo volumes: artifactrepo: diff --git a/docker/postgres/docker-compose-micro-services-dbinit-postgres.yml b/docker/postgres/docker-compose-micro-services-dbinit-postgres.yml index b585bd871..f1d91357a 100644 --- a/docker/postgres/docker-compose-micro-services-dbinit-postgres.yml +++ b/docker/postgres/docker-compose-micro-services-dbinit-postgres.yml @@ -59,6 +59,8 @@ services: condition: service_healthy labels: NAME: "hawkbit-ddi" + volumes: + - artifactrepo:/app/artifactrepo # --------------------- # HawkBit DMF @@ -94,8 +96,6 @@ services: - 'SPRING_RABBITMQ_HOST=rabbitmq' - 'SPRING_RABBITMQ_USERNAME=guest' - 'SPRING_RABBITMQ_PASSWORD=guest' - volumes: - - artifactrepo:/app/artifactrepo restart: always ports: - "8080:8080" @@ -104,6 +104,8 @@ services: condition: service_healthy labels: NAME: "hawkbit-mgmt" + volumes: + - artifactrepo:/app/artifactrepo volumes: artifactrepo: diff --git a/docker/postgres/docker-compose-micro-services-with-simple-ui-dbinit-postgres.yml b/docker/postgres/docker-compose-micro-services-dbinit-with-ui-postgres.yml similarity index 100% rename from docker/postgres/docker-compose-micro-services-with-simple-ui-dbinit-postgres.yml rename to docker/postgres/docker-compose-micro-services-dbinit-with-ui-postgres.yml diff --git a/docker/postgres/docker-compose-micro-services-postgres.yml b/docker/postgres/docker-compose-micro-services-postgres.yml index cbc11135e..7a095ee46 100644 --- a/docker/postgres/docker-compose-micro-services-postgres.yml +++ b/docker/postgres/docker-compose-micro-services-postgres.yml @@ -35,6 +35,8 @@ services: condition: service_healthy labels: NAME: "hawkbit-ddi" + volumes: + - artifactrepo:/app/artifactrepo # --------------------- # HawkBit DMF @@ -69,8 +71,6 @@ services: - 'SPRING_RABBITMQ_HOST=rabbitmq' - 'SPRING_RABBITMQ_USERNAME=guest' - 'SPRING_RABBITMQ_PASSWORD=guest' - volumes: - - artifactrepo:/app/artifactrepo restart: always ports: - "8080:8080" @@ -79,6 +79,8 @@ services: condition: service_healthy labels: NAME: "hawkbit-mgmt" + volumes: + - artifactrepo:/app/artifactrepo volumes: artifactrepo: diff --git a/docker/postgres/docker-compose-micro-services-with-simple-ui-postgres.yml b/docker/postgres/docker-compose-micro-services-with-ui-postgres.yml similarity index 100% rename from docker/postgres/docker-compose-micro-services-with-simple-ui-postgres.yml rename to docker/postgres/docker-compose-micro-services-with-ui-postgres.yml diff --git a/docker/postgres/docker-compose-monolith-dbinit-postgres.yml b/docker/postgres/docker-compose-monolith-dbinit-postgres.yml index a45106085..2ece701df 100644 --- a/docker/postgres/docker-compose-monolith-dbinit-postgres.yml +++ b/docker/postgres/docker-compose-monolith-dbinit-postgres.yml @@ -52,8 +52,6 @@ services: - 'SPRING_RABBITMQ_HOST=rabbitmq' - 'SPRING_RABBITMQ_USERNAME=guest' - 'SPRING_RABBITMQ_PASSWORD=guest' - volumes: - - artifactrepo:/app/artifactrepo restart: always ports: - "8080:8080" @@ -62,6 +60,8 @@ services: condition: service_healthy labels: NAME: "hawkbit" + volumes: + - artifactrepo:/app/artifactrepo volumes: artifactrepo: diff --git a/docker/postgres/docker-compose-monolith-with-simple-ui-dbinit-postgres.yml b/docker/postgres/docker-compose-monolith-dbinit-with-ui-postgres.yml similarity index 100% rename from docker/postgres/docker-compose-monolith-with-simple-ui-dbinit-postgres.yml rename to docker/postgres/docker-compose-monolith-dbinit-with-ui-postgres.yml diff --git a/docker/postgres/docker-compose-monolith-postgres.yml b/docker/postgres/docker-compose-monolith-postgres.yml index 288b539d0..998b1ecb4 100644 --- a/docker/postgres/docker-compose-monolith-postgres.yml +++ b/docker/postgres/docker-compose-monolith-postgres.yml @@ -27,8 +27,6 @@ services: - 'SPRING_RABBITMQ_HOST=rabbitmq' - 'SPRING_RABBITMQ_USERNAME=guest' - 'SPRING_RABBITMQ_PASSWORD=guest' - volumes: - - artifactrepo:/app/artifactrepo restart: always ports: - "8080:8080" @@ -37,6 +35,8 @@ services: condition: service_healthy labels: NAME: "hawkbit" + volumes: + - artifactrepo:/app/artifactrepo volumes: artifactrepo: diff --git a/docker/postgres/docker-compose-monolith-with-simple-ui-postgres.yml b/docker/postgres/docker-compose-monolith-with-ui-postgres.yml similarity index 100% rename from docker/postgres/docker-compose-monolith-with-simple-ui-postgres.yml rename to docker/postgres/docker-compose-monolith-with-ui-postgres.yml diff --git a/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/banner.txt b/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/banner.txt index 63097dd44..529034b62 100644 --- a/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/banner.txt +++ b/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/banner.txt @@ -10,5 +10,5 @@ ______ _ _ _ _ ____ _ _ _____ _ Eclipse hawkBit DDI Server ${application.formatted-version} using Spring Boot ${spring-boot.formatted-version} -Go to https://www.eclipse.org/hawkbit for more information. +Go to https://hawkbit.eclipse.dev for more information. \ No newline at end of file diff --git a/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/banner.txt b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/banner.txt index f5591333e..10be72cff 100644 --- a/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/banner.txt +++ b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/banner.txt @@ -10,5 +10,5 @@ ______ _ _ _ _ ____ _ _ _____ _ Eclipse hawkBit DMF Server ${application.formatted-version} using Spring Boot ${spring-boot.formatted-version} -Go to https://www.eclipse.org/hawkbit for more information. +Go to https://hawkbit.eclipse.dev for more information. \ No newline at end of file diff --git a/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/banner.txt b/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/banner.txt index 520ef399c..13801f07e 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/banner.txt +++ b/hawkbit-mgmt/hawkbit-mgmt-server/src/main/resources/banner.txt @@ -10,5 +10,5 @@ ______ _ _ _ _ ____ _ _ __ __ Eclipse hawkBit Management Server ${application.formatted-version} using Spring Boot ${spring-boot.formatted-version} -Go to https://www.eclipse.org/hawkbit for more information. +Go to https://hawkbit.eclipse.dev for more information. \ No newline at end of file diff --git a/hawkbit-monolith/hawkbit-update-server/src/main/resources/banner.txt b/hawkbit-monolith/hawkbit-update-server/src/main/resources/banner.txt index fca127758..6b1707bf8 100644 --- a/hawkbit-monolith/hawkbit-update-server/src/main/resources/banner.txt +++ b/hawkbit-monolith/hawkbit-update-server/src/main/resources/banner.txt @@ -10,5 +10,5 @@ Eclipse hawkBit Update Server ${application.formatted-version} using Spring Boot ${spring-boot.formatted-version} -Go to https://www.eclipse.org/hawkbit for more information. +Go to https://hawkbit.eclipse.dev for more information. \ No newline at end of file diff --git a/hawkbit-ui/src/main/resources/banner.txt b/hawkbit-ui/src/main/resources/banner.txt index f6a26f8ec..7510fb7b1 100644 --- a/hawkbit-ui/src/main/resources/banner.txt +++ b/hawkbit-ui/src/main/resources/banner.txt @@ -4,15 +4,14 @@ ______ _ _ _ _ ____ _ _ | __| / __| | | '_ \/ __|/ _ \ | '_ \ / _` \ \ /\ / / |/ / _ <| | __| | |___| (__| | | |_) \__ \ __/ | | | | (_| |\ V V /| <| |_) | | |_ |______\___|_|_| .__/|___/\___|_|_| |_|\__,_|_\_/\_/ |_|\_\____/|_|\__| - / ____(_)| | | | | | | |_ _| - | (___ _ |_|_ ___ _ __ | | ___ | | | | | | - \___ \| | '_ ` _ \| '_ \| |/ _ \ | | | | | | - ____) | | | | | | | |_) | | __/ | |__| |_| |_ - |_____/|_|_| |_| |_| .__/|_|\___| \____/|_____| - | | - |_| + | | | |_ _| + | | | | | | + | | | | | | + | |__| |_| |_ + \____/|_____| + Eclipse hawkBit UI ${application.formatted-version} using Spring Boot ${spring-boot.formatted-version} -Go to https://www.eclipse.org/hawkbit for more information. +Go to https://hawkbit.eclipse.dev for more information. diff --git a/pom.xml b/pom.xml index 89aaf1d3a..dcc2932f4 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ LOCAL_SCAN true 600 - https://www.eclipse.org/hawkbit + https://hawkbit.eclipse.dev/ https://github.com/eclipse-hawkbit/hawkbit/actions **/*Configuration.java,