Merge pull request #488 from spyrkob/remove_dist_common_dependency_1.1

Remove dist-common module from dependencies included in standalone FP
wildfly-extras · Oct 24, 2023 · 1e5d31e · 1e5d31e
2 parents f710d74 + ef5a3ba
commit 1e5d31e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 36 deletions.
diff --git a/dist/common/pom.xml b/dist/common/pom.xml
@@ -7,7 +7,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>prospero-dist-common</artifactId>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
 
   <properties>
       <prospero.script.path>packages/org.jboss.prospero/content/bin/</prospero.script.path>
@@ -39,10 +39,38 @@
             </resource>
         </resources>
         <plugins>
+        <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-sources</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                  <directory>${project.basedir}/src/main/resources</directory>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
+                    <execution>
+                        <id>copy-sources</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
                     <execution>
                         <id>generate-sources</id>
                         <phase>compile</phase>
@@ -60,30 +88,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>assemble</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>assembly.xml</descriptor>
-                            </descriptors>
-                            <recompressZippedFiles>true</recompressZippedFiles>
-                            <finalName>${project.build.finalName}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                            <workDirectory>${project.build.directory}/assembly/work</workDirectory>
-                            <tarLongFileMode>posix</tarLongFileMode>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -30,6 +30,7 @@
             <dependency>
                 <groupId>org.wildfly.prospero</groupId>
                 <artifactId>prospero-dist-common</artifactId>
+                <type>pom</type>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

diff --git a/dist/standalone-galleon-pack/pom.xml b/dist/standalone-galleon-pack/pom.xml
@@ -65,6 +65,7 @@
         <dependency>
             <groupId>org.wildfly.prospero</groupId>
             <artifactId>prospero-dist-common</artifactId>
+            <type>pom</type>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -554,17 +555,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.wildfly.galleon-plugins</groupId>
-            <artifactId>wildfly-config-gen</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.wildfly.galleon-plugins</groupId>
             <artifactId>wildfly-galleon-plugins</artifactId>

diff --git a/dist/wildfly-galleon-pack/pom.xml b/dist/wildfly-galleon-pack/pom.xml
@@ -70,6 +70,7 @@
     <dependency>
       <groupId>org.wildfly.prospero</groupId>
       <artifactId>prospero-dist-common</artifactId>
+      <type>pom</type>
       <scope>provided</scope>
       <exclusions>
         <exclusion>