Moves DDI artifacts into a dedicated directory/artifact parent (#2002)

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

hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,5 +1,4 @@
 org.eclipse.hawkbit.autoconfigure.cache.CacheAutoConfiguration
-org.eclipse.hawkbit.autoconfigure.ddi.DDiApiAutoConfiguration
 org.eclipse.hawkbit.autoconfigure.mgmt.MgmtApiAutoConfiguration
 org.eclipse.hawkbit.autoconfigure.repository.event.EventPublisherAutoConfiguration
 org.eclipse.hawkbit.autoconfigure.repository.ArtifactFilesystemAutoConfiguration

hawkbit-ddi/hawkbit-boot-starter-ddi-api/pom.xml

@@ -14,9 +14,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-starters</artifactId>
+        <artifactId>hawkbit-ddi-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-boot-starter-ddi-api</artifactId>
     <name>hawkBit :: Spring Boot Starter DDI API</name>
 
@@ -71,6 +72,5 @@
             <version>${project.version}</version>
         </dependency>
         <!-- hawkBit - END -->
-
     </dependencies>
 </project>

hawkbit-ddi/hawkbit-boot-starter-ddi-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.eclipse.hawkbit.autoconfigure.ddi.DDiApiAutoConfiguration

hawkbit-ddi/hawkbit-ddi-api/pom.xml

@@ -16,9 +16,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-rest-parent</artifactId>
+        <artifactId>hawkbit-ddi-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-ddi-api</artifactId>
     <name>hawkBit :: REST :: DDI API</name>
 

hawkbit-ddi/hawkbit-ddi-resource/pom.xml

@@ -16,9 +16,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-rest-parent</artifactId>
+        <artifactId>hawkbit-ddi-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-ddi-resource</artifactId>
     <name>hawkBit :: REST :: DDI Resources</name>
 

hawkbit-ddi/hawkbit-ddi-server/pom.xml

@@ -0,0 +1,94 @@
+<!--
+
+    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-ddi-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>hawkbit-ddi-server</artifactId>
+    <name>hawkBit :: Runtime :: DDI Server</name>
+
+    <properties>
+        <spring.app.class>org.eclipse.hawkbit.app.ddi.DDIStart</spring.app.class>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.hawkbit</groupId>
+            <artifactId>hawkbit-boot-starter-ddi-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-binder-rabbit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>org.eclipse.hawkbit</groupId>
+            <artifactId>hawkbit-repository-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- if run against mysql -->
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <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-ddi/pom.xml

@@ -0,0 +1,31 @@
+<!--
+
+    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-ddi-parent</artifactId>
+    <name>hawkBit :: DDI</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>hawkbit-ddi-api</module>
+        <module>hawkbit-ddi-resource</module>
+        <module>hawkbit-boot-starter-ddi-api</module>
+        <module>hawkbit-ddi-server</module>
+    </modules>
+</project>

hawkbit-dmf/hawkbit-boot-starter-dmf-api/pom.xml

@@ -54,23 +54,5 @@
             <artifactId>spring-security-aspects</artifactId>
         </dependency>
         <!-- Spring - END -->
-
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-        </dependency>
     </dependencies>
 </project>

hawkbit-dmf/hawkbit-dmf-server/pom.xml

@@ -36,6 +36,24 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-stream-binder-rabbit</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

hawkbit-dmf/pom.xml

@@ -17,6 +17,7 @@
         <artifactId>hawkbit-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-dmf-parent</artifactId>
     <name>hawkBit :: DMF</name>
     <packaging>pom</packaging>

hawkbit-rest/pom.xml

@@ -25,7 +25,5 @@
         <module>hawkbit-rest-core</module>
         <module>hawkbit-mgmt-api</module>
         <module>hawkbit-mgmt-resource</module>
-        <module>hawkbit-ddi-api</module>
-        <module>hawkbit-ddi-resource</module>
     </modules>
 </project>

hawkbit-runtime/hawkbit-ddi-server/pom.xml

@@ -1,39 +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-runtime-parent</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <artifactId>hawkbit-ddi-server</artifactId>
-    <name>hawkBit :: Runtime :: DDI Server</name>
-
-    <properties>
-        <spring.app.class>org.eclipse.hawkbit.app.ddi.DDIStart</spring.app.class>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.hawkbit</groupId>
-            <artifactId>hawkbit-boot-starter-ddi-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-stream-binder-rabbit</artifactId>
-        </dependency>
-    </dependencies>
-</project>

hawkbit-runtime/pom.xml

@@ -85,7 +85,6 @@
     </build>
 
     <modules>
-        <module>hawkbit-ddi-server</module>
         <module>hawkbit-mgmt-server</module>
         <module>hawkbit-simple-ui</module>
 

hawkbit-starters/pom.xml

@@ -23,6 +23,5 @@
     <modules>
         <module>hawkbit-boot-starter</module>
         <module>hawkbit-boot-starter-mgmt-api</module>
-        <module>hawkbit-boot-starter-ddi-api</module>
     </modules>
 </project>

pom.xml

@@ -140,6 +140,7 @@
         <module>hawkbit-artifact-repository-filesystem</module>
         <module>hawkbit-autoconfigure</module>
         <module>hawkbit-rest</module>
+        <module>hawkbit-ddi</module>
         <module>hawkbit-dmf</module>
         <module>hawkbit-test-report</module>
         <module>hawkbit-runtime</module>