diff --git a/pom.xml b/pom.xml
index 81812be8fdba1c25eb4ce90df2993a8bc06e0ddc..af11bbbb5e0c55b15f2f1c3c5f47586fe605f524 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,8 +62,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<targetJdk>1.8</targetJdk>
- <org.springframework.version>5.2.7.RELEASE</org.springframework.version>
- <org.hibernate.version>5.4.18.Final</org.hibernate.version>
+ <org.springframework.version>5.2.8.RELEASE</org.springframework.version>
+ <org.hibernate.version>5.4.19.Final</org.hibernate.version>
<apache.cxf>3.3.7</apache.cxf>
<apache.pdfbox>2.0.20</apache.pdfbox>
<apache.poi>4.1.2</apache.poi>
@@ -73,11 +73,11 @@
<jackson.version>2.11.1</jackson.version>
<org.mysql.version>5.1.46</org.mysql.version>
<org.postgresql.version>42.2.14</org.postgresql.version>
- <org.infinispan.version>11.0.0.Final</org.infinispan.version>
+ <org.infinispan.version>11.0.1.Final</org.infinispan.version>
<lucene.version>7.7.0</lucene.version>
<version.selenium>3.141.59</version.selenium>
<version.drone>2.5.1</version.drone>
- <activemq.version>5.15.12</activemq.version>
+ <activemq.version>5.16.0</activemq.version>
<qtiworks.version>1.0.19</qtiworks.version>
<!-- properties for testing and Q&A -->
@@ -98,7 +98,6 @@
<test.env.db.oracle.host>localhost</test.env.db.oracle.host>
<test.env.db.oracle.host.port>1521</test.env.db.oracle.host.port>
<test.env.instance.id>myolat</test.env.instance.id>
- <test.env.jmx.rmi.port.0>3000</test.env.jmx.rmi.port.0>
<test.env.webdriver.browser>chrome</test.env.webdriver.browser>
<test.env.webdriver.firefox.version>v0.27.0</test.env.webdriver.firefox.version>
<test.env.webdriver.chrome.version>84.0.4147.30</test.env.webdriver.chrome.version>
@@ -1336,7 +1335,6 @@
<test.env.db.postgresql.pass>${test.env.db.postgresql.pass}</test.env.db.postgresql.pass>
<test.env.db.postgresql.host.port>${test.env.db.postgresql.host.port}</test.env.db.postgresql.host.port>
<test.env.instance.id>${test.env.instance.id}</test.env.instance.id>
- <test.env.jmx.rmi.port.0>${test.env.jmx.rmi.port.0}</test.env.jmx.rmi.port.0>
<arquillian.launch>tomcat-7-managed</arquillian.launch>
<webdriver.browser>${test.env.webdriver.browser}</webdriver.browser>
<webdriver.firefox.version>${test.env.webdriver.firefox.version}</webdriver.firefox.version>
diff --git a/src/main/java/org/olat/core/commons/services/jmx/_spring/jmxContext.xml b/src/main/java/org/olat/core/commons/services/jmx/_spring/jmxContext.xml
index 603ad7a412a6428ba1e68c41fb1268c55f04d59c..f7be7d25a78f79f055340ccca0ae066a98f9bd37 100644
--- a/src/main/java/org/olat/core/commons/services/jmx/_spring/jmxContext.xml
+++ b/src/main/java/org/olat/core/commons/services/jmx/_spring/jmxContext.xml
@@ -12,9 +12,5 @@
<bean id="org.springframework.jmx.support.MBeanServerFactoryBean" class="org.springframework.jmx.support.MBeanServerFactoryBean">
<property name="locateExistingServerIfPossible" value="true" />
</bean>
-
- <bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean" lazy-init="true">
- <property name="port" value="${jmx.rmi.port}"/>
- </bean>
</beans>
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 1217b1212ba0a0721442f7fe242a9dcabc475b05..e46194a246e4245df70e71823404f05232200165 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -646,8 +646,6 @@ mobile.context=/mobile
server.domainname=localhost
# the port on which the container is listening
server.port=8080
-# OLAT JMX server port (must be unique per node in a cluster)
-jmx.rmi.port=3000
########################################################################
# MathJAX CDN
@@ -1111,10 +1109,10 @@ certificate.broker.url=vm://embedded?broker.persistent=false
#if you use the jndi connection
jms.broker.jndi=OpenOLATConnectionFactory
-sysbus.broker.jndi=topic/sysbus
-search.broker.jndi=queue/searchQueue
-index.broker.jndi=queue/indexQueue
-certificate.broker.jndi=queue/certificateQueue
+sysbus.broker.jndi=topic/sysbus&broker.useJmx=false
+search.broker.jndi=queue/searchQueue&broker.useJmx=false
+index.broker.jndi=queue/indexQueue&broker.useJmx=false
+certificate.broker.jndi=queue/certificateQueue&broker.useJmx=false
#####
#query cache config for singlevm/cluster
diff --git a/src/test/profile/mysql/olat.local.properties b/src/test/profile/mysql/olat.local.properties
index b79526968cd496263d2d0d4662b9226cca4fb6dd..00b93048559e8478ca993fa069789ef04a9512a8 100644
--- a/src/test/profile/mysql/olat.local.properties
+++ b/src/test/profile/mysql/olat.local.properties
@@ -31,7 +31,6 @@ keepUserLoginAfterDeletion=true
# do not run upgrades and scheduled jobs and such
cluster.singleton.services = disabled
-jmx.rmi.port=${test.env.jmx.rmi.port.0:1009}
# SingleVM jms.broker.url
jms.broker.url=vm://embedded?broker.persistent=false
diff --git a/src/test/profile/oracle/olat.local.properties b/src/test/profile/oracle/olat.local.properties
index 54304245ef03cb66adf38c68f848346210aadba6..078aaf062e37114a3ffd60c26386426891272371 100644
--- a/src/test/profile/oracle/olat.local.properties
+++ b/src/test/profile/oracle/olat.local.properties
@@ -31,7 +31,6 @@ keepUserLoginAfterDeletion=true
# do not run upgrades and scheduled jobs and such
cluster.singleton.services = disabled
-jmx.rmi.port=${test.env.jmx.rmi.port.0:1009}
# SingleVM jms.broker.url
jms.broker.url=vm://embedded?broker.persistent=false
diff --git a/src/test/profile/postgresql/olat.local.properties b/src/test/profile/postgresql/olat.local.properties
index 1b1c15e641e4b698b12876486f843799d2b3c7f3..3cffb4f9704a0b984a90bac90f408b053d7ac18b 100644
--- a/src/test/profile/postgresql/olat.local.properties
+++ b/src/test/profile/postgresql/olat.local.properties
@@ -31,7 +31,6 @@ keepUserLoginAfterDeletion=true
# do not run upgrades and scheduled jobs and such
cluster.singleton.services = disabled
-jmx.rmi.port=${test.env.jmx.rmi.port.0:1009}
# SingleVM jms.broker.url
jms.broker.url=vm://embedded?broker.persistent=false