Adjust POMs

hal · Dec 28, 2022 · e8ba145 · e8ba145
1 parent 3026db7
commit e8ba145
Show file tree

Hide file tree

Showing 28 changed files with 255 additions and 207 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -22,24 +22,65 @@
 
     <parent>
         <groupId>org.wildfly.halos</groupId>
-        <artifactId>halos-code-parent</artifactId>
+        <artifactId>halos-parent</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../code-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>halos-api</artifactId>
+    <packaging>jar</packaging>
     <name>halOS :: API</name>
     <description>halOS API</description>
-    <packaging>jar</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${quarkus.platform.group-id}</groupId>
+                <artifactId>${quarkus.platform.artifact-id}</artifactId>
+                <version>${version.quarkus}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc</artifactId>
+            <groupId>org.eclipse.microprofile.config</groupId>
+            <artifactId>microprofile-config-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-model-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>mutiny</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-openshift-client</artifactId>
+            <artifactId>quarkus-core</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.mycila</groupId>
+                    <artifactId>license-maven-plugin</artifactId>
+                    <configuration>
+                        <header>../build-config/src/main/resources/etc/license.txt</header>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>
diff --git a/.../halos/proxy/BaseCapabilityExtension.java → ...ly/halos/api/BaseCapabilityExtension.java b/.../halos/proxy/BaseCapabilityExtension.java → ...ly/halos/api/BaseCapabilityExtension.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.wildfly.halos.proxy;
+package org.wildfly.halos.api;
 
 import java.util.Optional;
 
@@ -29,7 +29,8 @@ public abstract class BaseCapabilityExtension implements CapabilityExtension {
     private static final String CAPABILITY_LABELS_PREFIX = "halos.capability.";
     private static final String CAPABILITY_LABELS_SUFFIX = ".label.selector";
 
-    @Inject Config config;
+    @Inject
+    Config config;
     private String labelSelector;
 
     @PostConstruct

diff --git a/...a/org/wildfly/halos/proxy/Capability.java → ...ava/org/wildfly/halos/api/Capability.java b/...a/org/wildfly/halos/proxy/Capability.java → ...ava/org/wildfly/halos/api/Capability.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.wildfly.halos.proxy;
+package org.wildfly.halos.api;
 
 public interface Capability {
 

diff --git a/...dfly/halos/proxy/CapabilityExtension.java → ...ildfly/halos/api/CapabilityExtension.java b/...dfly/halos/proxy/CapabilityExtension.java → ...ildfly/halos/api/CapabilityExtension.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.wildfly.halos.proxy;
+package org.wildfly.halos.api;
 
 import io.smallrye.mutiny.Uni;
 

diff --git a/...a/org/wildfly/halos/proxy/Connection.java → ...ava/org/wildfly/halos/api/Connection.java b/...a/org/wildfly/halos/proxy/Connection.java → ...ava/org/wildfly/halos/api/Connection.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.wildfly.halos.proxy;
+package org.wildfly.halos.api;
 
 import java.time.LocalDateTime;
 

diff --git a/...va/org/wildfly/halos/proxy/Constants.java → ...java/org/wildfly/halos/api/Constants.java b/...va/org/wildfly/halos/proxy/Constants.java → ...java/org/wildfly/halos/api/Constants.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.wildfly.halos.proxy;
+package org.wildfly.halos.api;
 
 public interface Constants {
 

diff --git a/...g/wildfly/halos/proxy/ManagedService.java → ...org/wildfly/halos/api/ManagedService.java b/...g/wildfly/halos/proxy/ManagedService.java → ...org/wildfly/halos/api/ManagedService.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.wildfly.halos.proxy;
+package org.wildfly.halos.api;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/...los/proxy/ManagedServiceModification.java → ...halos/api/ManagedServiceModification.java b/...los/proxy/ManagedServiceModification.java → ...halos/api/ManagedServiceModification.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.wildfly.halos.proxy;
+package org.wildfly.halos.api;
 
 public record ManagedServiceModification(ManagedService managedService, Modification modification) {
 }
diff --git a/...org/wildfly/halos/proxy/Modification.java → ...a/org/wildfly/halos/api/Modification.java b/...org/wildfly/halos/proxy/Modification.java → ...a/org/wildfly/halos/api/Modification.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.wildfly.halos.proxy;
+package org.wildfly.halos.api;
 
 public enum Modification {
     ADD, UPDATE, DELETE

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -22,14 +22,14 @@
 
     <parent>
         <groupId>org.wildfly.halos</groupId>
-        <artifactId>halos-proxy-parent</artifactId>
+        <artifactId>halos-parent</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>halos-bom</artifactId>
+    <packaging>pom</packaging>
     <name>halOS :: BOM</name>
     <description>Bill of materials</description>
-    <packaging>pom</packaging>
 
     <dependencyManagement>
         <dependencies>
@@ -38,16 +38,6 @@
                 <artifactId>halos-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>halos-quarkus-capability</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>halos-wildfly-capability</artifactId>
-                <version>${project.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/build-config/pom.xml b/build-config/pom.xml
@@ -21,14 +21,14 @@
 
     <parent>
         <groupId>org.wildfly.halos</groupId>
-        <artifactId>halos-proxy-parent</artifactId>
+        <artifactId>halos-parent</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>halos-build-config</artifactId>
+    <packaging>jar</packaging>
     <name>halOS :: Build Config</name>
     <description>Build configuration for checkstyle, eclipse formatter and license check</description>
-    <packaging>jar</packaging>
 
     <build>
         <pluginManagement>

diff --git a/capabilities/pom.xml b/capabilities/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+     Copyright 2022 Red Hat
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         https://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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.wildfly.halos</groupId>
+        <artifactId>halos-code-parent</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../code-parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>halos-capabilities</artifactId>
+    <packaging>pom</packaging>
+    <name>halOS :: Capabilities</name>
+    <description>halOS built-in capabilities</description>
+
+    <modules>
+        <module>quarkus</module>
+        <module>wildfly</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+             <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>halos-quarkus-capability</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+             <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>halos-wildfly-capability</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/capabilities/quarkus/pom.xml b/capabilities/quarkus/pom.xml
@@ -22,19 +22,14 @@
 
     <parent>
         <groupId>org.wildfly.halos</groupId>
-        <artifactId>halos-code-parent</artifactId>
+        <artifactId>halos-capabilities</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../code-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>halos-quarkus-capability</artifactId>
+    <packaging>jar</packaging>
     <name>halOS :: Quarkus Capability</name>
     <description>halOS Quarkus capability</description>
-    <packaging>jar</packaging>
-
-    <properties>
-        <version.guava>31.1-jre</version.guava>
-    </properties>
 
     <dependencies>
         <dependency>
@@ -53,10 +48,13 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-openshift-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${version.guava}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/...ilities/quarkus/src/main/java/org/wildfly/halos/capability/quarkus/QuarkusCapability.java b/...ilities/quarkus/src/main/java/org/wildfly/halos/capability/quarkus/QuarkusCapability.java
@@ -15,7 +15,7 @@
  */
 package org.wildfly.halos.capability.quarkus;
 
-import org.wildfly.halos.proxy.Capability;
+import org.wildfly.halos.api.Capability;
 
 public record QuarkusCapability(String name, String title) implements Capability {
 

diff --git a/...bilities/quarkus/src/main/java/org/wildfly/halos/capability/quarkus/QuarkusExtension.java b/...bilities/quarkus/src/main/java/org/wildfly/halos/capability/quarkus/QuarkusExtension.java
@@ -20,11 +20,11 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
-import org.wildfly.halos.proxy.BaseCapabilityExtension;
-import org.wildfly.halos.proxy.Capability;
-import org.wildfly.halos.proxy.CapabilityExtension;
-import org.wildfly.halos.proxy.Connection;
-import org.wildfly.halos.proxy.ManagedService;
+import org.wildfly.halos.api.BaseCapabilityExtension;
+import org.wildfly.halos.api.Capability;
+import org.wildfly.halos.api.CapabilityExtension;
+import org.wildfly.halos.api.Connection;
+import org.wildfly.halos.api.ManagedService;
 
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.openshift.client.OpenShiftClient;
@@ -34,8 +34,8 @@
 import com.google.common.net.HostAndPort;
 
 import static java.util.stream.Collectors.toList;
-import static org.wildfly.halos.proxy.Constants.HTTPS_PORT;
-import static org.wildfly.halos.proxy.Constants.HTTP_PORT;
+import static org.wildfly.halos.api.Constants.HTTPS_PORT;
+import static org.wildfly.halos.api.Constants.HTTP_PORT;
 
 @ApplicationScoped
 public class QuarkusExtension extends BaseCapabilityExtension implements CapabilityExtension {

diff --git a/.../quarkus/src/main/java/org/wildfly/halos/capability/quarkus/QuarkusServiceRepository.java b/.../quarkus/src/main/java/org/wildfly/halos/capability/quarkus/QuarkusServiceRepository.java
@@ -21,7 +21,7 @@
 
 import javax.enterprise.context.ApplicationScoped;
 
-import org.wildfly.halos.proxy.ManagedService;
+import org.wildfly.halos.api.ManagedService;
 
 @ApplicationScoped
 class QuarkusServiceRepository {

diff --git a/capabilities/wildfly/pom.xml b/capabilities/wildfly/pom.xml
@@ -33,11 +33,25 @@
     <packaging>jar</packaging>
 
     <properties>
-        <version.guava>31.1-jre</version.guava>
         <version.semantic.version>2.1.1</version.semantic.version>
         <version.wildfly.quarkus>0.0.1.Final</version.wildfly.quarkus>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+        <dependency>
+            <groupId>de.skuzzle</groupId>
+            <artifactId>semantic-version</artifactId>
+            <version>${version.semantic.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly.quarkus</groupId>
+            <artifactId>quarkus-wildfly-client</artifactId>
+            <version>${version.wildfly.quarkus}</version>
+        </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.wildfly.halos</groupId>
@@ -55,20 +69,21 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-openshift-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${version.guava}</version>
         </dependency>
         <dependency>
             <groupId>de.skuzzle</groupId>
             <artifactId>semantic-version</artifactId>
-            <version>${version.semantic.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wildfly.quarkus</groupId>
             <artifactId>quarkus-wildfly-client</artifactId>
-            <version>${version.wildfly.quarkus}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>