ARTEMIS-4491: update to ActiveMQ 5.18.3

artemis-features/src/main/resources/features.xml

@@ -137,8 +137,8 @@
 
 	<feature name="artemis-openwire-client" version="${pom.version}" description="ActiveMQ Artemis Openwire Client libraries">
 		<feature>transaction</feature>
+		<bundle dependency="true">mvn:jakarta.jms/jakarta.jms-api/${jakarta.jms-api.version}</bundle>
 		<bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuff.version}</bundle>
-		<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
 		<bundle>mvn:jakarta.ejb/jakarta.ejb-api/${jakarta.ejb-api.version}</bundle>
 		<bundle>mvn:jakarta.transaction/jakarta.transaction-api/${jakarta.transaction-api.version}</bundle>
 		<bundle>mvn:jakarta.management.j2ee/jakarta.management.j2ee-api/${jakarta.management.j2ee-api.version}</bundle>

pom.xml

@@ -87,7 +87,7 @@
       <pax.exam.version>4.13.5</pax.exam.version>
       <commons.config.version>2.9.0</commons.config.version>
       <commons.lang.version>3.12.0</commons.lang.version>
-      <activemq5-version>5.17.6</activemq5-version>
+      <activemq5-version>5.18.3</activemq5-version>
       <apache.derby.version>10.14.2.0</apache.derby.version>
       <commons.beanutils.version>1.9.4</commons.beanutils.version>
       <commons.dbcp2.version>2.7.0</commons.dbcp2.version>

tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java

@@ -19,6 +19,7 @@ package org.apache.activemq;
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
 import javax.jms.ExceptionListener;
+import javax.jms.JMSContext;
 import javax.jms.JMSException;
 import javax.jms.QueueConnection;
 import javax.jms.QueueConnectionFactory;
@@ -996,4 +997,24 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
    public boolean isTrustAllPackages() {
       return trustAllPackages;
    }
+
+   @Override
+   public JMSContext createContext() {
+      throw new UnsupportedOperationException("OpenWire test wrapper factory does not implement createContext");
+   }
+
+   @Override
+   public JMSContext createContext(String userName, String password) {
+      throw new UnsupportedOperationException("OpenWire test wrapper factory does not implement createContext");
+   }
+
+   @Override
+   public JMSContext createContext(String userName, String password, int sessionMode) {
+      throw new UnsupportedOperationException("OpenWire test wrapper factory does not implement createContext");
+   }
+
+   @Override
+   public JMSContext createContext(int sessionMode) {
+      throw new UnsupportedOperationException("OpenWire test wrapper factory does not implement createContext");
+   }
 }

tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java

@@ -44,6 +44,8 @@ import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
 import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.broker.region.MessageReference;
+import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.broker.region.virtual.VirtualDestination;
@@ -176,6 +178,11 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase {
 
    }
 
+   @Override
+   public void messageDispatched(ConnectionContext context, Subscription sub, MessageReference messageReference) {
+
+   }
+
    private void addServerAcceptor(Configuration serverConfig, BrokerService.ConnectorInfo info) throws Exception {
       serverConfig.addAcceptorConfiguration("homePort" + info.uri.getPort(), info.uri.toString());
    }

tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/region/policy/DestinationProxy.java

@@ -590,6 +590,11 @@ public class DestinationProxy implements Destination {
 
    }
 
+   @Override
+   public void messageDispatched(ConnectionContext context, Subscription sub, MessageReference messageReference) {
+      throw new UnsupportedOperationException("Not implemented yet");
+   }
+
    @Override
    public void messageDiscarded(ConnectionContext context, Subscription sub, MessageReference messageReference) {
       throw new UnsupportedOperationException("Not implemented yet");

tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/region/policy/RegionBrokerProxy.java

@@ -402,6 +402,11 @@ public class RegionBrokerProxy implements Broker {
 
    }
 
+   @Override
+   public void messageDispatched(ConnectionContext context, Subscription sub, MessageReference messageReference) {
+      throw new UnsupportedOperationException("Not implemented yet");
+   }
+
    @Override
    public void nowMasterBroker() {
       throw new UnsupportedOperationException("Not implemented yet");

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JMSMessageTest.java

@@ -492,6 +492,25 @@ public class JMSMessageTest extends JmsTestSupport {
       public String getText() throws JMSException {
          return text;
       }
+
+      @Override
+      public long getJMSDeliveryTime() throws JMSException {
+         return 0;
+      }
+
+      @Override
+      public void setJMSDeliveryTime(long deliveryTime) throws JMSException {
+      }
+
+      @Override
+      public <T> T getBody(Class<T> c) throws JMSException {
+         throw new UnsupportedOperationException("Test class does not implement getBody");
+      }
+
+      @Override
+      public boolean isBodyAssignableTo(Class c) throws JMSException {
+         throw new UnsupportedOperationException("Test class does not implement isBodyAssignableTo");
+      }
    }
 
    public void testForeignMessage() throws Exception {