diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
index 180eb55b04a..f81f0c2815f 100644
--- a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
+++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,7 +102,7 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
 	 * @return the bean class to expose
 	 * @see JmxUtils#getClassToExpose(Object) 
 	 */
-	protected Class getClassToExpose(Object managedBean) {
+	protected Class<?> getClassToExpose(Object managedBean) {
 		return JmxUtils.getClassToExpose(managedBean);
 	}
 
@@ -113,7 +113,7 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
 	 * @return the bean class to expose
 	 * @see JmxUtils#getClassToExpose(Class)
 	 */
-	protected Class getClassToExpose(Class beanClass) {
+	protected Class<?> getClassToExpose(Class<?> beanClass) {
 		return JmxUtils.getClassToExpose(beanClass);
 	}
 
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
index e199db653b0..4c87da3bac5 100644
--- a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
+++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,6 @@ public interface AutodetectCapableMBeanInfoAssembler extends MBeanInfoAssembler
 	 * @param beanClass the class of the bean (might be a proxy class)
 	 * @param beanName the name of the bean in the bean factory
 	 */
-	boolean includeBean(Class beanClass, String beanName);
+	boolean includeBean(Class<?> beanClass, String beanName);
 
 }
diff --git a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java
index 743e8b73124..9e0af17a046 100644
--- a/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java
+++ b/org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.springframework.jmx.export.assembler;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
-
 import javax.management.Descriptor;
 import javax.management.MBeanParameterInfo;
 import javax.management.modelmbean.ModelMBeanNotificationInfo;
@@ -115,7 +114,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 	 * @param beanClass the class of the bean
 	 * @param beanName the name of the bean in the bean factory
 	 */
-	public boolean includeBean(Class beanClass, String beanName) {
+	public boolean includeBean(Class<?> beanClass, String beanName) {
 		return (this.attributeSource.getManagedResource(getClassToExpose(beanClass)) != null);
 	}