Merge branch 'main' into turn_off_graceful_shutdown_for_tests

SolaceLabs · Feb 5, 2024 · 0b1cc5d · 0b1cc5d
2 parents e1c0fc5 + c34bfcd
commit 0b1cc5d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/quarkus-solace-messaging-connector/deployment/pom.xml b/quarkus-solace-messaging-connector/deployment/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>com.solace.quarkus</groupId>
-            <artifactId>quarkus-solace-client-deployment</artifactId>
+            <artifactId>quarkus-solace-messaging-connector</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

diff --git a/quarkus-solace-messaging-connector/runtime/pom.xml b/quarkus-solace-messaging-connector/runtime/pom.xml
@@ -142,6 +142,22 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
+                <version>${quarkus.version}</version>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>extension-descriptor</goal>
+                        </goals>
+                        <configuration>
+                            <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

diff --git a/...aging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/WeldTestBase.java b/...aging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/WeldTestBase.java
@@ -12,6 +12,7 @@
 import com.solace.quarkus.messaging.SolaceConnector;
 import com.solace.quarkus.messaging.converters.SolaceMessageConverter;
 
+import io.quarkus.runtime.configuration.QuarkusConfigFactory;
 import io.smallrye.config.SmallRyeConfigProviderResolver;
 import io.smallrye.config.inject.ConfigExtension;
 import io.smallrye.reactive.messaging.providers.MediatorFactory;
@@ -79,6 +80,8 @@ public void stopContainer() {
         }
         // Release the config objects
         SmallRyeConfigProviderResolver.instance().releaseConfig(ConfigProvider.getConfig());
+        QuarkusConfigFactory.setConfig(null);
+        MapBasedConfig.cleanup();
     }
 
     public BeanManager getBeanManager() {