Merge branch 'develop' into stable

    	<maven.compiler.release>11</maven.compiler.release>

		<aps.docker-tag>docker.inteligr8.com/inteligr8/alfresco-process-services</aps.docker-tag>

    	<aps.version>2.4.6</aps.version>

		<spring.version>5.3.31</spring.version>

    	<activiti.version>7.11.1</activiti.version>

    	<tomcat-rad.version>9-2.2</tomcat-rad.version>

    	<aps.version>25.1.1</aps.version>

		<spring.version>6.2.5</spring.version>

    	<activiti.version>8.1.3</activiti.version>

    	<tomcat-rad.version>10-2.2</tomcat-rad.version>

    	<aps.tomcat.opts>-Dinteligr8.mq.connectors.docker-mq.url=failover:\(tcp://${project.artifactId}-mq:61616\)?timeout=3000 -Dinteligr8.mq.connectors.docker-mq.username=admin -Dinteligr8.mq.connectors.docker-mq.password=admin -Dvalidator.editor.dmn.espression=false -Dvalidator.editor.bpmn.disable.scripttask=false -Djavascript.secure-scripting.enabled=false -Djavascript.secure-scripting.enable-class-whitelisting=false -Dbeans.whitelisting.enabled=false -Del.whitelisting.enabled=false -Dshell.whitelisting.enabled=false</aps.tomcat.opts>

    	<!-- reloads in APS are slower than a restart -->

    	<aps.hotswap.enabled>false</aps.hotswap.enabled>

    	<rabbitmq.version>5.18.0</rabbitmq.version>

    	<activemq.version>5.18.6</activemq.version>

    	<activemq.jms.version>2.31.2</activemq.jms.version>

    	<activemq.version>5.18.7</activemq.version>

    	<activemq.jms.version>2.42.0</activemq.jms.version>

		<activemq.httpPort>8161</activemq.httpPort>

    </properties>