Fix modules and sources (#199)

quarkiverse · Oct 18, 2024 · e8e129a · e8e129a
1 parent e242666
commit e8e129a
Show file tree

Hide file tree

Showing 16 changed files with 85 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 </td>
 <td valign="top">
 
-[![Version](https://img.shields.io/maven-central/v/io.quarkiverse.roq/quarkus-roq?logo=apache-maven&style=flat-square)](https://central.sonatype.com/artifact/io.quarkiverse.roq/quarkus-roq-parent)
+[![Version](https://img.shields.io/maven-central/v/io.quarkiverse.roq/quarkus-roq?logo=apache-maven&style=flat-square)](https://central.sonatype.com/artifact/io.quarkiverse.roq/quarkus-roq-project-parent)
 </td>
 </tr>
 </table>

diff --git a/common/deployment/pom.xml b/common/deployment/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.quarkiverse.roq</groupId>
-        <artifactId>quarkus-roq-parent</artifactId>
+        <artifactId>quarkus-roq-common-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>quarkus-roq-common-deployment</artifactId>
     <name>Quarkus Roq - Common - Deployment</name>

diff --git a/common/pom.xml b/common/pom.xml
@@ -0,0 +1,33 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkiverse.roq</groupId>
+        <artifactId>quarkus-roq-project-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>quarkus-roq-common-parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Quarkus Roq - Common - Parent</name>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>!true</value>
+                </property>
+            </activation>
+            <modules>
+                <module>integration-tests</module>
+            </modules>
+        </profile>
+    </profiles>
+</project>
diff --git a/common/runtime/pom.xml b/common/runtime/pom.xml
@@ -4,9 +4,9 @@
 
     <parent>
         <groupId>io.quarkiverse.roq</groupId>
-        <artifactId>quarkus-roq-parent</artifactId>
+        <artifactId>quarkus-roq-common-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>quarkus-roq-common</artifactId>
     <name>Quarkus Roq - Common</name>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.quarkiverse.roq</groupId>
-        <artifactId>quarkus-roq-parent</artifactId>
+        <artifactId>quarkus-roq-project-parent</artifactId>
         <version>999-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>io.quarkiverse.roq</groupId>
-        <artifactId>quarkus-roq-parent</artifactId>
+        <artifactId>quarkus-roq-project-parent</artifactId>
         <version>999-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/pom.xml b/pom.xml
@@ -8,20 +8,18 @@
         <version>18</version>
     </parent>
     <groupId>io.quarkiverse.roq</groupId>
-    <artifactId>quarkus-roq-parent</artifactId>
+    <artifactId>quarkus-roq-project-parent</artifactId>
     <version>999-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Quarkus Roq - Parent</name>
+    <name>Quarkus Roq - Project - Parent</name>
     <description>Generate static websites out of your Quarkus web application.</description>
 
     <modules>
-        <module>common/runtime</module>
-        <module>common/deployment</module>
+        <module>common</module>
         <module>roq-generator</module>
         <module>roq-data</module>
         <module>roq-frontmatter</module>
-        <module>roq/runtime</module>
-        <module>roq/deployment</module>
+        <module>roq</module>
         <module>plugin</module>
         <module>theme</module>
     </modules>
@@ -105,7 +103,6 @@
             </activation>
             <modules>
                 <module>blog</module>
-                <module>roq/integration-tests</module>
             </modules>
         </profile>
     </profiles>

diff --git a/roq-data/pom.xml b/roq-data/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>io.quarkiverse.roq</groupId>
-        <artifactId>quarkus-roq-parent</artifactId>
+        <artifactId>quarkus-roq-project-parent</artifactId>
         <version>999-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/roq-frontmatter/pom.xml b/roq-frontmatter/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>io.quarkiverse.roq</groupId>
-        <artifactId>quarkus-roq-parent</artifactId>
+        <artifactId>quarkus-roq-project-parent</artifactId>
         <version>999-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/roq-generator/pom.xml b/roq-generator/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>io.quarkiverse.roq</groupId>
-        <artifactId>quarkus-roq-parent</artifactId>
+        <artifactId>quarkus-roq-project-parent</artifactId>
         <version>999-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/roq/deployment/pom.xml b/roq/deployment/pom.xml
@@ -6,7 +6,7 @@
         <groupId>io.quarkiverse.roq</groupId>
         <artifactId>quarkus-roq-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>quarkus-roq-deployment</artifactId>
     <name>Quarkus Roq - Deployment</name>

diff --git a/roq/deployment/src/main/resources/dummy.txt b/roq/deployment/src/main/resources/dummy.txt
@@ -0,0 +1 @@
+to trigger source jar
diff --git a/roq/integration-tests/pom.xml b/roq/integration-tests/pom.xml
@@ -6,7 +6,7 @@
         <groupId>io.quarkiverse.roq</groupId>
         <artifactId>quarkus-roq-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-roq-integration-tests</artifactId>

diff --git a/roq/pom.xml b/roq/pom.xml
@@ -0,0 +1,33 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkiverse.roq</groupId>
+        <artifactId>quarkus-roq-project-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>quarkus-roq-parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Quarkus Roq - Parent</name>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>!true</value>
+                </property>
+            </activation>
+            <modules>
+                <module>integration-tests</module>
+            </modules>
+        </profile>
+    </profiles>
+</project>
diff --git a/roq/runtime/pom.xml b/roq/runtime/pom.xml
@@ -6,7 +6,7 @@
         <groupId>io.quarkiverse.roq</groupId>
         <artifactId>quarkus-roq-parent</artifactId>
         <version>999-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>quarkus-roq</artifactId>
     <name>Quarkus Roq - Runtime</name>

diff --git a/theme/pom.xml b/theme/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>io.quarkiverse.roq</groupId>
-        <artifactId>quarkus-roq-parent</artifactId>
+        <artifactId>quarkus-roq-project-parent</artifactId>
         <version>999-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>