Help building against AEM 6.1 beta (601_Load_19)

Hi,

I have been asked to build our AEM 6.0 commerce integration against the latest 6.1 beta code (601_Load_19), but I am having some trouble with it and was wondering if anyone could help me with some settings?

The error that I am getting when I try to build our plugins is:

Failed to execute goal org.apache.felix:maven-scr-plugin:1.17.0:scr (generate-scr-scrdescriptor) on project agilitypim.core: Execution generate-scr-scrdescriptor of goal org.apache.felix:maven-scr-plugin:1.17.0:scr failed: An API incompatibility was encountered while executing org.apache.felix:maven-scr-plugin:1.17.0:scr: java.lang.VerifyError: Constructor must call super() or this() before return
[ERROR] Exception Details:
[ERROR] Location:
[ERROR] com/adobe/cq/commerce/pim/common/AbstractImporter.<init>()V @1: return
[ERROR] Reason:
[ERROR] Error exists in the bytecode
[ERROR] Bytecode:
[ERROR] 0000000: 2ab1

I have updated my aem-api dependency to:

<dependency>
            <groupId>com.adobe.aem</groupId>
            <artifactId>aem-api</artifactId>
            <version>6.1.0-beta3</version>
 </dependency>

Was this the correct thing to do?  If I leave out the version tag, we get the 6.0.0.1 version of the aem-api which doesn't work with the 6.1 beta of AEM that we have - some of the commerce APIs are out of date.

Do I need to add extra code to the classes that are derived from AbstractImporter or is it that AbstractImporter is no longer using the inheritance feature of SCR, so I need to change my classes accordingly?  Or something else entirely?

Thanks,

Dan Tate