From f9f8c70151f9a591d045bf2ed48bb6beb58fe45b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 02:15:33 +0000
Subject: [PATCH 01/10] HSEARCH-4527 Bump jackson-databind from 2.13.2.1 to
 2.13.2.2

Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.2.1 to 2.13.2.2.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 17f89207777..a7b24cd0d69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,7 +249,7 @@
              That's why we have two separate properties for jackson versions,
              even though they may have the same value from time to time.
          -->
-        <version.com.fasterxml.jackson.databind>2.13.2.1</version.com.fasterxml.jackson.databind>
+        <version.com.fasterxml.jackson.databind>2.13.2.2</version.com.fasterxml.jackson.databind>
         <!-- Reactive-streams: used by the AWS SDK -->
         <version.org.reactivestreams.reactive-streams>1.0.3</version.org.reactivestreams.reactive-streams>
         <!-- slf4j: used by the AWS SDK -->

From e231e6d090b0e5cfdeccd3fd607ce7c9d0d232e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Mon, 4 Apr 2022 10:24:05 +0200
Subject: [PATCH 02/10] HSEARCH-4528 Add explicit dependencies to
 jakarta.transaction/jakarta.integrator to -jakarta/-orm6 artifacts

---
 jakarta/mapper/orm/pom.xml | 13 ++++++++++++-
 orm6/mapper/orm/pom.xml    | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/jakarta/mapper/orm/pom.xml b/jakarta/mapper/orm/pom.xml
index 11f46877813..8f41cace46d 100644
--- a/jakarta/mapper/orm/pom.xml
+++ b/jakarta/mapper/orm/pom.xml
@@ -49,9 +49,20 @@
             <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
         <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+        </dependency>
+        <dependency>
+            <!-- Necessary for jakarta.transaction, but unfortunately jakarta.transaction
+                 doesn't include the dependency in its POM... -->
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+        </dependency>
+        <dependency>
+            <!-- Necessary for jakarta.transaction, but unfortunately jakarta.transaction
+                 doesn't include the dependency in its POM... -->
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.hibernate.common</groupId>
diff --git a/orm6/mapper/orm/pom.xml b/orm6/mapper/orm/pom.xml
index e1ac426e097..cac63227a05 100644
--- a/orm6/mapper/orm/pom.xml
+++ b/orm6/mapper/orm/pom.xml
@@ -55,9 +55,20 @@
             <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
         <dependency>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+        </dependency>
+        <dependency>
+            <!-- Necessary for jakarta.transaction, but unfortunately jakarta.transaction
+                 doesn't include the dependency in its POM... -->
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+        </dependency>
+        <dependency>
+            <!-- Necessary for jakarta.transaction, but unfortunately jakarta.transaction
+                 doesn't include the dependency in its POM... -->
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.hibernate.common</groupId>

From eade8fd5d674b41d1e135bb1e3a5e70855ae7072 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 02:15:57 +0000
Subject: [PATCH 03/10] HSEARCH-4528 Bump jakarta.annotation-api from 2.0.0 to
 2.1.0

Bumps [jakarta.annotation-api](https://github.com/eclipse-ee4j/common-annotations-api) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/eclipse-ee4j/common-annotations-api/releases)
- [Commits](https://github.com/eclipse-ee4j/common-annotations-api/compare/2.0.0...2.1.0)

---
updated-dependencies:
- dependency-name: jakarta.annotation:jakarta.annotation-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a7b24cd0d69..524018a27c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,7 +290,7 @@
         <version.javax.enterprise>2.0</version.javax.enterprise>
         <version.jakarta.enterprise>3.0.0</version.jakarta.enterprise>
         <version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>1.0.2.Final</version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>
-        <version.jakarta.annotation-api>2.0.0</version.jakarta.annotation-api>
+        <version.jakarta.annotation-api>2.1.0</version.jakarta.annotation-api>
         <version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>1.1.1.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>
         <version.jakarta.transaction-api>2.0.0</version.jakarta.transaction-api>
         <!-- We need dependency management on these ones to avoid dependency divergence created by our own dependencies

From 508bb401a6a934349aed0d6dd5a04397d5e28739 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 02:16:53 +0000
Subject: [PATCH 04/10] HSEARCH-4528 Bump jakarta.transaction-api from 2.0.0 to
 2.0.1

Bumps [jakarta.transaction-api](https://github.com/eclipse-ee4j/jta-api) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/eclipse-ee4j/jta-api/releases)
- [Commits](https://github.com/eclipse-ee4j/jta-api/commits)

---
updated-dependencies:
- dependency-name: jakarta.transaction:jakarta.transaction-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 524018a27c6..2b9b62b6ef0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@
         <version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>1.0.2.Final</version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>
         <version.jakarta.annotation-api>2.1.0</version.jakarta.annotation-api>
         <version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>1.1.1.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>
-        <version.jakarta.transaction-api>2.0.0</version.jakarta.transaction-api>
+        <version.jakarta.transaction-api>2.0.1</version.jakarta.transaction-api>
         <!-- We need dependency management on these ones to avoid dependency divergence created by our own dependencies
              (Hibernate ORM, JBatch, ...).
              Ideally, we should remove this dependency management when the dependencies fix their dependency divergence.

From ec6cb840eed20b0b5d7a72db530cfcdc5b5f3560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Mon, 4 Apr 2022 09:08:52 +0200
Subject: [PATCH 05/10] HSEARCH-4528 Upgrade to JBeret 2.0.4.Final for
 -orm6/-jakarta artifacts

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2b9b62b6ef0..0dd43d251cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,7 +281,7 @@
         <version.javax.batch>1.0.1</version.javax.batch>
         <version.jakarta.batch>2.0.0</version.jakarta.batch>
         <version.org.jberet>1.4.6.Final</version.org.jberet>
-        <version.org.jberet.jakarta>2.0.2.Final</version.org.jberet.jakarta>
+        <version.org.jberet.jakarta>2.0.4.Final</version.org.jberet.jakarta>
 
         <!-- >>> Java EE/Jakarta EE dependencies -->
         <!-- Used in the JSR352 integration in particular, but also in the ORM integration (?) and various tests -->

From 4c331f0025565e436176b8e01876608ed8b610bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Mon, 4 Apr 2022 09:10:54 +0200
Subject: [PATCH 06/10] HSEARCH-4528 Upgrade to IBM JBatch 2.1.0-M2 in tests

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0dd43d251cf..73226f51110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,7 +331,7 @@
 
         <!-- >>> JSR 352: JBatch runtime -->
         <version.com.ibm.jbatch>1.0</version.com.ibm.jbatch>
-        <version.com.ibm.jbatch.jakarta>2.0.0</version.com.ibm.jbatch.jakarta>
+        <version.com.ibm.jbatch.jakarta>2.1.0-M2</version.com.ibm.jbatch.jakarta>
         <version.org.apache.derby>10.13.1.1</version.org.apache.derby>
 
         <!-- >>> JSR 352: JBeret SE dependencies -->

From f605d83aa4729aeda9dfd94787dc419938879b26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Mar 2022 02:26:31 +0000
Subject: [PATCH 07/10] HSEARCH-4528 Bump jakarta.batch-api from 2.0.0 to 2.1.0

Bumps [jakarta.batch-api](https://github.com/eclipse-ee4j/batch-api) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/eclipse-ee4j/batch-api/releases)
- [Commits](https://github.com/eclipse-ee4j/batch-api/compare/2.0.0...2.1.0)

---
updated-dependencies:
- dependency-name: jakarta.batch:jakarta.batch-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 73226f51110..90aaa94d206 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,7 +279,7 @@
 
         <!-- >>> JSR 352 -->
         <version.javax.batch>1.0.1</version.javax.batch>
-        <version.jakarta.batch>2.0.0</version.jakarta.batch>
+        <version.jakarta.batch>2.1.0</version.jakarta.batch>
         <version.org.jberet>1.4.6.Final</version.org.jberet>
         <version.org.jberet.jakarta>2.0.4.Final</version.org.jberet.jakarta>
 

From 2aaf4147d6895b1a1ae7fdcfe68635408b2d5c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Mon, 4 Apr 2022 13:36:30 +0200
Subject: [PATCH 08/10] HSEARCH-4528 Upgrade to jakarta enterprise CDI 3.0.1
 for -orm6/-jakarta artifacts

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 90aaa94d206..08cc4938ab2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,7 +288,7 @@
         <version.javax.inject>1</version.javax.inject>
         <version.jakarta.inject-api>2.0.1</version.jakarta.inject-api>
         <version.javax.enterprise>2.0</version.javax.enterprise>
-        <version.jakarta.enterprise>3.0.0</version.jakarta.enterprise>
+        <version.jakarta.enterprise>4.0.0.Beta3</version.jakarta.enterprise>
         <version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>1.0.2.Final</version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>
         <version.jakarta.annotation-api>2.1.0</version.jakarta.annotation-api>
         <version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>1.1.1.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>

From 395890bb6fb5dc1e08b5e6f268c27010386767d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Mon, 4 Apr 2022 13:38:43 +0200
Subject: [PATCH 09/10] HSEARCH-4528 Upgrade to Weld 4.0.3.Final for tests

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 08cc4938ab2..2689dab1f22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,7 +288,7 @@
         <version.javax.inject>1</version.javax.inject>
         <version.jakarta.inject-api>2.0.1</version.jakarta.inject-api>
         <version.javax.enterprise>2.0</version.javax.enterprise>
-        <version.jakarta.enterprise>4.0.0.Beta3</version.jakarta.enterprise>
+        <version.jakarta.enterprise>3.0.1</version.jakarta.enterprise>
         <version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>1.0.2.Final</version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>
         <version.jakarta.annotation-api>2.1.0</version.jakarta.annotation-api>
         <version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>1.1.1.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>
@@ -324,7 +324,7 @@
         <version.org.apache.commons.math3>3.6.1</version.org.apache.commons.math3>
         <version.org.apache.avro>1.11.0</version.org.apache.avro>
         <version.org.jboss.weld>3.1.9.Final</version.org.jboss.weld>
-        <version.org.jboss.weld.jakarta>4.0.2.Final</version.org.jboss.weld.jakarta>
+        <version.org.jboss.weld.jakarta>4.0.3.Final</version.org.jboss.weld.jakarta>
 
         <!-- >>> Performance tests -->
         <version.org.openjdk.jmh>1.35</version.org.openjdk.jmh>

From ad8a30d8b5154d7e1763fa7f8296e45f50b126eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Mon, 4 Apr 2022 09:06:17 +0200
Subject: [PATCH 10/10] HSEARCH-4529 Upgrade to Hibernate Commons Annotations
 6.0.0.Final for -orm6 artifacts

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2689dab1f22..48980a7dfbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -274,7 +274,7 @@
         <version.org.hibernate.orm>6.0.0.Final</version.org.hibernate.orm>
         <javadoc.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/javadocs/</javadoc.org.hibernate.orm.url>
         <documentation.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/userguide/html_single/Hibernate_User_Guide.html</documentation.org.hibernate.orm.url>
-        <version.org.hibernate.commons.annotations.orm6>6.0.0.CR1</version.org.hibernate.commons.annotations.orm6>
+        <version.org.hibernate.commons.annotations.orm6>6.0.0.Final</version.org.hibernate.commons.annotations.orm6>
         <version.jakarta.persistence>3.0.0</version.jakarta.persistence>
 
         <!-- >>> JSR 352 -->