Add parent pom for client module

quarkiverse · Oct 31, 2023 · fd20ddd · fd20ddd
1 parent e8e13eb
commit fd20ddd
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 22 deletions.
diff --git a/client/deployment/pom.xml b/client/deployment/pom.xml
@@ -3,9 +3,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.quarkiverse.openapi.generator</groupId>
-    <artifactId>quarkus-openapi-generator-parent</artifactId>
+    <artifactId>quarkus-openapi-generator-client-parent</artifactId>
     <version>3.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>quarkus-openapi-generator-deployment</artifactId>
   <name>Quarkus - Openapi Generator - Deployment</name>

diff --git a/client/docs/pom.xml b/client/docs/pom.xml
@@ -4,7 +4,7 @@
 
   <parent>
     <groupId>io.quarkiverse.openapi.generator</groupId>
-    <artifactId>quarkus-openapi-generator-parent</artifactId>
+    <artifactId>quarkus-openapi-generator-client-parent</artifactId>
     <version>3.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
@@ -33,7 +33,7 @@
               </goals>
               <configuration>
                 <files>
-                  <file>${project.basedir}/../.github/project.yml</file>
+                  <file>${project.basedir}/../../.github/project.yml</file>
                 </files>
               </configuration>
             </execution>

diff --git a/client/integration-tests/pom.xml b/client/integration-tests/pom.xml
@@ -3,9 +3,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.quarkiverse.openapi.generator</groupId>
-    <artifactId>quarkus-openapi-generator-parent</artifactId>
+    <artifactId>quarkus-openapi-generator-client-parent</artifactId>
     <version>3.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>quarkus-openapi-generator-integration-tests</artifactId>
   <name>Quarkus - Openapi Generator - Integration Tests</name>

diff --git a/client/pom.xml b/client/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <parent>
+        <artifactId>quarkus-openapi-generator-parent</artifactId>
+        <groupId>io.quarkiverse.openapi.generator</groupId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-openapi-generator-client-parent</artifactId>
+    <name>Quarkus - Openapi Generator - Client - Parent</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+        <module>docs</module>
+    </modules>
+</project>
diff --git a/client/runtime/pom.xml b/client/runtime/pom.xml
@@ -3,9 +3,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.quarkiverse.openapi.generator</groupId>
-    <artifactId>quarkus-openapi-generator-parent</artifactId>
+    <artifactId>quarkus-openapi-generator-client-parent</artifactId>
     <version>3.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>quarkus-openapi-generator</artifactId>
   <name>Quarkus - Openapi Generator - Runtime</name>

diff --git a/client/test-utils/pom.xml b/client/test-utils/pom.xml
@@ -2,10 +2,10 @@
 <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>
-    <artifactId>quarkus-openapi-generator-parent</artifactId>
+    <artifactId>quarkus-openapi-generator-client-parent</artifactId>
     <groupId>io.quarkiverse.openapi.generator</groupId>
     <version>3.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>quarkus-openapi-generator-test-utils</artifactId>
   <name>Quarkus - Openapi Generator - Test Utils</name>

diff --git a/pom.xml b/pom.xml
@@ -12,11 +12,8 @@
   <packaging>pom</packaging>
   <name>Quarkus - Openapi Generator - Parent</name>
   <modules>
-    <module>client/deployment</module>
-    <module>client/runtime</module>
-    <module>client/test-utils</module>
+    <module>client</module>
     <module>server</module>
-    <module>docs</module>
   </modules>
   <scm>
     <connection>:git:[email protected]:quarkiverse/quarkus-openapi-generator.git</connection>

diff --git a/...va/io/quarkiverse/openapi/server/generator/deployment/codegen/ApicurioCodegenWrapper.java b/...va/io/quarkiverse/openapi/server/generator/deployment/codegen/ApicurioCodegenWrapper.java
@@ -1,12 +1,6 @@
 package io.quarkiverse.openapi.server.generator.deployment.codegen;
 
-import io.apicurio.hub.api.codegen.JaxRsProjectSettings;
-import io.apicurio.hub.api.codegen.OpenApi2JaxRs;
-import io.quarkus.bootstrap.prebuild.CodeGenException;
-import org.apache.commons.io.IOUtils;
-import org.eclipse.microprofile.config.Config;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static io.quarkiverse.openapi.server.generator.deployment.CodegenConfig.getBasePackagePropertyName;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -19,7 +13,14 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static io.quarkiverse.openapi.server.generator.deployment.CodegenConfig.getBasePackagePropertyName;
+import org.apache.commons.io.IOUtils;
+import org.eclipse.microprofile.config.Config;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.apicurio.hub.api.codegen.JaxRsProjectSettings;
+import io.apicurio.hub.api.codegen.OpenApi2JaxRs;
+import io.quarkus.bootstrap.prebuild.CodeGenException;
 
 public class ApicurioCodegenWrapper {