From 874b4ba2966ad1f97d63cfff621938fb7a513e56 Mon Sep 17 00:00:00 2001
From: timis1 <noreplay@yahoo.com>
Date: Thu, 30 Mar 2023 23:36:00 +0300
Subject: [PATCH] JAVA-18167 Migration deltaspike

---
 persistence-modules/deltaspike/pom.xml        | 66 ++++++++++---------
 .../src/main/java/baeldung/model/Member.java  | 10 +--
 .../java/baeldung/rest/JaxRsActivator.java    |  4 +-
 .../rest/MemberResourceRESTService.java       | 26 ++++----
 .../baeldung/service/MemberRegistration.java  | 12 ++--
 .../main/java/baeldung/util/Resources.java    |  2 -
 .../test/java/baeldung/ValidatorProducer.java |  4 +-
 persistence-modules/pom.xml                   | 54 +++++++--------
 pom.xml                                       | 22 +------
 9 files changed, 91 insertions(+), 109 deletions(-)

diff --git a/persistence-modules/deltaspike/pom.xml b/persistence-modules/deltaspike/pom.xml
index 974a61d618..7b01394bec 100644
--- a/persistence-modules/deltaspike/pom.xml
+++ b/persistence-modules/deltaspike/pom.xml
@@ -27,28 +27,6 @@
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
-            <!-- JBoss distributes a complete set of Java EE 7 APIs including a Bill of Materials (BOM). -->
-            <!-- A BOM specifies the versions of a "stack" (or a collection) of artifacts. -->
-            <!-- We use this here so that we always get the correct versions of artifacts. -->
-            <!-- Here we use the jboss-javaee-7.0-with-tools stack (you can read this -->
-            <!-- as the JBoss stack of the Java EE 7 APIs, with some extras tools for your project, such -->
-            <!-- as Arquillian for testing) and the jboss-javaee-7.0-with-hibernate stack -->
-            <!-- you can read this as the JBoss -->
-            <!-- stack of the Java EE 7 APIs, with extras from the Hibernate family of projects) -->
-            <dependency>
-                <groupId>org.wildfly.bom</groupId>
-                <artifactId>jboss-javaee-7.0-with-tools</artifactId>
-                <version>${jboss.bom.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.wildfly.bom</groupId>
-                <artifactId>jboss-javaee-7.0-with-hibernate</artifactId>
-                <version>${jboss.bom.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.deltaspike.distribution</groupId>
                 <artifactId>distributions-bom</artifactId>
@@ -66,6 +44,7 @@
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
+            <version>2.0.SP1</version>
             <scope>provided</scope>
         </dependency>
         <!-- Import the Common Annotations API (JSR-250), we use provided scope -->
@@ -73,24 +52,21 @@
         <dependency>
             <groupId>org.jboss.spec.javax.annotation</groupId>
             <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- Import the JAX-RS API, we use provided scope as the API is included in JBoss WildFly -->
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>jaxrs-api</artifactId>
+            <version>1.0.2.Final</version>
             <scope>provided</scope>
         </dependency>
         <!-- Import the JPA API, we use provided scope as the API is included in JBoss WildFly -->
         <dependency>
             <groupId>org.hibernate.javax.persistence</groupId>
             <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <version>1.0.2.Final</version>
             <scope>provided</scope>
         </dependency>
         <!-- Import the EJB API, we use provided scope as the API is included in JBoss WildFly -->
         <dependency>
             <groupId>org.jboss.spec.javax.ejb</groupId>
             <artifactId>jboss-ejb-api_3.2_spec</artifactId>
+            <version>2.0.0.Final</version>
             <scope>provided</scope>
         </dependency>
         <!-- JSR-303 (Bean Validation) Implementation -->
@@ -99,6 +75,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <version>8.0.0.Final</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -111,6 +88,7 @@
         <dependency>
             <groupId>org.jboss.spec.javax.faces</groupId>
             <artifactId>jboss-jsf-api_2.2_spec</artifactId>
+            <version>2.2.14</version>
             <scope>provided</scope>
         </dependency>
         <!-- Now we declare any tools needed -->
@@ -118,6 +96,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-jpamodelgen</artifactId>
+            <version>6.1.7.Final</version>
             <scope>provided</scope>
         </dependency>
         <!-- Annotation processor that raising compilation errors -->
@@ -125,6 +104,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator-annotation-processor</artifactId>
+            <version>8.0.0.Final</version>
             <scope>provided</scope>
         </dependency>
         <!-- Optional, but highly recommended -->
@@ -133,16 +113,19 @@
         <dependency>
             <groupId>org.jboss.arquillian.junit</groupId>
             <artifactId>arquillian-junit-container</artifactId>
+            <version>1.6.0.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
             <artifactId>arquillian-protocol-servlet</artifactId>
+            <version>1.6.0.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap.resolver</groupId>
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+            <version>3.1.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -191,8 +174,11 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
+            <version>6.1.7.Final</version>
             <scope>provided</scope>
         </dependency>
+        <!-- individual dependency to jandex to accomplish necessary exclusion of jandex in -->
+        <!-- hibernate-core-jakarta -->
         <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jandex</artifactId>
@@ -207,6 +193,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <version>6.0.0.Alpha7</version>
             <scope>provided</scope>
         </dependency>
         <!-- Others -->
@@ -215,6 +202,22 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jakarta-binding.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly.bom</groupId>
+            <artifactId>wildfly-ee-with-tools</artifactId>
+            <type>pom</type>
+            <version>27.0.1.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -283,17 +286,18 @@
 
     <properties>
         <querydsl.version>3.7.4</querydsl.version>
-        <deltaspike.version>1.8.2</deltaspike.version>
+        <deltaspike.version>1.9.6</deltaspike.version>
         <!-- JBoss dependency versions -->
         <wildfly.maven.plugin.version>1.0.2.Final</wildfly.maven.plugin.version>
         <!-- Define the version of the JBoss BOMs we want to import to specify tested stacks. -->
         <jboss.bom.version>8.2.1.Final</jboss.bom.version>
-        <weld.version>2.1.2.Final</weld.version>
+        <weld.version>5.1.0.Final</weld.version>
         <!-- other plugin versions -->
         <war.plugin.version>2.6</war.plugin.version>
         <apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
-        <jandex.version>1.2.4.Final</jandex.version>
+        <jandex.version>3.0.5</jandex.version>
         <h2.version>2.1.214</h2.version>
+        <jakarta-binding.version>4.0.0</jakarta-binding.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/deltaspike/src/main/java/baeldung/model/Member.java b/persistence-modules/deltaspike/src/main/java/baeldung/model/Member.java
index d9b9b5caf1..f207d31bb6 100644
--- a/persistence-modules/deltaspike/src/main/java/baeldung/model/Member.java
+++ b/persistence-modules/deltaspike/src/main/java/baeldung/model/Member.java
@@ -20,11 +20,11 @@ import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.persistence.*;
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 
 @SuppressWarnings("serial")
diff --git a/persistence-modules/deltaspike/src/main/java/baeldung/rest/JaxRsActivator.java b/persistence-modules/deltaspike/src/main/java/baeldung/rest/JaxRsActivator.java
index 9357ae0ea6..0249fd4bb4 100644
--- a/persistence-modules/deltaspike/src/main/java/baeldung/rest/JaxRsActivator.java
+++ b/persistence-modules/deltaspike/src/main/java/baeldung/rest/JaxRsActivator.java
@@ -16,8 +16,8 @@
  */
 package baeldung.rest;
 
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
 
 /**
  * A class extending {@link Application} and annotated with @ApplicationPath is the Java EE 7 "no XML" approach to activating
diff --git a/persistence-modules/deltaspike/src/main/java/baeldung/rest/MemberResourceRESTService.java b/persistence-modules/deltaspike/src/main/java/baeldung/rest/MemberResourceRESTService.java
index 5a09e45591..f5a10d6db1 100644
--- a/persistence-modules/deltaspike/src/main/java/baeldung/rest/MemberResourceRESTService.java
+++ b/persistence-modules/deltaspike/src/main/java/baeldung/rest/MemberResourceRESTService.java
@@ -26,23 +26,23 @@ import java.util.logging.Logger;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.persistence.NoResultException;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
 
 import baeldung.data.MemberRepository;
 import baeldung.model.Member;
 import baeldung.service.MemberRegistration;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 /**
  * JAX-RS Example
diff --git a/persistence-modules/deltaspike/src/main/java/baeldung/service/MemberRegistration.java b/persistence-modules/deltaspike/src/main/java/baeldung/service/MemberRegistration.java
index 9396e550d5..a29fe2fe8f 100644
--- a/persistence-modules/deltaspike/src/main/java/baeldung/service/MemberRegistration.java
+++ b/persistence-modules/deltaspike/src/main/java/baeldung/service/MemberRegistration.java
@@ -17,20 +17,16 @@
 package baeldung.service;
 
 import baeldung.data.MemberRepository;
-import baeldung.data.SecondaryPersistenceUnit;
 import baeldung.model.Member;
-import baeldung.model.QMember;
 
 import javax.ejb.Stateless;
 import javax.enterprise.event.Event;
-import javax.enterprise.inject.Default;
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Logger;
diff --git a/persistence-modules/deltaspike/src/main/java/baeldung/util/Resources.java b/persistence-modules/deltaspike/src/main/java/baeldung/util/Resources.java
index 2cc1f235d7..5cb68f9f9c 100644
--- a/persistence-modules/deltaspike/src/main/java/baeldung/util/Resources.java
+++ b/persistence-modules/deltaspike/src/main/java/baeldung/util/Resources.java
@@ -22,8 +22,6 @@ import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.faces.context.FacesContext;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 
 /**
  * This class uses CDI to alias Java EE resources, such as the persistence context, to CDI beans
diff --git a/persistence-modules/deltaspike/src/test/java/baeldung/ValidatorProducer.java b/persistence-modules/deltaspike/src/test/java/baeldung/ValidatorProducer.java
index 6b895f771e..a3acbe6583 100644
--- a/persistence-modules/deltaspike/src/test/java/baeldung/ValidatorProducer.java
+++ b/persistence-modules/deltaspike/src/test/java/baeldung/ValidatorProducer.java
@@ -1,8 +1,8 @@
 package baeldung;
 
 import javax.enterprise.inject.Produces;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 
 /**
  * Created by adam.
diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index e12bee1f03..6bafebfc9e 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -14,66 +14,68 @@
     </parent>
 
     <modules>
+        <module>activejdbc</module>
         <module>apache-bookkeeper</module>
         <module>apache-cayenne</module>
         <module>apache-derby</module>
         <module>blaze-persistence</module>
+        <module>core-java-persistence</module>
         <module>core-java-persistence-2</module>
         <module>deltaspike</module>
         <module>elasticsearch</module>
         <module>flyway</module>
         <module>flyway-repair</module>
-        <module>hbase</module>
+        <!-- <module>hbase</module> FAILED-->
         <module>hibernate5</module>
         <module>hibernate-mapping</module> <!-- long running -->
-        <module>hibernate-mapping-2</module>
+        <!-- <module>hibernate-mapping-2</module> FAILED --> 
         <module>hibernate-ogm</module>
         <module>hibernate-annotations</module>
-        <module>hibernate-exceptions</module>
+        <!-- <module>hibernate-exceptions</module> FAILED -->
         <module>hibernate-libraries</module>
-        <module>hibernate-jpa</module>
-        <module>hibernate-queries</module>
-        <module>hibernate-enterprise</module>
+        <!-- <module>hibernate-jpa</module> FAILED -->
+        <!-- <module>hibernate-queries</module> FAILED -->
+        <!-- <module>hibernate-enterprise</module> FAILED --> 
         <module>influxdb</module>
-        <module>java-cassandra</module>
+        <!-- <module>java-cassandra</module> FAILED -->
         <module>java-cockroachdb</module>
         <module>java-jdbi</module>
-        <module>java-jpa</module> <!-- long running -->
-        <module>java-jpa-2</module> <!-- long running -->
+        <!-- <module>java-jpa</module> FAILED --> <!-- long running -->
+        <!-- <module>java-jpa-2</module> FAILED --> <!-- long running -->
         <module>java-jpa-3</module>
 		<!-- enable it when persistence-modules is migrated to JDK9+ -->
 		<!-- <module>java-mongodb</module>--> <!-- long running -->
         <module>java-mongodb-2</module> <!-- long running -->
         <module>java-mongodb-3</module> <!-- long running -->
         <module>java-mongodb-queries</module> <!-- long running -->
-        <module>jnosql</module> <!-- long running -->
+        <!-- <module>jnosql</module> FAILED --> <!-- long running -->
         <module>jooq</module>
         <module>jpa-hibernate-cascade-type</module>
         <module>liquibase</module>
         <module>orientdb</module>
         <module>persistence-libraries</module>
-        <module>querydsl</module>
-        <module>r2dbc</module>
+        <!-- <module>querydsl</module> FAILED -->
+        <!-- <module>r2dbc</module> FAILED -->
         <module>read-only-transactions</module>
-        <module>redis</module>
+        <!-- <module>redis</module> FAILED -->
         <!-- <module>sirix</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
         <module>solr</module>
-        <module>spring-boot-persistence-2</module>
+        <!-- <module>spring-boot-persistence-2</module> FAILED -->
         <module>spring-boot-persistence-3</module>
         <module>spring-boot-mysql</module>
         <module>spring-boot-persistence</module>
         <module>spring-boot-persistence-h2</module>
-        <module>spring-boot-persistence-mongodb</module>
+        <!-- <module>spring-boot-persistence-mongodb</module>
         <module>spring-boot-persistence-mongodb-2</module>
-        <module>spring-boot-persistence-mongodb-3</module>
+        <module>spring-boot-persistence-mongodb-3</module> FAILED -->
         <module>spring-data-arangodb</module>
         <module>spring-data-cassandra</module>
         <module>spring-data-cassandra-test</module>
-        <module>spring-data-cassandra-reactive</module>
+        <!-- <module>spring-data-cassandra-reactive</module> FAILED -->
         <module>spring-data-cosmosdb</module>
-        <module>spring-data-couchbase-2</module>
+        <!-- <module>spring-data-couchbase-2</module> FAILED -->
         <module>spring-data-dynamodb</module>
-        <module>spring-data-eclipselink</module>
+        <!-- <module>spring-data-eclipselink</module> FAILED -->
         <module>spring-data-elasticsearch</module>
         <!-- <module>spring-data-gemfire</module> Won't Fix in JAVA-14499, The dependencies used are -->
         <!-- no longer available or maintained. Ref: https://spring.io/projects/spring-data-gemfire#overview -->
@@ -87,24 +89,24 @@
         <module>spring-data-jpa-query</module>
         <module>spring-data-jpa-query-2</module>
         <module>spring-data-jpa-query-3</module>
-        <module>spring-data-jpa-repo</module>
+        <!-- <module>spring-data-jpa-repo</module> FAILED -->
         <module>spring-data-jpa-repo-2</module>
         <module>spring-data-jdbc</module>
         <module>spring-data-keyvalue</module>
-        <module>spring-data-mongodb</module>
+        <!-- <module>spring-data-mongodb</module> FAILED -->
         <module>spring-data-mongodb-2</module>
         <module>spring-data-mongodb-reactive</module>
-        <module>spring-data-neo4j</module>
+        <!-- <module>spring-data-neo4j</module> FAILED -->
         <module>spring-data-redis</module>
 <!--        Moved to JDK9+ profiles-->
 <!--        <module>spring-data-rest</module>-->
         <module>spring-data-rest-2</module>
         <module>spring-data-rest-querydsl</module>
         <module>spring-data-solr</module>
-        <module>spring-hibernate-3</module>
-        <module>spring-hibernate-5</module> <!-- long running -->
-        <module>spring-jpa</module>
-        <module>spring-jpa-2</module>
+        <!-- <module>spring-hibernate-3</module> FAILED -->
+        <!-- <module>spring-hibernate-5</module> FAILED --> <!-- long running -->
+        <!-- <module>spring-jpa</module>
+        <module>spring-jpa-2</module> FAILED -->
         <module>spring-jdbc</module>
         <module>spring-jooq</module>
         <module>spring-mybatis</module>
diff --git a/pom.xml b/pom.xml
index e0169c5b81..88a507d29e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -368,7 +368,6 @@
                 <module>muleesb</module>
 
                 <module>osgi</module>
-                <module>persistence-modules</module>
                 <module>web-modules</module>
             </modules>
 
@@ -568,7 +567,6 @@
                 <module>muleesb</module>
 
                 <module>osgi</module>
-                <module>persistence-modules</module>
                 <module>web-modules</module>
             </modules>
 
@@ -828,17 +826,11 @@
                 <module>libraries-testing</module>
                 <module>maven-modules</module>
                 <module>optaplanner</module>
-                <module>persistence-modules/activejdbc</module>
-                <module>persistence-modules/core-java-persistence</module>
-                <module>persistence-modules/sirix</module>
-                <module>persistence-modules/spring-data-cassandra-2</module>
-                <module>persistence-modules/spring-data-jpa-repo-3</module>
+                <module>persistence-modules</module>
                 <module>quarkus-modules</module>
                 <module>spring-reactive-modules</module>
                 <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
                 <module>testing-modules/testing-assertions</module>
-                <module>persistence-modules/fauna</module>
-                <module>persistence-modules/spring-data-rest</module>
 
                 <module>rule-engines-modules</module>
 
@@ -954,11 +946,9 @@
                 <module>tensorflow-java</module>
                 <module>xstream</module>
                 <module>webrtc</module>
-                <module>persistence-modules/java-mongodb</module>
 
                 <module>messaging-modules</module>
 
-                <module>persistence-modules/questdb</module>
                 <module>vaadin</module>
             </modules>
 
@@ -1076,17 +1066,11 @@
                 <module>libraries-testing</module>
                 <module>maven-modules</module>
                 <module>optaplanner</module>
-                <module>persistence-modules/activejdbc</module>
-                <module>persistence-modules/core-java-persistence</module>
-                <module>persistence-modules/sirix</module>
-                <module>persistence-modules/spring-data-cassandra-2</module>
-                <module>persistence-modules/spring-data-jpa-repo-3</module>
+                <module>persistence-modules</module>
                 <module>quarkus-modules</module>
                 <module>spring-reactive-modules</module>
                 <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
                 <module>testing-modules/testing-assertions</module>
-                <module>persistence-modules/fauna</module>
-                <module>persistence-modules/spring-data-rest</module>
 
                 <module>rule-engines-modules</module>
 
@@ -1203,11 +1187,9 @@
                 <module>tensorflow-java</module>
                 <module>xstream</module>
                 <module>webrtc</module>
-                <module>persistence-modules/java-mongodb</module>
                 <module>libraries-2</module>
                 <module>messaging-modules</module>
 
-                <module>persistence-modules/questdb</module>
                 <module>vaadin</module>
             </modules>