From d421d8282727be9cdb512e7ec3f9be9cb7fad35f Mon Sep 17 00:00:00 2001 From: Juan Pablo Fisicaro Date: Tue, 7 Nov 2023 15:48:59 -0300 Subject: [PATCH 1/6] added properties to look for illegal reflective access --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 1f464a55..76027b57 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,7 @@ 4.2 LICENSE_HEADER_CPAL.txt 2023 + @@ -359,6 +360,11 @@ true + + + + <_JAVA_OPTIONS>-XX:+PrintCommandLineFlags ${mtf.javaopts} + From 4d9225e65022959689fdb9154027e58746887feb Mon Sep 17 00:00:00 2001 From: Juan Pablo Fisicaro Date: Thu, 9 Nov 2023 09:50:06 -0300 Subject: [PATCH 2/6] increased activemq version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 76027b57..bac94ba8 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ Mule connector lets you easily send and receive messages to queues and topics for any message service which implements the JMS specification - 5.14.5 + 5.16.7 2.25.0 2.0.1 2.11.0 From 31b015024c49396a24edc855d564328955043472 Mon Sep 17 00:00:00 2001 From: Juan Pablo Fisicaro Date: Mon, 13 Nov 2023 19:55:24 -0300 Subject: [PATCH 3/6] feature/W-13846024 --- illegalAccess.sh | 12 ++++++++++++ pom.xml | 8 ++++---- .../activemq/ActiveMQConnectionFactoryProvider.java | 4 ++++ 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100755 illegalAccess.sh diff --git a/illegalAccess.sh b/illegalAccess.sh new file mode 100755 index 00000000..41b3fe55 --- /dev/null +++ b/illegalAccess.sh @@ -0,0 +1,12 @@ +#!/bin/bash +RUNTIME_VERSION=4.4.0-20230522 +MUNIT_JVM=/Users/jfisicaro/jdk-11.0.2.jdk/Contents/Home/bin/java +mvn clean +mkdir target +mvn verify \ + -DruntimeProduct=MULE_EE \ + -DruntimeVersion=$RUNTIME_VERSION \ + -Dmunit.jvm=$MUNIT_JVM \ + -Dmtf.javaopts="--illegal-access=warn" > ./target/test.log + +cat ./target/test.log | grep "WARNING: Illegal reflective access by" > ./target/illegal-access.log diff --git a/pom.xml b/pom.xml index bac94ba8..67a6eeef 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ Mule connector lets you easily send and receive messages to queues and topics for any message service which implements the JMS specification - 5.16.7 + 5.16.4 2.25.0 2.0.1 2.11.0 @@ -40,9 +40,9 @@ src/test/munit ${basedir}/target/test-mule/munit - 1.1.3 - 2.3.15 - 1.1.2 + 1.2.0-SNAPSHOT + 3.1.0-SNAPSHOT + 1.2.0-SNAPSHOT 3.3.0 0.41.0 3.3.0 diff --git a/src/main/java/org/mule/extensions/jms/internal/connection/provider/activemq/ActiveMQConnectionFactoryProvider.java b/src/main/java/org/mule/extensions/jms/internal/connection/provider/activemq/ActiveMQConnectionFactoryProvider.java index 6f74a977..60f7a7f3 100644 --- a/src/main/java/org/mule/extensions/jms/internal/connection/provider/activemq/ActiveMQConnectionFactoryProvider.java +++ b/src/main/java/org/mule/extensions/jms/internal/connection/provider/activemq/ActiveMQConnectionFactoryProvider.java @@ -10,6 +10,7 @@ import static org.mule.runtime.api.meta.ExpressionSupport.NOT_SUPPORTED; import static org.mule.runtime.core.api.util.ClassUtils.instantiateClass; +import org.apache.activemq.ActiveMQXAConnectionFactory; import org.mule.extensions.jms.api.connection.factory.activemq.ActiveMQConnectionFactoryConfiguration; import org.mule.extensions.jms.api.exception.JmsMissingLibraryException; import org.mule.extensions.jms.internal.connection.exception.ActiveMQException; @@ -25,6 +26,7 @@ import java.util.List; import javax.jms.ConnectionFactory; +import javax.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; import org.slf4j.Logger; @@ -86,6 +88,8 @@ ConnectionFactory createDefaultConnectionFactory(boolean useSsl) throws ActiveMQ this.connectionFactory = (ConnectionFactory) instantiateClass(factoryClass, factoryConfiguration.getBrokerUrl()); applyVendorSpecificConnectionFactoryProperties(connectionFactory); + if (this.connectionFactory instanceof ActiveMQXAConnectionFactory) + ((ActiveMQXAConnectionFactory) connectionFactory).setXaAckMode(Session.AUTO_ACKNOWLEDGE); return connectionFactory; } catch (ClassNotFoundException e) { String message = From cebb94d4e965a514231129c1bb4a106d304fa5bd Mon Sep 17 00:00:00 2001 From: Juan Pablo Fisicaro Date: Tue, 14 Nov 2023 17:35:21 -0300 Subject: [PATCH 4/6] test reconnection --- src/test/munit/reconnection/reconnection-config.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/munit/reconnection/reconnection-config.xml b/src/test/munit/reconnection/reconnection-config.xml index d0a7f90f..b900c00e 100644 --- a/src/test/munit/reconnection/reconnection-config.xml +++ b/src/test/munit/reconnection/reconnection-config.xml @@ -16,9 +16,9 @@ - - - + + + From 92566d56f51a173923cb5ab883b101ca45d81a74 Mon Sep 17 00:00:00 2001 From: Juan Pablo Fisicaro Date: Tue, 14 Nov 2023 18:21:42 -0300 Subject: [PATCH 5/6] rollback change --- illegalAccess.sh | 12 ------------ src/test/munit/reconnection/reconnection-config.xml | 6 +++--- 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100755 illegalAccess.sh diff --git a/illegalAccess.sh b/illegalAccess.sh deleted file mode 100755 index 41b3fe55..00000000 --- a/illegalAccess.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -RUNTIME_VERSION=4.4.0-20230522 -MUNIT_JVM=/Users/jfisicaro/jdk-11.0.2.jdk/Contents/Home/bin/java -mvn clean -mkdir target -mvn verify \ - -DruntimeProduct=MULE_EE \ - -DruntimeVersion=$RUNTIME_VERSION \ - -Dmunit.jvm=$MUNIT_JVM \ - -Dmtf.javaopts="--illegal-access=warn" > ./target/test.log - -cat ./target/test.log | grep "WARNING: Illegal reflective access by" > ./target/illegal-access.log diff --git a/src/test/munit/reconnection/reconnection-config.xml b/src/test/munit/reconnection/reconnection-config.xml index b900c00e..d0a7f90f 100644 --- a/src/test/munit/reconnection/reconnection-config.xml +++ b/src/test/munit/reconnection/reconnection-config.xml @@ -16,9 +16,9 @@ - - - + + + From 51e4a080bc0cf8d35778d176d8592b6515cacfae Mon Sep 17 00:00:00 2001 From: Juan Pablo Fisicaro Date: Tue, 14 Nov 2023 19:07:32 -0300 Subject: [PATCH 6/6] testing --- src/test/munit/reconnection/reconnection-config.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/munit/reconnection/reconnection-config.xml b/src/test/munit/reconnection/reconnection-config.xml index d0a7f90f..b900c00e 100644 --- a/src/test/munit/reconnection/reconnection-config.xml +++ b/src/test/munit/reconnection/reconnection-config.xml @@ -16,9 +16,9 @@ - - - + + +