rename version.jboss.bom to version.wildfly.bom

Signed-off-by: Jeff Mesnil <jmesnil@redhat.com>
wildfly · Aug 18, 2023 · 441572e · 441572e
1 parent 92a27bd
commit 441572e
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 68 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Determine Archetype & WildFly versions
       run: |-
         ARCHETYPE_VERSION=$(mvn -B help:evaluate -Dexpression=project.version -DforceStdout -q)
-        WILDFLY_VERSION=$(mvn -B help:evaluate -Dexpression=version.jboss.bom -DforceStdout -q)
+        WILDFLY_VERSION=$(mvn -B help:evaluate -Dexpression=version.wildfly.bom -DforceStdout -q)
         echo "ARCHETYPE_VERSION=$ARCHETYPE_VERSION" >> "$GITHUB_ENV"
         echo "WILDFLY_VERSION=$WILDFLY_VERSION" >> "$GITHUB_ENV"
         echo "## Testing archetypes ${ARCHETYPE_VERSION} with WildFly ${WILDFLY_VERSION}" >> $GITHUB_STEP_SUMMARY

diff --git a/README.md b/README.md
@@ -1,4 +1,28 @@
 WildFly archetypes
 ==================
 
+This project contains Maven Archetypes to generate Maven projects to develop Jakarta EE applications with [WildFly](https://wildfly.org/)
 
+* [wildfly-jakartaee-webapp-archetype](/wildfly-jakartaee-webapp-archetype/) generates a Maven project to develop a simple Web Archive (WAR) with WildFly
+* [wildfly-jakartaee-ear-archetype](/wildfly-jakartaee-ear-archetype/) generates a Maven project to develop a Entreprise Archive (EAR) with WildFly. It generates an EJB and WAR modules to compose the EAR
+* [wildfly-subsystem-archetype](/wildfly-subsystem-archetype/) generates a Maven project to develop a WildFly subsystem to extend the capabilities of WildFly.
+
+[[newwildflyversion]]
+## Component dependencies
+
+The versions of all dependencies and plugins that are used by this archetype are configured in the parent's `pom.xml`.
+
+To update the archetypes to new versions:
+
+* update to latest "org.jboss:jboss-parent" version found at https://repo.maven.apache.org/maven2/org/jboss/jboss-parent/
+* update the version property named "version.wildfly.bom"
+* check whether dependencies have changed.
+* check the plugin versions and update if necessary:
+
+** wildfly-maven-plugin: https://repo.maven.apache.org/maven2/org/wildfly/plugins/wildfly-maven-plugin/
+** maven-compiler-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/
+** maven-surefire-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/
+** maven-failsafe-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-failsafe-plugin/
+** maven-war-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-war-plugin/
+** maven-ear-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-ear-plugin/
+** maven-ejb-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-ejb-plugin/
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
         actually use these dependencies.
     -->
     <properties>
-        <version.jboss.bom>29.0.0.Final</version.jboss.bom>
+        <version.wildfly.bom>29.0.0.Final</version.wildfly.bom>
         <version.wildfly.core>21.1.0.Final</version.wildfly.core>
         <version.wildfly.maven.plugin>4.2.0.Final</version.wildfly.maven.plugin>
 
@@ -61,13 +61,13 @@
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
                 <artifactId>wildfly-ee-with-tools</artifactId>
-                <version>\${version.jboss.bom}</version>
+                <version>${version.wildfly.bom}</version>
                 <type>pom</type>
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <build>
 
+    <build>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -89,23 +89,17 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
                     <version>${version.ear.plugin}</version>
-
                 </plugin>
                 <plugin>
-
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ejb-plugin</artifactId>
                     <version>${version.ejb.plugin}</version>
                 </plugin>
-
                 <plugin>
-
                     <groupId>org.apache.maven.plugins</groupId>
-
                     <artifactId>maven-war-plugin</artifactId>
                     <version>${version.war.plugin}</version>
                 </plugin>
-
             </plugins>
         </pluginManagement>
     </build>

diff --git a/wildfly-jakartaee-ear-archetype/README.adoc b/wildfly-jakartaee-ear-archetype/README.adoc
@@ -9,27 +9,9 @@ It is prepared for running Arquillian unit tests.
 More details can be found in the file "src/main/resources/archetype-resources/README.txt", which is end-user doc and added to the resulting project.
 
 [[newwildflyversion]]
-==== New WildFly version
-To update this archetype to a new WildFly version:
-In file "pom.xml":
-
-* update the version
-* update to latest "org.jboss:jboss-parent" version found at https://repo.maven.apache.org/maven2/org/jboss/jboss-parent/
-
-In file "src/main/resources/archetype-resources/pom.xml":
-
-* update the version property named "version.jboss.bom"
-* check whether dependencies have changed.
-* check the plugin versions and update if necessary:
-** wildfly-maven-plugin: https://repo.maven.apache.org/maven2/org/wildfly/plugins/wildfly-maven-plugin/
-** maven-compiler-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/
-** maven-ear-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-ear-plugin/
-** maven-ejb-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-ejb-plugin/
-** maven-surefire-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/
-** maven-failsafe-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-failsafe-plugin/
-** maven-war-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-war-plugin/
-
-Also test whether the Arquillian unit test "SampleIT" still works, see below.
+==== Component Dependencies
+
+The versions of all dependencies and plugins that are used by this archetype are configured in the parent's `pom.xml`.
 
 [[build]]
 ==== Build

diff --git a/wildfly-jakartaee-ear-archetype/src/main/resources-filtered/archetype-resources/pom.xml b/wildfly-jakartaee-ear-archetype/src/main/resources-filtered/archetype-resources/pom.xml
@@ -43,7 +43,7 @@
         <version.wildfly.maven.plugin>${version.wildfly.maven.plugin}</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom>${version.jboss.bom}</version.jboss.bom>
+        <version.wildfly.bom>${version.wildfly.bom}</version.wildfly.bom>
 
         <!-- other plugin versions -->
         <version.compiler.plugin>${version.compiler.plugin}</version.compiler.plugin>
@@ -118,7 +118,7 @@
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
                 <artifactId>wildfly-ee-with-tools</artifactId>
-                <version>\${version.jboss.bom}</version>
+                <version>\${version.wildfly.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/wildfly-jakartaee-webapp-archetype/README.adoc b/wildfly-jakartaee-webapp-archetype/README.adoc
@@ -9,25 +9,9 @@ It is prepared for running Arquillian unit tests.
 More details can be found in the file "src/main/resources/archetype-resources/README.txt", which is end-user doc and added to the resulting project.
 
 [[newwildflyversion]]
-==== New WildFly version
-To update this archetype to a new WildFly version:
-In file "pom.xml":
+==== Component dependencies
 
-* update the version
-* update to latest "org.jboss:jboss-parent" version found at https://repo.maven.apache.org/maven2/org/jboss/jboss-parent/
-
-In file "src/main/resources/archetype-resources/pom.xml":
-
-* update the version property named "version.jboss.bom"
-* check whether dependencies have changed.
-* check the plugin versions and update if necessary:
-** wildfly-maven-plugin: https://repo.maven.apache.org/maven2/org/wildfly/plugins/wildfly-maven-plugin/
-** maven-compiler-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/
-** maven-surefire-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/
-** maven-failsafe-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-failsafe-plugin/
-** maven-war-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-war-plugin/
-
-Also test whether the Arquillian unit test "SampleIT" still works, see below.
+The versions of all dependencies and plugins that are used by this archetype are configured in the parent's `pom.xml`.
 
 [[build]]
 ==== Build

diff --git a/wildfly-jakartaee-webapp-archetype/src/main/resources-filtered/archetype-resources/pom.xml b/wildfly-jakartaee-webapp-archetype/src/main/resources-filtered/archetype-resources/pom.xml
@@ -37,7 +37,7 @@
         <version.wildfly.maven.plugin>${version.wildfly.maven.plugin}</version.wildfly.maven.plugin>
 
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
-        <version.jboss.bom>${version.jboss.bom}</version.jboss.bom>
+        <version.wildfly.bom>${version.wildfly.bom}</version.wildfly.bom>
 
         <!-- other plugin versions -->
         <version.compiler.plugin>${version.compiler.plugin}</version.compiler.plugin>
@@ -91,7 +91,7 @@
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
                 <artifactId>wildfly-ee-with-tools</artifactId>
-                <version>\${version.jboss.bom}</version>
+                <version>\${version.wildfly.bom}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/wildfly-subsystem-archetype/Readme.adoc b/wildfly-subsystem-archetype/Readme.adoc
@@ -8,22 +8,9 @@ This archetype creates a subsystem project.
 
 See https://docs.wildfly.org/26/Extending_WildFly.html
 
-==== New WildFly version
-To update this archetype to a new WildFly version:
-In file "pom.xml":
+==== Component Dependencies
 
-* update the archetype version
-* update to latest "org.jboss:jboss-parent" version found at https://repo.maven.apache.org/maven2/org/jboss/jboss-parent/
-
-In file "src/main/resources/archetype-resources/pom.xml":
-
-* update the version property named "version.wildfly.core" to the version bundled with WildFly (found in "%WILDFLY_HOME%/modules/system/layers/base/org/jboss/as/controller/main").
-* check the plugin versions and update if necessary:
-** maven-compiler-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/
-** maven-surefire-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/
-** maven-antrun-plugin: https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-antrun-plugin/
-
-In file "src/main/resources/archetype-resources/Readme.txt", update the version in the link to the WildFly documentation.
+The versions of all dependencies and plugins that are used by this archetype are configured in the parent's `pom.xml`.
 
 [[build]]
 ==== Build