dbeaver/dbeaver-infra#161 model refactoring (#31)

* dbeaver/dbeaver-infra#161 model refactoring

* dbeaver/dbeaver-infra#161 working prototype

* dbeaver/dbeaver-infra#161 update readme and code cleanup

* dbeaver/dbeaver-infra#161 GitHub CI/CD & rename osgi-commons to dbeaver-osgi-common

* dbeaver/dbeaver-infra#161 renaming and small fixes

* dbeaver/dbeaver-infra#161 pom fixes

* dbeaver/dbeaver-infra#161 rename package osgi to osgi.dependency.processing

.github/workflows/common-cleanup.yml

@@ -0,0 +1,14 @@
+name: Cleanup
+
+on:
+  pull_request:
+    types: [closed]
+  push:
+    branches:
+      - devel
+
+jobs:
+  delete-caches:
+    name: Cleanup
+    uses: dbeaver/dbeaver-common/.github/workflows/cleanup-caches.yml@devel
+    secrets: inherit

.github/workflows/push-pr-devel.yml

@@ -0,0 +1,25 @@
+name: CI
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  push:
+    branches: [devel]
+
+jobs:
+  build:
+    uses: dbeaver/dbeaver-common/.github/workflows/mvn-package.yml@devel
+    name: Check
+    secrets: inherit
+    with:
+      project-directory: ./idea-rcp-launch-config-generator/aggregate
+      project-deps: ./idea-rcp-launch-config-generator/project.deps
+      timeout-minutes: 2
+
+  lint:
+    uses: dbeaver/dbeaver-common/.github/workflows/java-checkstyle.yml@devel
+    name: Check
+    secrets: inherit

aggregate/pom.xml

@@ -11,6 +11,7 @@
 
   <modules>
     <module>../../dbeaver-common</module>
+    <module>../../dbeaver-osgi-common</module>
     <module>../</module>
   </modules>
 </project>

pom.xml

@@ -4,10 +4,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.dbeaver.common</groupId>
-        <artifactId>com.dbeaver.common.main</artifactId>
-        <version>2.3.1-SNAPSHOT</version>
-        <relativePath>../dbeaver-common</relativePath>
+        <groupId>com.dbeaver.osgi</groupId>
+        <artifactId>dbeaver-osgi-common</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../dbeaver-osgi-common</relativePath>
     </parent>
 
     <groupId>com.dbeaver.tools</groupId>
@@ -51,33 +51,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.dbeaver.common</groupId>
-            <artifactId>org.jkiss.utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>info.picocli</groupId>
-            <artifactId>picocli</artifactId>
-            <version>4.7.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>4.4</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.4.14</version>
+            <groupId>com.dbeaver.osgi</groupId>
+            <artifactId>osgi.dependency.processing</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

project.deps

@@ -0,0 +1,2 @@
+dbeaver-common
+dbeaver-osgi-common

readme.md

@@ -14,6 +14,7 @@ Before proceeding with building DBeaver, ensure that your system meets the follo
 - Clone repositories in the same folder
   - https://github.com/dbeaver/dbeaver-common
   - https://github.com/dbeaver/dbeaver
+  - https://github.com/dbeaver/osgi-commons
   - https://github.com/dbeaver/cloudbeaver (only if you need to make changes in Cloudbeaver)
   - https://github.com/dbeaver/idea-rcp-launch-config-generator
 - Execute the `generate_workspace` script in either the dbeaver or cloudbeaver repo, depending on the workspace you need.