Move monolith server in hawkbit_monolith (with monolith starter) (#2006)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

hawkbit-monolith/README.md

@@ -6,10 +6,6 @@ hawkBit Runtime
 | `.sandbox/`              | Content of the hawkBit sandbox installation running on [hawkbit.eclipseprojects.io](https://hawkbit.eclipseprojects.io/UI/). |
 | `docker/`                | Docker related files, such es Dockerfiles, compose and stack files to quickly start up an hawkBit.                           |
 | `docker/docker_build/`   | Docker images build related files, such es Dockerfiles and build shell scripts.                                              |
-| `hawkbit-update-server/` | Spring-Boot application of hawkBit. Monolith containing all services.                                                        |
-| `hawkbit-ddi-server/`    | Spring-Boot application of hawkBit DDI server.                                                                               |
-| `hawkbit-dmf-server/`    | Spring-Boot application of hawkBit DMF server.                                                                               |
-| `hawkbit-mgmt-server/`   | Spring-Boot application of hawkBit Management server. Provides REST Management API and rollouts / auto assigment processing  |
 
 Note: micro service setup requires all services using DB to use same shared DB. So, they don't work with default in
 memory H2 database. Docker compose with mysql shows an example setup.

hawkbit-monolith/hawkbit-boot-starter/pom.xml

@@ -14,9 +14,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-starters</artifactId>
+        <artifactId>hawkbit-monolith-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-boot-starter</artifactId>
     <name>hawkBit :: Spring Boot Starter</name>
     <description>Complete starter, including auto-configuration, logging and all hawkBit interfaces</description>

hawkbit-monolith/hawkbit-update-server/pom.xml

@@ -14,9 +14,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-runtime-parent</artifactId>
+        <artifactId>hawkbit-monolith-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-update-server</artifactId>
     <name>hawkBit :: Runtime :: Update Server (Monolith)</name>
 
@@ -62,4 +63,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${baseDir}</outputDirectory>
+                            <mainClass>${spring.app.class}</mainClass>
+                            <layout>JAR</layout>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
 </project>

hawkbit-monolith/pom.xml

@@ -12,15 +12,19 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
         <artifactId>hawkbit-parent</artifactId>
         <version>${revision}</version>
     </parent>
-    <artifactId>hawkbit-starters</artifactId>
+
-    <name>hawkBit :: Spring Boot Starters</name>
+    <artifactId>hawkbit-monolith-parent</artifactId>
+    <name>hawkBit :: Runtime :: Parent</name>
     <packaging>pom</packaging>
+
     <modules>
         <module>hawkbit-boot-starter</module>
+        <module>hawkbit-update-server</module>
     </modules>
-</project>
+</project>

hawkbit-runtime/pom.xml

@@ -1,56 +0,0 @@
-<!--
-
-    Copyright (c) 2015 Bosch Software Innovations GmbH and others
-
-    This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License 2.0
-    which is available at https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-
--->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-parent</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <artifactId>hawkbit-runtime-parent</artifactId>
-    <name>hawkBit :: Runtime :: Parent</name>
-    <packaging>pom</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${baseDir}</outputDirectory>
-                            <mainClass>${spring.app.class}</mainClass>
-                            <layout>JAR</layout>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
-
-    <modules>
-        <module>hawkbit-update-server</module>
-    </modules>
-</project>

hawkbit-starters/README.md

@@ -1,8 +0,0 @@
-This is a set
-of [Spring Boot Starters](http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using-boot-starter) that
-allows to quick start a spring boot based application with hawkBit's core functionality.
-
-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 [update server](../hawkbit-runtime/hawkbit-update-server) as a reference.

pom.xml

@@ -144,10 +144,9 @@
         <module>hawkbit-mgmt</module>
         <module>hawkbit-ddi</module>
         <module>hawkbit-dmf</module>
-        <module>hawkbit-runtime</module>
+        <module>hawkbit-monolith</module>
-        <module>hawkbit-simple-ui</module>
 
-        <module>hawkbit-starters</module>
+        <module>hawkbit-simple-ui</module>
 
         <module>hawkbit-sdk</module>