diff --git a/README.md b/README.md
index e4944b6..b6e543e 100644
--- a/README.md
+++ b/README.md
@@ -247,7 +247,8 @@ For snapshots, add the following to your pom.xml file:
 ## Building
 
     mvn clean package  
-    mvn javadoc:javadoc  
+    mvn javadoc:javadoc
+    mvn com.spotify.fmt:fmt-maven-plugin:format
 
 ### Dependency Updates
 
diff --git a/pom.xml b/pom.xml
index f730d03..684adcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,22 +189,22 @@
 				<extensions>true</extensions>
 			</plugin>
 			<!--for Java code formatting -->
-			<plugin>
-				<groupId>com.coveo</groupId>
-				<artifactId>fmt-maven-plugin</artifactId>
-				<version>2.13</version>
-				<configuration>
-					<filesNamePattern>.*\.java</filesNamePattern>
-					<skip>false</skip>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>format</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+            <plugin>
+                <groupId>com.spotify.fmt</groupId>
+                <artifactId>fmt-maven-plugin</artifactId>
+                <version>2.23</version>
+                <configuration>
+                    <filesNamePattern>.*\.java</filesNamePattern>
+                    <skip>false</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <!--              <goal>format</goal>-->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 		</plugins>
 	</build>
 
diff --git a/src/main/java/org/knowm/sundial/Job.java b/src/main/java/org/knowm/sundial/Job.java
index 57417ac..71e4383 100644
--- a/src/main/java/org/knowm/sundial/Job.java
+++ b/src/main/java/org/knowm/sundial/Job.java
@@ -8,7 +8,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/** @author timmolter */
+/**
+ * @author timmolter
+ */
 public abstract class Job extends JobContainer implements InterruptableJob {
 
   private final Logger logger = LoggerFactory.getLogger(Job.class);
diff --git a/src/main/java/org/knowm/sundial/SundialJobScheduler.java b/src/main/java/org/knowm/sundial/SundialJobScheduler.java
index 7082fff..6ba7a50 100644
--- a/src/main/java/org/knowm/sundial/SundialJobScheduler.java
+++ b/src/main/java/org/knowm/sundial/SundialJobScheduler.java
@@ -167,13 +167,17 @@ public static boolean getGlobalLock() {
     return globalLock;
   }
 
-  /** @return the ServletContext */
+  /**
+   * @return the ServletContext
+   */
   public static ServletContext getServletContext() {
 
     return servletContext;
   }
 
-  /** @param servletContext the ServletContext to set */
+  /**
+   * @param servletContext the ServletContext to set
+   */
   public static void setServletContext(ServletContext servletContext) {
 
     SundialJobScheduler.servletContext = servletContext;
diff --git a/src/main/java/org/quartz/core/JobExecutionContextImpl.java b/src/main/java/org/quartz/core/JobExecutionContextImpl.java
index 96d57a5..feef626 100644
--- a/src/main/java/org/quartz/core/JobExecutionContextImpl.java
+++ b/src/main/java/org/quartz/core/JobExecutionContextImpl.java
@@ -187,7 +187,9 @@ public long getJobRunTime() {
     return jobRunTime;
   }
 
-  /** @param jobRunTime The jobRunTime to set. */
+  /**
+   * @param jobRunTime The jobRunTime to set.
+   */
   public void setJobRunTime(long jobRunTime) {
 
     this.jobRunTime = jobRunTime;
diff --git a/src/main/java/org/quartz/core/SimpleThreadPool.java b/src/main/java/org/quartz/core/SimpleThreadPool.java
index 35fa2b5..29d5316 100644
--- a/src/main/java/org/quartz/core/SimpleThreadPool.java
+++ b/src/main/java/org/quartz/core/SimpleThreadPool.java
@@ -122,13 +122,17 @@ public String getThreadNamePrefix() {
     return threadNamePrefix;
   }
 
-  /** @return Returns the threadsInheritContextClassLoaderOfInitializingThread. */
+  /**
+   * @return Returns the threadsInheritContextClassLoaderOfInitializingThread.
+   */
   public boolean isThreadsInheritContextClassLoaderOfInitializingThread() {
 
     return inheritLoader;
   }
 
-  /** @param inheritLoader The threadsInheritContextClassLoaderOfInitializingThread to set. */
+  /**
+   * @param inheritLoader The threadsInheritContextClassLoaderOfInitializingThread to set.
+   */
   public void setThreadsInheritContextClassLoaderOfInitializingThread(boolean inheritLoader) {
 
     this.inheritLoader = inheritLoader;
@@ -144,13 +148,17 @@ public void setThreadsInheritGroupOfInitializingThread(boolean inheritGroup) {
     this.inheritGroup = inheritGroup;
   }
 
-  /** @return Returns the value of makeThreadsDaemons. */
+  /**
+   * @return Returns the value of makeThreadsDaemons.
+   */
   public boolean isMakeThreadsDaemons() {
 
     return makeThreadsDaemons;
   }
 
-  /** @param makeThreadsDaemons The value of makeThreadsDaemons to set. */
+  /**
+   * @param makeThreadsDaemons The value of makeThreadsDaemons to set.
+   */
   public void setMakeThreadsDaemons(boolean makeThreadsDaemons) {
 
     this.makeThreadsDaemons = makeThreadsDaemons;
diff --git a/src/main/java/org/quartz/core/TriggerFiredBundle.java b/src/main/java/org/quartz/core/TriggerFiredBundle.java
index f112857..affb1ac 100644
--- a/src/main/java/org/quartz/core/TriggerFiredBundle.java
+++ b/src/main/java/org/quartz/core/TriggerFiredBundle.java
@@ -84,25 +84,33 @@ public boolean isRecovering() {
     return jobIsRecovering;
   }
 
-  /** @return Returns the fireTime. */
+  /**
+   * @return Returns the fireTime.
+   */
   public Date getFireTime() {
 
     return fireTime;
   }
 
-  /** @return Returns the nextFireTime. */
+  /**
+   * @return Returns the nextFireTime.
+   */
   public Date getNextFireTime() {
 
     return nextFireTime;
   }
 
-  /** @return Returns the prevFireTime. */
+  /**
+   * @return Returns the prevFireTime.
+   */
   public Date getPrevFireTime() {
 
     return prevFireTime;
   }
 
-  /** @return Returns the scheduledFireTime. */
+  /**
+   * @return Returns the scheduledFireTime.
+   */
   public Date getScheduledFireTime() {
 
     return scheduledFireTime;
diff --git a/src/main/java/org/quartz/core/TriggerFiredResult.java b/src/main/java/org/quartz/core/TriggerFiredResult.java
index 152c92a..facc6e8 100644
--- a/src/main/java/org/quartz/core/TriggerFiredResult.java
+++ b/src/main/java/org/quartz/core/TriggerFiredResult.java
@@ -1,6 +1,8 @@
 package org.quartz.core;
 
-/** @author lorban */
+/**
+ * @author lorban
+ */
 public class TriggerFiredResult {
 
   private TriggerFiredBundle triggerFiredBundle;
diff --git a/src/main/java/org/quartz/plugins/xml/XMLSchedulingDataProcessor.java b/src/main/java/org/quartz/plugins/xml/XMLSchedulingDataProcessor.java
index a1f4518..500a6cc 100644
--- a/src/main/java/org/quartz/plugins/xml/XMLSchedulingDataProcessor.java
+++ b/src/main/java/org/quartz/plugins/xml/XMLSchedulingDataProcessor.java
@@ -235,8 +235,14 @@ public void processFile(String fileName, boolean failOnFileNotFound) throws Exce
    * @param systemId system ID.
    */
   private void processFile(String fileName)
-      throws ValidationException, ParserConfigurationException, SAXException, IOException,
-          SchedulerException, ClassNotFoundException, ParseException, XPathException {
+      throws ValidationException,
+          ParserConfigurationException,
+          SAXException,
+          IOException,
+          SchedulerException,
+          ClassNotFoundException,
+          ParseException,
+          XPathException {
 
     prepForProcessing();
 
diff --git a/src/main/java/org/quartz/triggers/CronExpression.java b/src/main/java/org/quartz/triggers/CronExpression.java
index e7332ad..e13d7da 100644
--- a/src/main/java/org/quartz/triggers/CronExpression.java
+++ b/src/main/java/org/quartz/triggers/CronExpression.java
@@ -893,14 +893,16 @@ protected String getExpressionSetSummary(java.util.ArrayList<Integer> list) {
   }
 
   protected int skipWhiteSpace(int i, String s) {
-    for (; i < s.length() && (s.charAt(i) == ' ' || s.charAt(i) == '\t'); i++) {;
+    for (; i < s.length() && (s.charAt(i) == ' ' || s.charAt(i) == '\t'); i++) {
+      ;
     }
 
     return i;
   }
 
   protected int findNextWhiteSpace(int i, String s) {
-    for (; i < s.length() && (s.charAt(i) != ' ' || s.charAt(i) != '\t'); i++) {;
+    for (; i < s.length() && (s.charAt(i) != ' ' || s.charAt(i) != '\t'); i++) {
+      ;
     }
 
     return i;
diff --git a/src/test/java/org/knowm/sundial/AnnotatedClassFinderTest.java b/src/test/java/org/knowm/sundial/AnnotatedClassFinderTest.java
index c963340..e2eba3e 100644
--- a/src/test/java/org/knowm/sundial/AnnotatedClassFinderTest.java
+++ b/src/test/java/org/knowm/sundial/AnnotatedClassFinderTest.java
@@ -10,7 +10,9 @@
 import org.junit.Test;
 import org.quartz.classloading.CascadingClassLoadHelper;
 
-/** @author timmolter */
+/**
+ * @author timmolter
+ */
 public class AnnotatedClassFinderTest {
 
   private static final Set<String> EXPECTED_JOBS =
diff --git a/src/test/java/org/knowm/sundial/examples/SampleRun.java b/src/test/java/org/knowm/sundial/examples/SampleRun.java
index 121cadd..d0a8c38 100644
--- a/src/test/java/org/knowm/sundial/examples/SampleRun.java
+++ b/src/test/java/org/knowm/sundial/examples/SampleRun.java
@@ -3,7 +3,9 @@
 import java.util.concurrent.TimeUnit;
 import org.knowm.sundial.SundialJobScheduler;
 
-/** @author timmolter */
+/**
+ * @author timmolter
+ */
 public class SampleRun {
 
   /** Make sure jobs.xml is on the classpath! */
diff --git a/src/test/java/org/knowm/sundial/examples/SingleRun.java b/src/test/java/org/knowm/sundial/examples/SingleRun.java
index c248e33..c203986 100644
--- a/src/test/java/org/knowm/sundial/examples/SingleRun.java
+++ b/src/test/java/org/knowm/sundial/examples/SingleRun.java
@@ -2,7 +2,9 @@
 
 import org.knowm.sundial.SundialJobScheduler;
 
-/** @author timmolter */
+/**
+ * @author timmolter
+ */
 public class SingleRun {
 
   public static void main(String[] args) {
diff --git a/src/test/java/org/knowm/sundial/xml/TextXMLParser.java b/src/test/java/org/knowm/sundial/xml/TextXMLParser.java
index 6abdf18..01465af 100644
--- a/src/test/java/org/knowm/sundial/xml/TextXMLParser.java
+++ b/src/test/java/org/knowm/sundial/xml/TextXMLParser.java
@@ -5,7 +5,9 @@
 import org.quartz.classloading.ClassLoadHelper;
 import org.quartz.plugins.xml.XMLSchedulingDataProcessor;
 
-/** @author timmolter */
+/**
+ * @author timmolter
+ */
 public class TextXMLParser {
 
   @Test