Move channel modules back under feature packs projects

rhusar · Apr 2, 2024 · 1b2eb10 · 1b2eb10
1 parent c4dc8ff
commit 1b2eb10
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 107 deletions.
diff --git a/channels/pom.xml b/channels/pom.xml
diff --git a/channels/preview/src/main/resources/wildfly-preview-channel.yaml b/channels/preview/src/main/resources/wildfly-preview-channel.yaml
diff --git a/channels/wildfly-ee/src/main/resources/wildfly-ee-channel.yaml b/channels/wildfly-ee/src/main/resources/wildfly-ee-channel.yaml
diff --git a/channels/wildfly/src/main/resources/wildfly-channel.yaml b/channels/wildfly/src/main/resources/wildfly-channel.yaml
diff --git a/channels/preview/assembly.xml → ee-feature-pack/channel/assembly.xml b/channels/preview/assembly.xml → ee-feature-pack/channel/assembly.xml
@@ -12,7 +12,7 @@
     </formats>
     <files>
         <file>
-            <source>../../preview/feature-pack/target/wildfly-preview-feature-pack-${project.version}-manifest.yaml</source>
+            <source>../galleon-feature-pack/target/wildfly-ee-galleon-pack-${project.version}-manifest.yaml</source>
             <outputDirectory>./</outputDirectory>
             <destName>${project.artifactId}-${project.version}-manifest.yaml</destName>
         </file>

diff --git a/channels/wildfly-ee/pom.xml → ee-feature-pack/channel/pom.xml b/channels/wildfly-ee/pom.xml → ee-feature-pack/channel/pom.xml
@@ -11,15 +11,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.wildfly.channels</groupId>
-        <artifactId>wildfly-channels-parent</artifactId>
+        <!--
+        skip wildfly-feature-pack-parent and use wildfly-parent to avoid issues
+        with dependencies imported with groupId ${project.groupId}
+        -->
+        <groupId>org.wildfly</groupId>
+        <artifactId>wildfly-parent</artifactId>
         <!--
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
         <version>32.0.0.Beta1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.wildfly.channels</groupId>
     <artifactId>wildfly-ee</artifactId>
 
     <name>WildFly: EE Feature Pack Channel</name>
@@ -31,8 +37,8 @@
         <dependency>
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-ee-galleon-pack</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -152,9 +158,9 @@
                 </executions>
                 <configuration>
                     <manifestPath>${project.build.directory}/assembly-manifest-rename/assembly/${project.artifactId}-${project.version}-manifest.yaml</manifestPath>
-                    <manifestName>Wildfly EE manifest version ${project.version}</manifestName>
+                    <manifestName>WildFly EE manifest version ${project.version}</manifestName>
                     <manifestId>${project.groupId}:${project.artifactId}</manifestId>
-                    <manifestDescription>Manifest for Wildfly EE feature pack.</manifestDescription>
+                    <manifestDescription>Manifest for WildFly EE feature pack.</manifestDescription>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/ee-feature-pack/pom.xml b/ee-feature-pack/pom.xml
@@ -27,6 +27,7 @@
     <name>WildFly: EE Feature Pack Parent</name>
 
     <modules>
+        <module>channel</module>
         <module>galleon-feature-pack</module>
         <module>galleon-local</module>
         <module>galleon-shared</module>

diff --git a/channels/wildfly/assembly.xml → galleon-pack/channel/assembly.xml b/channels/wildfly/assembly.xml → galleon-pack/channel/assembly.xml
@@ -12,7 +12,7 @@
     </formats>
     <files>
         <file>
-            <source>../../galleon-pack/galleon-feature-pack/target/wildfly-galleon-pack-${project.version}-manifest.yaml</source>
+            <source>../galleon-feature-pack/target/wildfly-galleon-pack-${project.version}-manifest.yaml</source>
             <outputDirectory>./</outputDirectory>
             <destName>${project.artifactId}-${project.version}-manifest.yaml</destName>
         </file>

diff --git a/channels/wildfly/pom.xml → galleon-pack/channel/pom.xml b/channels/wildfly/pom.xml → galleon-pack/channel/pom.xml
@@ -11,15 +11,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.wildfly.channels</groupId>
-        <artifactId>wildfly-channels-parent</artifactId>
+        <!--
+        skip wildfly-feature-pack-parent and use wildfly-parent to avoid issues
+        with dependencies imported with groupId ${project.groupId}
+        -->
+        <groupId>org.wildfly</groupId>
+        <artifactId>wildfly-parent</artifactId>
         <!--
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
         <version>32.0.0.Beta1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.wildfly.channels</groupId>
     <artifactId>wildfly</artifactId>
 
     <name>WildFly: Feature Pack Channel</name>
@@ -31,8 +37,8 @@
         <dependency>
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-galleon-pack</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -152,9 +158,9 @@
                 </executions>
                 <configuration>
                     <manifestPath>${project.build.directory}/assembly-manifest-rename/assembly/${project.artifactId}-${project.version}-manifest.yaml</manifestPath>
-                    <manifestName>Wildfly manifest version ${project.version}</manifestName>
+                    <manifestName>WildFly manifest version ${project.version}</manifestName>
                     <manifestId>${project.groupId}:${project.artifactId}</manifestId>
-                    <manifestDescription>Manifest for Wildfly feature pack.</manifestDescription>
+                    <manifestDescription>Manifest for WildFly feature pack.</manifestDescription>
                     <manifestRequirements>
                         <manifestRequirement>
                             <id>${project.groupId}:wildfly-ee</id>

diff --git a/galleon-pack/pom.xml b/galleon-pack/pom.xml
@@ -27,6 +27,7 @@
     <name>WildFly: Feature Pack Parent</name>
 
     <modules>
+        <module>channel</module>
         <module>galleon-feature-pack</module>
         <module>galleon-local</module>
         <module>galleon-shared</module>

diff --git a/pom.xml b/pom.xml
@@ -52,7 +52,6 @@
         <module>boms/standard-test-expansion</module>
         <module>boms/user</module>
         <module>build</module>
-        <module>channels</module>
         <module>client/properties</module>
         <module>client/shade</module>
         <module>clustering</module>

diff --git a/channels/wildfly-ee/assembly.xml → preview/channel/assembly.xml b/channels/wildfly-ee/assembly.xml → preview/channel/assembly.xml
@@ -12,7 +12,7 @@
     </formats>
     <files>
         <file>
-            <source>../../ee-feature-pack/galleon-feature-pack/target/wildfly-ee-galleon-pack-${project.version}-manifest.yaml</source>
+            <source>../feature-pack/target/wildfly-preview-feature-pack-${project.version}-manifest.yaml</source>
             <outputDirectory>./</outputDirectory>
             <destName>${project.artifactId}-${project.version}-manifest.yaml</destName>
         </file>

diff --git a/channels/preview/pom.xml → preview/channel/pom.xml b/channels/preview/pom.xml → preview/channel/pom.xml
@@ -11,15 +11,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.wildfly.channels</groupId>
-        <artifactId>wildfly-channels-parent</artifactId>
+        <!--
+        skip wildfly-feature-pack-parent and use wildfly-parent to avoid issues
+        with dependencies imported with groupId ${project.groupId}
+        -->
+        <groupId>org.wildfly</groupId>
+        <artifactId>wildfly-parent</artifactId>
         <!--
         Maintain separation between the artifact id and the version to help prevent
         merge conflicts between commits changing the GA and those changing the V.
         -->
         <version>32.0.0.Beta1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.wildfly.channels</groupId>
     <artifactId>wildfly-preview</artifactId>
 
     <name>WildFly: Preview Feature Pack Channel</name>
@@ -31,7 +37,7 @@
         <dependency>
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-preview-feature-pack</artifactId>
-            <version>${project.version}</version>
+            <version>${ee.maven.version}</version>
             <type>zip</type>
             <scope>provided</scope>
         </dependency>
@@ -152,9 +158,9 @@
                 </executions>
                 <configuration>
                     <manifestPath>${project.build.directory}/assembly-manifest-rename/assembly/${project.artifactId}-${project.version}-manifest.yaml</manifestPath>
-                    <manifestName>Wildfly preview manifest version ${project.version}</manifestName>
+                    <manifestName>WildFly preview manifest version ${project.version}</manifestName>
                     <manifestId>${project.groupId}:${project.artifactId}</manifestId>
-                    <manifestDescription>Manifest for Wildfly preview feature pack.</manifestDescription>
+                    <manifestDescription>Manifest for WildFly preview feature pack.</manifestDescription>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/preview/pom.xml b/preview/pom.xml
@@ -99,6 +99,7 @@
 
             <modules>
                 <module>build</module>
+                <module>channel</module>
                 <module>dist</module>
                 <module>feature-pack</module>
                 <module>galleon-local</module>