diff --git a/pom.xml b/pom.xml
index 839bed049..804490ad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,9 +178,9 @@
 			</dependency>
 
 			<dependency>
-				<groupId>com.google.code.findbugs</groupId>
-				<artifactId>jsr305</artifactId>
-				<version>3.0.2</version>
+    			<groupId>com.github.spotbugs</groupId>
+    			<artifactId>spotbugs-annotations</artifactId>
+    			<version>4.8.6</version>
 			</dependency>
 
 			<dependency>
@@ -281,8 +281,8 @@
 
 			<dependency>
 				<groupId>org.hamcrest</groupId>
-				<artifactId>hamcrest-all</artifactId>
-				<version>1.3</version>
+				<artifactId>hamcrest</artifactId>
+				<version>2.2</version>
 				<scope>test</scope>
 			</dependency>
 
diff --git a/protege-editor-core/pom.xml b/protege-editor-core/pom.xml
index e2034aea5..417096392 100644
--- a/protege-editor-core/pom.xml
+++ b/protege-editor-core/pom.xml
@@ -77,7 +77,7 @@
 
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/protege-editor-owl/pom.xml b/protege-editor-owl/pom.xml
index 6a94f125e..df5364bda 100644
--- a/protege-editor-owl/pom.xml
+++ b/protege-editor-owl/pom.xml
@@ -176,7 +176,7 @@
 
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/protege-launcher/pom.xml b/protege-launcher/pom.xml
index c1161eb03..7dd236334 100644
--- a/protege-launcher/pom.xml
+++ b/protege-launcher/pom.xml
@@ -57,10 +57,10 @@
 			<artifactId>guava</artifactId>
 		</dependency>
 		
-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>jsr305</artifactId>
-		</dependency>
+<dependency>
+    <groupId>com.github.spotbugs</groupId>
+    <artifactId>spotbugs-annotations</artifactId>
+</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.equinox</groupId>
@@ -100,7 +100,7 @@
 
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>