Merge pull request #3339 from yurake/snyk-fix-177e84d32f42fd196b07087…

…0076c3991 [Snyk] Security upgrade io.quarkiverse.artemis:quarkus-artemis-jms from 2.1.1 to 3.3.0
yurake · Feb 2, 2025 · cef7b91 · cef7b91
2 parents 83b55a7 + 2ec15ac
commit cef7b91
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 37 deletions.
diff --git a/application/consumer-activemq-quarkus/pom.xml b/application/consumer-activemq-quarkus/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<parent>
 		<groupId>webapp.3tier.k8s.parent</groupId>
 		<artifactId>parent-pom</artifactId>
@@ -10,6 +12,7 @@
 	<artifactId>consumer-activemq-quarkus</artifactId>
 	<properties>
 		<quarkus-artemis.version>3.6.1</quarkus-artemis.version>
+		<quarkus-rest.version>3.18.1</quarkus-rest.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -25,6 +28,11 @@
 			<groupId>io.quarkus</groupId>
 			<artifactId>quarkus-rest-client</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-rest</artifactId>
+			<version>${quarkus-rest.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>io.quarkiverse.artemis</groupId>
 			<artifactId>quarkus-test-artemis</artifactId>

diff --git a/.../consumer-activemq-quarkus/src/main/java/webapp/tier/service/ActiveMqDeliverConsumer.java b/.../consumer-activemq-quarkus/src/main/java/webapp/tier/service/ActiveMqDeliverConsumer.java
@@ -5,14 +5,14 @@
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
-import javax.jms.JMSConsumer;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.TextMessage;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
+import jakarta.jms.JMSConsumer;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.TextMessage;
 import webapp.tier.bean.MsgBean;
 import webapp.tier.util.MsgUtils;
 

diff --git a/...consumer-activemq-quarkus/src/main/java/webapp/tier/service/ActiveMqSubscribeService.java b/...consumer-activemq-quarkus/src/main/java/webapp/tier/service/ActiveMqSubscribeService.java
@@ -9,15 +9,15 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSConsumer;
-import javax.jms.JMSContext;
-import javax.jms.Session;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSConsumer;
+import jakarta.jms.JMSContext;
+import jakarta.jms.Session;
 
 @ApplicationScoped
 public class ActiveMqSubscribeService implements Runnable {

diff --git a/...activemq-quarkus/src/test/java/webapp/tier/service/ActiveMqSubscribeServiceErrorTest.java b/...activemq-quarkus/src/test/java/webapp/tier/service/ActiveMqSubscribeServiceErrorTest.java
@@ -1,14 +1,15 @@
 package webapp.tier.service;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import javax.inject.Inject;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSContext;
-import javax.jms.Session;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.junit.jupiter.api.AfterEach;
@@ -20,6 +21,9 @@
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusMock;
 import io.quarkus.test.junit.QuarkusTest;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSContext;
+import jakarta.jms.Session;
 import webapp.tier.bean.MsgBean;
 import webapp.tier.util.CreateId;
 import webapp.tier.util.MsgUtils;

diff --git a/...umer-activemq-quarkus/src/test/java/webapp/tier/service/ActiveMqSubscribeServiceTest.java b/...umer-activemq-quarkus/src/test/java/webapp/tier/service/ActiveMqSubscribeServiceTest.java
@@ -1,14 +1,15 @@
 package webapp.tier.service;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import javax.inject.Inject;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSContext;
-import javax.jms.Session;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.junit.jupiter.api.AfterEach;
@@ -20,6 +21,9 @@
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusMock;
 import io.quarkus.test.junit.QuarkusTest;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSContext;
+import jakarta.jms.Session;
 import webapp.tier.bean.MsgBean;
 import webapp.tier.util.CreateId;
 import webapp.tier.util.MsgUtils;

diff --git a/application/jaxrs-activemq-quarkus/pom.xml b/application/jaxrs-activemq-quarkus/pom.xml
@@ -12,6 +12,7 @@
 	<artifactId>jaxrs-activemq-quarkus</artifactId>
 	<properties>
 		<quarkus-artemis.version>3.6.1</quarkus-artemis.version>
+		<quarkus-rest.version>3.18.1</quarkus-rest.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -23,6 +24,11 @@
 			<artifactId>quarkus-artemis-jms</artifactId>
 			<version>${quarkus-artemis.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-rest</artifactId>
+			<version>${quarkus-rest.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>io.quarkiverse.artemis</groupId>
 			<artifactId>quarkus-test-artemis</artifactId>

diff --git a/application/jaxrs-activemq-quarkus/src/main/java/webapp/tier/service/ActiveMqConsumer.java b/application/jaxrs-activemq-quarkus/src/main/java/webapp/tier/service/ActiveMqConsumer.java
@@ -4,13 +4,13 @@
 import java.util.logging.Logger;
 
 import javax.enterprise.context.ApplicationScoped;
+
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
 import jakarta.jms.JMSConsumer;
 import jakarta.jms.JMSException;
 import jakarta.jms.Message;
 import jakarta.jms.TextMessage;
-
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
 import webapp.tier.bean.MsgBean;
 import webapp.tier.service.socket.ActiveMqSocket;
 import webapp.tier.util.MsgUtils;

diff --git a/application/jaxrs-activemq-quarkus/src/main/java/webapp/tier/service/ActiveMqService.java b/application/jaxrs-activemq-quarkus/src/main/java/webapp/tier/service/ActiveMqService.java
@@ -10,15 +10,15 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
-import jakarta.jms.ConnectionFactory;
-import jakarta.jms.JMSConsumer;
-import jakarta.jms.JMSContext;
-import jakarta.jms.Session;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSConsumer;
+import jakarta.jms.JMSContext;
+import jakarta.jms.Session;
 import webapp.tier.bean.MsgBean;
 import webapp.tier.interfaces.Messaging;
 import webapp.tier.util.CreateId;

diff --git a/...ication/jaxrs-activemq-quarkus/src/test/java/webapp/tier/service/ActiveMqServiceTest.java b/...ication/jaxrs-activemq-quarkus/src/test/java/webapp/tier/service/ActiveMqServiceTest.java
@@ -6,16 +6,16 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import javax.inject.Inject;
-import jakarta.jms.ConnectionFactory;
-import jakarta.jms.JMSContext;
-import jakarta.jms.Session;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.artemis.test.ArtemisTestResource;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSContext;
+import jakarta.jms.Session;
 import webapp.tier.bean.MsgBean;
 
 @QuarkusTest