diff --git a/pom.xml b/pom.xml
index 842b94d9fc8..f09e9f5e6c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,12 @@
             <artifactId>lucene-queryparser</artifactId>
             <version>${lucene.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta-regexp</groupId>
+                    <artifactId>jakarta-regexp</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
@@ -103,12 +109,34 @@
             <version>${lucene.version}</version>
             <scope>compile</scope>
         </dependency>
-          <dependency>
+        <!-- Lucene spatial, make sure when upgrading to work with latest version of jts/spatial4j dependencies -->
+        <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-spatial</artifactId>
             <version>${lucene.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.spatial4j</groupId>
+            <artifactId>spatial4j</artifactId>
+            <version>0.3</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <version>1.12</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Lucene spatial -->
 
 
         <!-- START: dependencies that are shaded -->
@@ -183,28 +211,6 @@
         </dependency>
         <!-- END: dependencies that are shaded -->
 
-        <dependency>
-            <groupId>com.spatial4j</groupId>
-            <artifactId>spatial4j</artifactId>
-            <version>0.3</version>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.vividsolutions</groupId>
-            <artifactId>jts</artifactId>
-            <version>1.12</version>
-            <scope>compile</scope>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -338,7 +344,8 @@
                         <es.node.local>${env.ES_TEST_LOCAL}</es.node.local>
                         <es.transport.tcp.compress>${env.ES_TEST_COMPRESS}</es.transport.tcp.compress>
                         <es.index.store.compress.stored>${env.ES_TEST_COMPRESS}</es.index.store.compress.stored>
-                        <es.action.wait_on_mapping_change>${env.ES_WAIT_ON_MAPPING_CHANGE}</es.action.wait_on_mapping_change>
+                        <es.action.wait_on_mapping_change>${env.ES_WAIT_ON_MAPPING_CHANGE}
+                        </es.action.wait_on_mapping_change>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>