[WFLY-19790] Replaces -ds.xml deprecated filed with Jakarta's DataSou…

…rceDefinition
wildfly · Oct 30, 2024 · 486da5a · 486da5a
1 parent de97aa6
commit 486da5a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 40 deletions.
diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
@@ -191,6 +191,19 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Dependencies>com.h2database.h2</Dependencies>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>
@@ -205,8 +218,9 @@
                             <discover-provisioning-info>
                                 <version>${version.server}</version>
                                 <addOns>
-                                    <addOn>h2-database:default</addOn>
+                                    <addOn>h2-database</addOn>
                                 </addOns>
+                                <failsOnError>false</failsOnError>
                             </discover-provisioning-info>
                         </configuration>
                         <executions>
@@ -232,8 +246,9 @@
                                 <version>${version.server}</version>
                                 <context>cloud</context>
                                 <addOns>
-                                    <addOn>h2-database:default</addOn>
+                                    <addOn>h2-database</addOn>
                                 </addOns>
+                                <failsOnError>false</failsOnError>
                             </discover-provisioning-info>
                         </configuration>
                         <executions>

diff --git a/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/model/Contact.java b/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/model/Contact.java
@@ -16,11 +16,18 @@
  */
 package org.jboss.as.quickstarts.batch.model;
 
+import jakarta.annotation.sql.DataSourceDefinition;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.validation.constraints.NotNull;
 
+@DataSourceDefinition(name="java:jboss/datasources/batch-processingDS",
+        className="org.h2.jdbcx.JdbcDataSource",
+        url="jdbc:h2:mem:batch-processing;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1",
+        user="sa",
+        password="sa"
+)
 @Entity
 public class Contact {
 

diff --git a/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml b/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml