diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index dde4627b6..f040862dd 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -36,7 +36,7 @@ dependencies {
 		api "com.google.code.typica:typica:1.7.2"
 		api "com.unboundid:unboundid-ldapsdk:6.0.11"
 		api "commons-codec:commons-codec:1.18.0"
-		api "commons-cli:commons-cli:1.5.0"
+		api "commons-cli:commons-cli:1.9.0"
 		api "commons-lang:commons-lang:2.6"
 		api "commons-logging:commons-logging:1.3.5"
 		api "gsbase:gsbase:2.0.1"
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java
index e128a8d06..cc9f2d2df 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java
@@ -411,7 +411,7 @@ public static void main(String[] argv) {
 		}
 
 		// Look for the optional syntax to Java class mapping file
-		String syntaxMapFileName = cmd.getOptionValue(Flag.SYNTAX_MAP.getShort(), null);
+		String syntaxMapFileName = cmd.getOptionValue(Flag.SYNTAX_MAP.getShort(), (String) null);
 		SyntaxToJavaClass syntaxToJavaClass = new SyntaxToJavaClass(new HashMap<>());
 		if (syntaxMapFileName != null) {
 			File syntaxMapFile = new File(syntaxMapFileName);