Dependency cleanup and minor updates.

Original Pull Request #1829
Closes #1828

Author: sothawo

pom.xml

@@ -18,10 +18,9 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
 	<properties>
-		<commonslang>2.6</commonslang>
 		<elasticsearch>7.12.1</elasticsearch>
-		<log4j>2.13.3</log4j>
-		<netty>4.1.52.Final</netty>
+		<log4j>2.14.1</log4j>
+		<netty>4.1.65.Final</netty>
 		<springdata.commons>2.6.0-SNAPSHOT</springdata.commons>
 		<testcontainers>1.15.3</testcontainers>
 		<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
@@ -132,22 +131,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- APACHE -->
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>${commonslang}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- JODA Time -->
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>${jodatime}</version>
-			<optional>true</optional>
-		</dependency>
-
 		<!-- Elasticsearch -->
 		<dependency>
 			<groupId>org.elasticsearch.client</groupId>

src/main/java/org/springframework/data/elasticsearch/core/convert/DateTimeConverters.java

@@ -18,19 +18,18 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import org.springframework.context.annotation.Bean;
 import reactor.core.publisher.Mono;
 
 import java.util.Collection;
 import java.util.Collections;
 
-import org.apache.commons.lang.ClassUtils;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.main.MainResponse;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.cluster.ClusterName;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.data.elasticsearch.annotations.Document;
@@ -52,7 +51,7 @@ public class ElasticsearchConfigurationSupportUnitTests {
 	public void usesConfigClassPackageAsBaseMappingPackage() throws ClassNotFoundException {
 
 		ElasticsearchConfigurationSupport configuration = new StubConfig();
-		assertThat(configuration.getMappingBasePackages()).contains(ClassUtils.getPackageName(StubConfig.class));
+		assertThat(configuration.getMappingBasePackages()).contains(StubConfig.class.getPackage().getName());
 		assertThat(configuration.getInitialEntitySet()).contains(Entity.class);
 	}
 

src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchConfigurationSupportUnitTests.java

@@ -2,17 +2,21 @@
 
 import java.lang.reflect.Field;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
 
 /**
  * Created by akonczak on 02/12/2015.
+ *
+ * @author Peter-Josef Meisch
  */
 public class IndexBuilder {
 
 	public static IndexQuery buildIndex(Object object) {
 		for (Field f : object.getClass().getDeclaredFields()) {
-			if (ArrayUtils.isNotEmpty(f.getAnnotationsByType(org.springframework.data.annotation.Id.class))) {
+
+			if (AnnotationUtils.findAnnotation(f, Id.class) != null) {
 				try {
 					f.setAccessible(true);
 					IndexQuery indexQuery = new IndexQuery();