Artifact modules moved in new hawkbit-artifact parent (#2012)

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

.gitignore

@@ -13,6 +13,7 @@ target
 .project
 .idea
 artifactrepo
+apt_generated
 
 # Windows image file caches
 Thumbs.db

hawkbit-artifact-repository-filesystem/.gitignore

@@ -1,2 +0,0 @@
-/artifactrepo/*
-/.apt_generated/

hawkbit-artifact/hawkbit-artifact-api/README.md

@@ -0,0 +1,3 @@
+# hawkBit Artifact API
+
+Various internal interfaces artifact API classes.

hawkbit-artifact/hawkbit-artifact-api/pom.xml

@@ -0,0 +1,46 @@
+<!--
+
+    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-artifact-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>hawkbit-artifact-api</artifactId>
+    <name>hawkBit :: Artifact Repository :: API</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
+
+        <!-- TEST -->
+        <dependency>
+            <groupId>io.github.classgraph</groupId>
+            <artifactId>classgraph</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

hawkbit-artifact/hawkbit-artifact-repository-filesystem/pom.xml

@@ -14,18 +14,20 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-parent</artifactId>
+        <artifactId>hawkbit-artifact-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-artifact-repository-filesystem</artifactId>
     <name>hawkBit :: Artifact Repository :: Filesystem</name>
 
     <dependencies>
         <dependency>
             <groupId>org.eclipse.hawkbit</groupId>
-            <artifactId>hawkbit-core</artifactId>
+            <artifactId>hawkbit-artifact-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>

hawkbit-artifact/pom.xml

@@ -0,0 +1,29 @@
+<!--
+
+    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-artifact-parent</artifactId>
+    <name>hawkBit :: Artifact Repository</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>hawkbit-artifact-api</module>
+        <module>hawkbit-artifact-repository-filesystem</module>
+    </modules>
+</project>

hawkbit-core/.gitignore

@@ -1 +0,0 @@
-/.apt_generated/

hawkbit-core/pom.xml

@@ -17,6 +17,7 @@
         <artifactId>hawkbit-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-core</artifactId>
     <name>hawkBit :: Core</name>
 
@@ -30,10 +31,6 @@
             <artifactId>spring-security-config</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>

hawkbit-repository/hawkbit-repository-api/pom.xml

@@ -21,11 +21,17 @@
     <name>hawkBit :: Repository :: API</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.eclipse.hawkbit</groupId>
+            <artifactId>hawkbit-artifact-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.hawkbit</groupId>
             <artifactId>hawkbit-security-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>

hawkbit-rest-core/pom.xml

@@ -27,6 +27,11 @@
             <artifactId>hawkbit-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.hawkbit</groupId>
+            <artifactId>hawkbit-artifact-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

pom.xml

@@ -136,8 +136,8 @@
         <module>hawkbit-security-core</module>
         <module>hawkbit-security-integration</module>
         <module>hawkbit-http-security</module>
+        <module>hawkbit-artifact</module>
         <module>hawkbit-repository</module>
-        <module>hawkbit-artifact-repository-filesystem</module>
         <module>hawkbit-autoconfigure</module>
 
         <module>hawkbit-rest-core</module>
@@ -798,6 +798,10 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>