diff --git a/spring-core/src/main/java/org/springframework/core/SpringFactoriesLoader.java b/spring-core/src/main/java/org/springframework/core/SpringFactoriesLoader.java
index e6fc7e3a04..0954d8cf4f 100644
--- a/spring-core/src/main/java/org/springframework/core/SpringFactoriesLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/SpringFactoriesLoader.java
@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
  * from a given file location. If a location is not given, the {@linkplain
  * #DEFAULT_FACTORIES_LOCATION default location} is used.
  *
- * <p>The file should be in {@link Properties} format, where the keys is the fully
+ * <p>The file should be in {@link Properties} format, where the key is the fully
  * qualified interface or abstract class name, and the value is a comma separated list of
  * implementations. For instance:
  * <pre class="code">
@@ -119,7 +119,7 @@ public abstract class SpringFactoriesLoader {
 		return result;
 	}
 
-	private static List<String> loadFactoryNames(Class factoryClass,
+	private static List<String> loadFactoryNames(Class<?> factoryClass,
 	                                             ClassLoader classLoader,
 	                                             String factoriesLocation) {
 
@@ -127,7 +127,7 @@ public abstract class SpringFactoriesLoader {
 
 		try {
 			List<String> result = new ArrayList<String>();
-			Enumeration urls = classLoader.getResources(factoriesLocation);
+			Enumeration<URL> urls = classLoader.getResources(factoriesLocation);
 			while (urls.hasMoreElements()) {
 				URL url = (URL) urls.nextElement();
 				Properties properties =
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
index f740e88c1b..bd5e3264eb 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
@@ -204,6 +204,8 @@ public class EmbeddedDatabaseFactory {
 			return this.dataSource.isWrapperFor(iface);
 		}
 
+		// getParentLogger() is required for JDBC 4.1 compatibility
+		@SuppressWarnings("unused")
 		public Logger getParentLogger() {
 			return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
 		}