From cda8d9ed80eca8ec779d3e97ef263e42ab2a2f92 Mon Sep 17 00:00:00 2001
From: Zheng Feng <zh.feng@gmail.com>
Date: Thu, 8 Dec 2022 17:49:33 +0800
Subject: [PATCH 1/2] Introduce jms-spi with ConnectionFactoryWrapperBuildItem

---
 build-parent/pom.xml                          |  8 ++++++
 extensions/jms-spi/deployment/pom.xml         | 27 +++++++++++++++++++
 .../ConnectionFactoryWrapperBuildItem.java    | 25 +++++++++++++++++
 extensions/jms-spi/pom.xml                    | 20 ++++++++++++++
 extensions/pom.xml                            |  3 +++
 5 files changed, 83 insertions(+)
 create mode 100644 extensions/jms-spi/deployment/pom.xml
 create mode 100644 extensions/jms-spi/deployment/src/main/java/io/quarkus/jms/spi/deployment/ConnectionFactoryWrapperBuildItem.java
 create mode 100644 extensions/jms-spi/pom.xml

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index d1d12aba0a97e..ca2882a1c6734 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -175,6 +175,9 @@
         <!-- google cloud functions invoker-->
         <gcf-invoker.version>1.1.1</gcf-invoker.version>
         <owasp-dependency-check-plugin.version>7.4.4</owasp-dependency-check-plugin.version>
+
+        <!-- Jakarta JMS API -->
+        <jakarta.jms-api.version>2.0.3</jakarta.jms-api.version>
     </properties>
 
     <dependencyManagement>
@@ -348,6 +351,11 @@
                 <artifactId>mermaid</artifactId>
                 <version>${webjar.mermaid.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.jms</groupId>
+                <artifactId>jakarta.jms-api</artifactId>
+                <version>${jakarta.jms-api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.github.davidmoten</groupId>
                 <artifactId>subethasmtp</artifactId>
diff --git a/extensions/jms-spi/deployment/pom.xml b/extensions/jms-spi/deployment/pom.xml
new file mode 100644
index 0000000000000..98a1c8c187193
--- /dev/null
+++ b/extensions/jms-spi/deployment/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-jms-spi-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-jms-spi-deployment</artifactId>
+    <name>Quarkus - JMS - SPI - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+           <groupId>jakarta.jms</groupId>
+           <artifactId>jakarta.jms-api</artifactId>
+       </dependency>
+    </dependencies>
+
+</project>
diff --git a/extensions/jms-spi/deployment/src/main/java/io/quarkus/jms/spi/deployment/ConnectionFactoryWrapperBuildItem.java b/extensions/jms-spi/deployment/src/main/java/io/quarkus/jms/spi/deployment/ConnectionFactoryWrapperBuildItem.java
new file mode 100644
index 0000000000000..bc7ccc951f6c4
--- /dev/null
+++ b/extensions/jms-spi/deployment/src/main/java/io/quarkus/jms/spi/deployment/ConnectionFactoryWrapperBuildItem.java
@@ -0,0 +1,25 @@
+package io.quarkus.jms.spi.deployment;
+
+import java.util.function.Function;
+
+import javax.jms.ConnectionFactory;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * A build item that can be used to wrap the JMS ConnectionFactory
+ */
+public final class ConnectionFactoryWrapperBuildItem extends SimpleBuildItem {
+    private final Function<ConnectionFactory, Object> wrapper;
+
+    public ConnectionFactoryWrapperBuildItem(Function<ConnectionFactory, Object> wrapper) {
+        if (wrapper == null) {
+            throw new AssertionError("wrapper is required");
+        }
+        this.wrapper = wrapper;
+    }
+
+    public Function<ConnectionFactory, Object> getWrapper() {
+        return wrapper;
+    }
+}
diff --git a/extensions/jms-spi/pom.xml b/extensions/jms-spi/pom.xml
new file mode 100644
index 0000000000000..ed967c17f6814
--- /dev/null
+++ b/extensions/jms-spi/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-jms-spi-parent</artifactId>
+    <name>Quarkus - JMS SPI - Parent</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+    </modules>
+
+</project>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 39f767d438f5c..e443cd5dffe96 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -200,6 +200,9 @@
 
         <module>awt</module>
 
+        <!-- JMS -->
+        <module>jms-spi</module>
+
     </modules>
 
     <build>

From 70497481803bba7cb40609fb3fa327cb65d1e578 Mon Sep 17 00:00:00 2001
From: Zheng Feng <zh.feng@gmail.com>
Date: Mon, 6 Feb 2023 20:23:07 +0800
Subject: [PATCH 2/2] Update jakarta jms-api

---
 build-parent/pom.xml                                            | 2 +-
 .../jms/spi/deployment/ConnectionFactoryWrapperBuildItem.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index ca2882a1c6734..304e3dd07d0de 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -177,7 +177,7 @@
         <owasp-dependency-check-plugin.version>7.4.4</owasp-dependency-check-plugin.version>
 
         <!-- Jakarta JMS API -->
-        <jakarta.jms-api.version>2.0.3</jakarta.jms-api.version>
+        <jakarta.jms-api.version>3.1.0</jakarta.jms-api.version>
     </properties>
 
     <dependencyManagement>
diff --git a/extensions/jms-spi/deployment/src/main/java/io/quarkus/jms/spi/deployment/ConnectionFactoryWrapperBuildItem.java b/extensions/jms-spi/deployment/src/main/java/io/quarkus/jms/spi/deployment/ConnectionFactoryWrapperBuildItem.java
index bc7ccc951f6c4..2266bec3ebc6e 100644
--- a/extensions/jms-spi/deployment/src/main/java/io/quarkus/jms/spi/deployment/ConnectionFactoryWrapperBuildItem.java
+++ b/extensions/jms-spi/deployment/src/main/java/io/quarkus/jms/spi/deployment/ConnectionFactoryWrapperBuildItem.java
@@ -2,7 +2,7 @@
 
 import java.util.function.Function;
 
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
 import io.quarkus.builder.item.SimpleBuildItem;