From baf7ed7186f27c52265914173d10220b03ac4d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E7=94=B7?= <l.weinan@gmail.com>
Date: Mon, 29 Jan 2024 00:19:49 +0800
Subject: [PATCH 1/5] using newest wildfly-maven-plugin with Glow support

---
 batchProperty/pom.xml | 13 +++++++++++++
 pom.xml               |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/batchProperty/pom.xml b/batchProperty/pom.xml
index 750909c..fe864e0 100644
--- a/batchProperty/pom.xml
+++ b/batchProperty/pom.xml
@@ -67,6 +67,19 @@
                     <plugin>
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
+                        <version>${version.maven.wildfly.plugin}</version>
+                        <configuration>
+                            <discover-provisioning-info>
+                                <version>${version.wildfly}</version>
+                            </discover-provisioning-info>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>package</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                     </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index d6cf53e..5845190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
     <properties>
         <version.org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec>2.0.1.Final</version.org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec>
         <version.maven.wildfly.plugin>5.0.0.Final</version.maven.wildfly.plugin>
-        <wildfly.version>26.0.0.Final</wildfly.version>
+        <wildfly.version>30.0.1.Final</wildfly.version>
         <version.org.jboss.resteasy>6.2.8.Final</version.org.jboss.resteasy>
         <version.org.jboss.resteasy.resteasy-jackson-provider>4.0.0.Beta5</version.org.jboss.resteasy.resteasy-jackson-provider>
         <version.org.jberet.rest>1.4.1.Final</version.org.jberet.rest>

From 8158dfb782cfc4f8872eb438224355d21a37c310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E7=94=B7?= <l.weinan@gmail.com>
Date: Thu, 27 Jun 2024 00:26:24 +0800
Subject: [PATCH 2/5] update glow config

---
 batchProperty/pom.xml | 9 +++++++++
 pom.xml               | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/batchProperty/pom.xml b/batchProperty/pom.xml
index fe864e0..2996565 100644
--- a/batchProperty/pom.xml
+++ b/batchProperty/pom.xml
@@ -71,6 +71,7 @@
                         <configuration>
                             <discover-provisioning-info>
                                 <version>${version.wildfly}</version>
+                                <failsOnError>false</failsOnError>
                             </discover-provisioning-info>
                         </configuration>
                         <executions>
@@ -91,6 +92,14 @@
                                 <test.war>${project.build.directory}${file.separator}${project.build.finalName}.war</test.war>
                             </systemPropertyVariables>
                         </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/pom.xml b/pom.xml
index 5845190..1cd1921 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,12 +211,12 @@
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
                     <version>${version.maven.wildfly.plugin}</version>
-
                     <executions>
                         <execution>
                             <id>wildfly-deploy</id>
                             <phase>pre-integration-test</phase>
                             <goals>
+                                <goal>start</goal>
                                 <goal>deploy</goal>
                             </goals>
                         </execution>

From 26104a0431f454a1a3d57973ba2f94dd81ac9d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E7=94=B7?= <l.weinan@gmail.com>
Date: Thu, 27 Jun 2024 00:52:09 +0800
Subject: [PATCH 3/5] update wildfly-maven-plugin config

---
 batchProperty/pom.xml | 90 ++++++++++++++++++++++++++++++++++++++++---
 pom.xml               | 36 ++++++++---------
 2 files changed, 102 insertions(+), 24 deletions(-)

diff --git a/batchProperty/pom.xml b/batchProperty/pom.xml
index 2996565..88e0667 100644
--- a/batchProperty/pom.xml
+++ b/batchProperty/pom.xml
@@ -36,6 +36,14 @@
         <finalName>batchproperty</finalName>
     </build>
 
+    <properties>
+        <jboss.home>${project.build.directory}${file.separator}wildfly</jboss.home>
+        <server.test.feature.pack.artifactId>wildfly-preview-feature-pack</server.test.feature.pack.artifactId>
+<!--        <version.org.wildfly>30.0.1.Final</version.org.wildfly>-->
+        <version.org.wildfly.plugins.wildfly-maven-plugin>5.0.0.Final</version.org.wildfly.plugins.wildfly-maven-plugin>
+        <galleon.fork.embedded>true</galleon.fork.embedded>
+    </properties>
+
     <profiles>
         <profile>
             <id>default</id>
@@ -64,24 +72,94 @@
             </activation>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <warName>batchproperty</warName>
+                        </configuration>
+                    </plugin>
                     <plugin>
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
-                        <version>${version.maven.wildfly.plugin}</version>
+                        <version>${version.org.wildfly.plugins.wildfly-maven-plugin}</version>
                         <configuration>
-                            <discover-provisioning-info>
-                                <version>${version.wildfly}</version>
-                                <failsOnError>false</failsOnError>
-                            </discover-provisioning-info>
+                            <jboss-home>${jboss.home}</jboss-home>
                         </configuration>
                         <executions>
                             <execution>
+                                <id>server-provisioning</id>
+                                <phase>generate-test-resources</phase>
                                 <goals>
-                                    <goal>package</goal>
+                                    <goal>provision</goal>
+                                </goals>
+                                <configuration>
+                                    <provisioning-dir>${jboss.home}</provisioning-dir>
+                                    <galleon-options>
+                                        <jboss-fork-embedded>${galleon.fork.embedded}</jboss-fork-embedded>
+                                    </galleon-options>
+                                    <feature-packs>
+                                        <feature-pack>
+                                            <groupId>org.wildfly</groupId>
+                                            <artifactId>${server.test.feature.pack.artifactId}</artifactId>
+                                            <version>${version.wildfly}</version>
+                                            <inherit-configs>false</inherit-configs>
+                                            <included-configs>
+                                                <config>
+                                                    <model>standalone</model>
+                                                    <name>standalone-full.xml</name>
+                                                </config>
+                                                <config>
+                                                    <model>standalone</model>
+                                                    <name>standalone.xml</name>
+                                                </config>
+                                            </included-configs>
+                                            <excluded-packages>
+                                                <name>docs.schema</name>
+                                                <name>appclient</name>
+                                                <name>domain</name>
+                                            </excluded-packages>
+                                        </feature-pack>
+                                    </feature-packs>
+                                    <channels>
+                                        <channel>
+                                            <manifest>
+                                                <groupId>org.jberet</groupId>
+                                                <artifactId>jberet-channel-manifest</artifactId>
+                                                <version>${version.org.jberet.jberet-core}</version>
+                                            </manifest>
+                                        </channel>
+                                    </channels>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>wildfly-start</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                    <goal>deploy</goal>
+                                </goals>
+                                <configuration>
+                                    <filename>batchproperty.war</filename>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <phase>post-integration-test</phase>
+                                <id>wildfly-stop</id>
+                                <goals>
+                                    <goal>shutdown</goal>
                                 </goals>
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/*IT.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
                     <plugin>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
diff --git a/pom.xml b/pom.xml
index 1cd1921..d30c876 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <version.org.jboss.resteasy.resteasy-jackson-provider>4.0.0.Beta5</version.org.jboss.resteasy.resteasy-jackson-provider>
         <version.org.jberet.rest>1.4.1.Final</version.org.jberet.rest>
         <version.org.jberet.schedule>1.4.1.Final</version.org.jberet.schedule>
-        <version.org.jberet.jberet-core>1.4.7.Final</version.org.jberet.jberet-core>
+        <version.org.jberet.jberet-core>2.1.4.Final</version.org.jberet.jberet-core>
         <version.org.jberet.jberet-support>2.1.2.Final</version.org.jberet.jberet-support>
         <version.org.jberet.jberet-camel>1.3.9.SP3</version.org.jberet.jberet-camel>
         <version.org.jberet.jberet-wildfly-cluster>1.3.1.Final</version.org.jberet.jberet-wildfly-cluster>
@@ -211,23 +211,23 @@
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
                     <version>${version.maven.wildfly.plugin}</version>
-                    <executions>
-                        <execution>
-                            <id>wildfly-deploy</id>
-                            <phase>pre-integration-test</phase>
-                            <goals>
-                                <goal>start</goal>
-                                <goal>deploy</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>wildfly-undeploy</id>
-                            <phase>clean</phase>
-                            <goals>
-                                <goal>undeploy</goal>
-                            </goals>
-                        </execution>
-                    </executions>
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>wildfly-deploy</id>-->
+<!--                            <phase>pre-integration-test</phase>-->
+<!--                            <goals>-->
+<!--                                <goal>start</goal>-->
+<!--                                <goal>deploy</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                        <execution>-->
+<!--                            <id>wildfly-undeploy</id>-->
+<!--                            <phase>clean</phase>-->
+<!--                            <goals>-->
+<!--                                <goal>undeploy</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

From b8edbab2d56b0bdf4e370d893a23dbb8a6fcb5d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E7=94=B7?= <l.weinan@gmail.com>
Date: Thu, 27 Jun 2024 00:56:08 +0800
Subject: [PATCH 4/5] update wildfly-maven-plugin config

---
 batchProperty/pom.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/batchProperty/pom.xml b/batchProperty/pom.xml
index 88e0667..c5bc082 100644
--- a/batchProperty/pom.xml
+++ b/batchProperty/pom.xml
@@ -39,8 +39,6 @@
     <properties>
         <jboss.home>${project.build.directory}${file.separator}wildfly</jboss.home>
         <server.test.feature.pack.artifactId>wildfly-preview-feature-pack</server.test.feature.pack.artifactId>
-<!--        <version.org.wildfly>30.0.1.Final</version.org.wildfly>-->
-        <version.org.wildfly.plugins.wildfly-maven-plugin>5.0.0.Final</version.org.wildfly.plugins.wildfly-maven-plugin>
         <galleon.fork.embedded>true</galleon.fork.embedded>
     </properties>
 
@@ -82,7 +80,7 @@
                     <plugin>
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
-                        <version>${version.org.wildfly.plugins.wildfly-maven-plugin}</version>
+                        <version>${version.maven.wildfly.plugin}</version>
                         <configuration>
                             <jboss-home>${jboss.home}</jboss-home>
                         </configuration>

From bf2a19765cff50a675e2d89e62c57754bc4a13ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E7=94=B7?= <l.weinan@gmail.com>
Date: Thu, 27 Jun 2024 01:04:48 +0800
Subject: [PATCH 5/5] update wildfly-maven-plugin config

---
 batchProperty/pom.xml | 2 +-
 pom.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/batchProperty/pom.xml b/batchProperty/pom.xml
index c5bc082..a5591b0 100644
--- a/batchProperty/pom.xml
+++ b/batchProperty/pom.xml
@@ -100,7 +100,7 @@
                                         <feature-pack>
                                             <groupId>org.wildfly</groupId>
                                             <artifactId>${server.test.feature.pack.artifactId}</artifactId>
-                                            <version>${version.wildfly}</version>
+                                            <version>${wildfly.version}</version>
                                             <inherit-configs>false</inherit-configs>
                                             <included-configs>
                                                 <config>
diff --git a/pom.xml b/pom.xml
index d30c876..f8491e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <version.org.jboss.resteasy.resteasy-jackson-provider>4.0.0.Beta5</version.org.jboss.resteasy.resteasy-jackson-provider>
         <version.org.jberet.rest>1.4.1.Final</version.org.jberet.rest>
         <version.org.jberet.schedule>1.4.1.Final</version.org.jberet.schedule>
-        <version.org.jberet.jberet-core>2.1.4.Final</version.org.jberet.jberet-core>
+        <version.org.jberet.jberet-core>2.2.0.Final</version.org.jberet.jberet-core>
         <version.org.jberet.jberet-support>2.1.2.Final</version.org.jberet.jberet-support>
         <version.org.jberet.jberet-camel>1.3.9.SP3</version.org.jberet.jberet-camel>
         <version.org.jberet.jberet-wildfly-cluster>1.3.1.Final</version.org.jberet.jberet-wildfly-cluster>