diff --git a/pom.xml b/pom.xml index 25f1b4b8cf8d7cb77454a46676f5f4c3dfe499db..210e353728616b81abf22473f1c2b5181406b0fb 100644 --- a/pom.xml +++ b/pom.xml @@ -781,12 +781,12 @@ <version>1.1</version> </dependency> <dependency> - <groupId>org.jivesoftware</groupId> + <groupId>org.igniterealtime.smack</groupId> <artifactId>smack</artifactId> <version>3.2.1</version> </dependency> <dependency> - <groupId>org.jivesoftware</groupId> + <groupId>org.igniterealtime.smack</groupId> <artifactId>smackx</artifactId> <version>3.2.1</version> </dependency> @@ -974,7 +974,7 @@ <version>1.9.14</version> </dependency> <dependency> - <groupId>owaspantisamy</groupId> + <groupId>org.owasp.antisamy</groupId> <artifactId>antisamy</artifactId> <version>1.4.4</version> </dependency> diff --git a/src/main/java/maven.build.properties b/src/main/java/maven.build.properties new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/main/java/org/olat/admin/jmx/JBossTreeCacheJmxRegistrationManager.java b/src/main/java/org/olat/admin/jmx/JBossTreeCacheJmxRegistrationManager.java index f8ec007a7c00d978cd7b3a344a42673871ac8154..b8395ad74b079315bababedac992ceeedca4836d 100644 --- a/src/main/java/org/olat/admin/jmx/JBossTreeCacheJmxRegistrationManager.java +++ b/src/main/java/org/olat/admin/jmx/JBossTreeCacheJmxRegistrationManager.java @@ -23,16 +23,9 @@ package org.olat.admin.jmx; import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; -import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; -import org.jboss.cache.DefaultCacheFactory; -import org.jboss.cache.jmx.JmxRegistrationManager; import org.olat.core.logging.OLog; import org.olat.core.logging.Tracing; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; /** * Helper class to register all JBoss Tree Cache MBeans at JMX Server. @@ -49,9 +42,11 @@ public class JBossTreeCacheJmxRegistrationManager { } /** * Register StatisticsService as MBean for JMX support. + * @param <Cache> * @param mySessionFactory */ - private void registerAllJBossTreeCacheMBeans() { + private <Cache> void registerAllJBossTreeCacheMBeans() { + /* fxdiff: FXOLAT-243 try { log.info("start to register all JBoss Treecache MBeans..."); CacheFactory factory = new DefaultCacheFactory(); @@ -65,6 +60,7 @@ public class JBossTreeCacheJmxRegistrationManager { } catch (NoSuchBeanDefinitionException e) { log.warn("JMX-Error : Can not register as MBean, NoSuchBeanDefinitionException=", e); } + */ }