diff --git a/pom.xml b/pom.xml
index 3688725..c978d1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,14 @@
       <dependency>
         <groupId>io.dropwizard</groupId>
         <artifactId>dropwizard-bom</artifactId>
-        <version>${project.version}</version>
+        <version>2.1.12</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.dropwizard</groupId>
+        <artifactId>dropwizard-dependencies</artifactId>
+        <version>2.1.12</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -71,6 +78,18 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>5.10.1</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.test-framework.providers</groupId>
       <artifactId>jersey-test-framework-provider-inmemory</artifactId>
@@ -119,7 +138,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.19.1</version>
+          <version>3.2.5</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -134,7 +153,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.6.0</version>
+          <version>3.13.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -149,7 +168,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>2.4.3</version>
+          <version>3.6.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -216,6 +235,7 @@
                 <exclude>META-INF/*.SF</exclude>
                 <exclude>META-INF/*.DSA</exclude>
                 <exclude>META-INF/*.RSA</exclude>
+                <exclude>module-info.class</exclude>
               </excludes>
             </filter>
           </filters>
@@ -239,8 +259,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-                <source>1.6</source>
-                <target>1.6</target>
+                <release>11</release>
             </configuration>
         </plugin>
     </plugins>
diff --git a/src/main/java/com/dropwizard/employee/EmployeeConfiguration.java b/src/main/java/com/dropwizard/employee/EmployeeConfiguration.java
index 9a8e28f..f16b57d 100644
--- a/src/main/java/com/dropwizard/employee/EmployeeConfiguration.java
+++ b/src/main/java/com/dropwizard/employee/EmployeeConfiguration.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.Configuration;
 import io.dropwizard.db.DataSourceFactory;
-import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.NotEmpty;
 import com.dropwizard.employee.core.Template;
 
 import javax.validation.Valid;
diff --git a/src/main/java/com/dropwizard/employee/db/EmployeeDAO.java b/src/main/java/com/dropwizard/employee/db/EmployeeDAO.java
index 203bdc2..8695ca5 100644
--- a/src/main/java/com/dropwizard/employee/db/EmployeeDAO.java
+++ b/src/main/java/com/dropwizard/employee/db/EmployeeDAO.java
@@ -21,7 +21,8 @@ public Employee create(Employee person)  {
         return persist(person);
     }
 
+    @SuppressWarnings("unchecked")
     public List<Employee> findAll() {
-        return list(namedQuery("com.dropwizard.employee.core.Employee.findAll"));
+        return list((org.hibernate.query.Query<Employee>) namedQuery("com.dropwizard.employee.core.Employee.findAll"));
     }
 }