Merge pull request #1004 from emmartins/sync-35.x

Sync 35.x with main
wildfly · Jan 15, 2025 · 5535034 · 5535034
2 parents 06efc32 + 25877e5
commit 5535034
Show file tree

Hide file tree

Showing 67 changed files with 73 additions and 106 deletions.
diff --git a/.github/workflows/reduce_readme.yml b/.github/workflows/reduce_readme.yml
@@ -3,7 +3,7 @@ name: WildFly Quickstarts Update 'README.adoc's
 on:
   push:
     branches:
-      - main
+      - 35.x
 
 # Only run the latest job
 concurrency:

diff --git a/README-source.adoc b/README-source.adoc
@@ -17,8 +17,6 @@ The quickstarts demonstrate {javaVersion} and a few additional technologies from
 
 These quickstarts run on the WildFly application server. The quickstarts are configured to use the correct Maven dependencies and ensure that you test and compile the quickstarts against the correct runtime environment.
 
-Each quickstart folder contains a `README-source.adoc` file that describes the quickstart features and provides instructions about how to build and run it. Instructions are provided to build the more readable `README.html` files.
-
 Make sure you read this entire document before you attempt to work with the quickstarts.
 
 [[system_requirements]]

diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/bmt/pom.xml b/bmt/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/cmt/pom.xml b/cmt/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>cmt</artifactId>

diff --git a/ee-security/pom.xml b/ee-security/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/ejb-multi-server/pom.xml b/ejb-multi-server/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-multi-server</artifactId>

diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-remote</artifactId>

diff --git a/ejb-security-context-propagation/pom.xml b/ejb-security-context-propagation/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-security-context-propagation</artifactId>

diff --git a/ejb-security-programmatic-auth/pom.xml b/ejb-security-programmatic-auth/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-security-programmatic-auth</artifactId>

diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-throws-exception</artifactId>

diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-timer</artifactId>

diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/ejb-txn-remote-call/pom.xml b/ejb-txn-remote-call/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>ejb-txn-remote-call</artifactId>

diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/ha-singleton-deployment/pom.xml b/ha-singleton-deployment/pom.xml
@@ -31,7 +31,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/ha-singleton-service/pom.xml b/ha-singleton-service/pom.xml
@@ -26,7 +26,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>helloworld-jms</artifactId>

diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/helloworld-mutual-ssl-secured/pom.xml b/helloworld-mutual-ssl-secured/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/helloworld-mutual-ssl/pom.xml b/helloworld-mutual-ssl/pom.xml
@@ -26,7 +26,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/helloworld-rs/pom.xml b/helloworld-rs/pom.xml
@@ -13,7 +13,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>helloworld-rs</artifactId>

diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>helloworld-ws</artifactId>

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>helloworld</artifactId>

diff --git a/hibernate/pom.xml b/hibernate/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/http-custom-mechanism/pom.xml b/http-custom-mechanism/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml
@@ -26,7 +26,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>jaxrs-client</artifactId>

diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>jaxrs-jwt</artifactId>

diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>jaxws-ejb</artifactId>

diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>jaxws-retail</artifactId>

diff --git a/jsonp/pom.xml b/jsonp/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>jsonp</artifactId>

diff --git a/jta-crash-rec/README-source.adoc b/jta-crash-rec/README-source.adoc
@@ -169,7 +169,7 @@ WARN  [com.arjuna.ats.jta] (Periodic Recovery) ARJUNA016037: Could not find new
 WARN  [com.arjuna.ats.jta] (Periodic Recovery) ARJUNA016038: No XAResource to recover < formatId=131077, gtrid_length=29, bqual_length=36, tx_uid=0:ffff7f000001:1040a11d:534ede43:1c, node_name=1, branch_uid=0:ffff7f000001:1040a11d:534ede43:20, subordinatenodename=null, eis_name=java:jboss/datasources/JTACrashRecQuickstartDS >
 ----
 +
-This is normal. What actually happened is that the first resource, `JTACrashRecQuickstartDS`, committed before the {productName} server was halted to insert the recovery record. The transaction logs are only updated/deleted after the outcome of the transaction is determined. If the transaction manager did update the log as each participant (database and JMS queue) completed then throughput would suffer. Notice you do not get a similar message for the JMS resource since that is the resource that recovered and the log record was updated to reflect this change. You need to manually remove the record for the first participant if you know which one is which or, if you are using the community version of the ${product.name} server, then you can also inspect the transaction logs using a JMX browser. For the demo it is simplest to delete the records from the file system, however, *be wary of doing this on a production system*.
+This is normal. What actually happened is that the first resource, `JTACrashRecQuickstartDS`, committed before the {productName} server was halted to insert the recovery record. The transaction logs are only updated/deleted after the outcome of the transaction is determined. If the transaction manager did update the log as each participant (database and JMS queue) completed then throughput would suffer. Notice you do not get a similar message for the JMS resource since that is the resource that recovered and the log record was updated to reflect this change. You need to manually remove the record for the first participant if you know which one is which or, if you are using the community version of the ${productName} server, then you can also inspect the transaction logs using a JMX browser. For the demo it is simplest to delete the records from the file system, however, *be wary of doing this on a production system*.
 
 . Do NOT forget to link:{configureBytemanDisableDocUrl}[Disable the Byteman script] by restoring the backup server configuration file. The Byteman rule must be removed to ensure that your application server will be able to commit 2PC transactions!
 

diff --git a/jta-crash-rec/pom.xml b/jta-crash-rec/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>jta-crash-rec</artifactId>

diff --git a/jts/pom.xml b/jts/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <!-- TODO fix artifact name to match components -->

diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>kitchensink</artifactId>

diff --git a/logging/pom.xml b/logging/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
     <artifactId>logging</artifactId>

diff --git a/mail/pom.xml b/mail/pom.xml
@@ -25,7 +25,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/messaging-clustering-singleton/pom.xml b/messaging-clustering-singleton/pom.xml
@@ -24,7 +24,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 

diff --git a/micrometer/pom.xml b/micrometer/pom.xml
@@ -10,7 +10,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
 
@@ -100,23 +100,8 @@
                     <artifactId>wildfly-maven-plugin</artifactId>
                     <version>${version.plugin.wildfly}</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.wildfly.plugins</groupId>
-                    <artifactId>wildfly-jar-maven-plugin</artifactId>
-                    <version>${version.plugin.wildfly-jar}</version>
-                </plugin>
             </plugins>
         </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 
     <profiles>

diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml
@@ -8,7 +8,7 @@
         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>9</version>
+        <version>10</version>
         <relativePath/>
     </parent>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: WildFly Quickstarts Update 'README.adoc's @@
     on:
       push:
         branches:
-          - main
+          - 35.x
     # Only run the latest job
     concurrency:
@@ Expand Down @@