Specifically detect Joda-Time 2.x

Closes gh-25655
spring-projects · Aug 28, 2020 · 6d9d415 · 6d9d415
1 parent 387eddc
commit 6d9d415
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.../src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java b/.../src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -39,7 +39,7 @@
  * {@link DefaultConversionService#addDefaultConverters addDefaultConverters} method.
  *
  * <p>Automatically registers formatters for JSR-354 Money & Currency, JSR-310 Date-Time
- * and/or Joda-Time, depending on the presence of the corresponding API on the classpath.
+ * and/or Joda-Time 2.x, depending on the presence of the corresponding API on the classpath.
  *
  * @author Chris Beams
  * @author Juergen Hoeller
@@ -54,7 +54,7 @@ public class DefaultFormattingConversionService extends FormattingConversionServ
 	static {
 		ClassLoader classLoader = DefaultFormattingConversionService.class.getClassLoader();
 		jsr354Present = ClassUtils.isPresent("javax.money.MonetaryAmount", classLoader);
-		jodaTimePresent = ClassUtils.isPresent("org.joda.time.LocalDate", classLoader);
+		jodaTimePresent = ClassUtils.isPresent("org.joda.time.YearMonth", classLoader);
 	}
 
 

diff --git a/...eb/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/...eb/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -809,8 +809,8 @@ private void registerWellKnownModulesIfAvailable(MultiValueMap<Object, Module> m
 			// jackson-datatype-jsr310 not available
 		}
 
-		// Joda-Time present?
-		if (ClassUtils.isPresent("org.joda.time.LocalDate", this.moduleClassLoader)) {
+		// Joda-Time 2.x present?
+		if (ClassUtils.isPresent("org.joda.time.YearMonth", this.moduleClassLoader)) {
 			try {
 				Class<? extends Module> jodaModuleClass = (Class<? extends Module>)
 						ClassUtils.forName("com.fasterxml.jackson.datatype.joda.JodaModule", this.moduleClassLoader);