Binding Development - Dependency Resolution Error After Upgrade

I co-author the omnilink binding. The build was working fine when I was building against OpenHAB 2.2. I recently decided to migrate to 2.3 and was in the process of recompiling the binding against the latest OpenHAB code. I pulled down the latest add-on repository from github and now I appear to have an issue resolving any dependencies referenced in META-INF/MANIFEST.INF

For example, the first import-package is:

 org.eclipse.jdt.annotation;resolution:=optional,

This gives the following error during a mvn clean:

Missing requirement: org.openhab.binding.omnilink 2.4.0.qualifier requires 'package org.eclipse.jdt.annotation 0.0.0' but it could not be found

If I remove that import, then the next one just fails.
If I create a new binding using the skeleton script, that appears to work just fine.

I haven’t been able to make any headway with this, would appreciate any suggestions.
Here is my entire MANIFEST.INF:

Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Omnilink Binding
Bundle-SymbolicName: org.openhab.binding.omnilink;singleton:=true
Bundle-Vendor: openHAB
Bundle-Version: 2.4.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .,
 lib/guava-18.0.jar,
 lib/gson-2.8.2.jar,
 lib/jomnilink-1.2.0-SNAPSHOT.jar,
 lib/guava-retrying-2.0.0.jar
Import-Package:
 org.eclipse.jdt.annotation;resolution:=optional,
 org.eclipse.smarthome.config.core,
 org.eclipse.smarthome.core.library.types,
 org.eclipse.smarthome.core.thing,
 org.eclipse.smarthome.core.thing.binding,
 org.eclipse.smarthome.core.thing.binding.builder,
 org.eclipse.smarthome.core.thing.type,
 org.eclipse.smarthome.core.types,
 org.eclipse.smarthome.core.util,
 org.slf4j
Service-Component: OSGI-INF/*.xml
Export-Package: org.openhab.binding.omnilink