diff --git a/poms/pom.xml b/poms/pom.xml
index 93364b8fb2..f9952aca44 100644
--- a/poms/pom.xml
+++ b/poms/pom.xml
@@ -68,6 +68,7 @@
         <license.maven.plugin.version>2.10</license.maven.plugin.version>
         <tycho-version>1.0.0</tycho-version>
         <tycho-groupid>org.eclipse.tycho</tycho-groupid>
+        <jdt-annotations.version>2.1.0</jdt-annotations.version>
     </properties>
 
     <description>This is the open Home Automation Bus (openHAB)</description>
diff --git a/poms/tycho/pom.xml b/poms/tycho/pom.xml
index 9051f67715..62c9261750 100644
--- a/poms/tycho/pom.xml
+++ b/poms/tycho/pom.xml
@@ -96,15 +96,15 @@
                         <target>${maven.compiler.target}</target>
                         <compilerId>jdt</compilerId>
                         <extraClasspathElements>
-                            <extraClasspathElement>
-                                <groupId>com.google.code.findbugs</groupId>
-                                <artifactId>jsr305</artifactId>
-                                <version>3.0.2</version>
-                            </extraClasspathElement>
+                          <extraClasspathElement>
+                            <groupId>org.eclipse.jdt</groupId>
+                            <artifactId>org.eclipse.jdt.annotation</artifactId>
+                            <version>${jdt-annotations.version}</version>
+                          </extraClasspathElement>
                         </extraClasspathElements>
                         <compilerArgs>
-                            <arg>-err:+nullAnnot(javax.annotation.Nullable|javax.annotation.Nonnull|org.eclipse.jdt.annotation.NonNullByDefault),+inheritNullAnnot,-nullUncheckedConversion,-nullAnnotRedundant</arg>
-                            <arg>-warn:+null,+nullUncheckedConversion,+nullAnnotRedundant</arg>
+                            <arg>-err:+nullAnnot(org.eclipse.jdt.annotation.Nullable|org.eclipse.jdt.annotation.NonNull|org.eclipse.jdt.annotation.NonNullByDefault),+inheritNullAnnot</arg>
+                            <arg>-warn:+null,+inheritNullAnnot,+nullAnnotConflict,+nullUncheckedConversion,+nullAnnotRedundant,+nullDereference</arg>
                         </compilerArgs>
  					</configuration>
                 </plugin>
@@ -113,13 +113,6 @@
                     <version>3.6.1</version>
                     <configuration>
                         <compilerId>groovy-eclipse-compiler</compilerId>
-                        <extraClasspathElements>
-                            <extraClasspathElement>
-                                <groupId>com.google.code.findbugs</groupId>
-                                <artifactId>jsr305</artifactId>
-                                <version>3.0.2</version>
-                            </extraClasspathElement>
-                        </extraClasspathElements>
                     </configuration>
                     <executions>
                         <execution>