diff --git a/pom.xml b/pom.xml
index 9de12b4d..f7cb798a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,15 +232,8 @@
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>org.eclipse.sisu</groupId>
-            <artifactId>org.eclipse.sisu.inject</artifactId>
-            <version>0.9.0.M3</version>
-          </dependency>
-        </dependencies>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/src/it/projects/cmd-property-substituion/invoker.properties b/src/it/projects/cmd-property-substituion/invoker.properties
index 98eeef73..c92d3a12 100644
--- a/src/it/projects/cmd-property-substituion/invoker.properties
+++ b/src/it/projects/cmd-property-substituion/invoker.properties
@@ -1,4 +1,4 @@
 #does not work for some reason of invoker
 #invoker.mavenOpts = -Dcmd.test.property=MagicValue42
-invoker.systemPropertiesFile = invoker.properties
+invoker.userPropertiesFile = invoker.properties
 cmd.test.property = MagicValue42
\ No newline at end of file
diff --git a/src/main/java/org/codehaus/mojo/flatten/extendedinterpolation/ExtendedStringSearchModelInterpolator.java b/src/main/java/org/codehaus/mojo/flatten/extendedinterpolation/ExtendedStringSearchModelInterpolator.java
index f733759a..ba799c6a 100644
--- a/src/main/java/org/codehaus/mojo/flatten/extendedinterpolation/ExtendedStringSearchModelInterpolator.java
+++ b/src/main/java/org/codehaus/mojo/flatten/extendedinterpolation/ExtendedStringSearchModelInterpolator.java
@@ -11,11 +11,11 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.building.ModelBuildingRequest;
 import org.apache.maven.model.building.ModelProblemCollector;
-import org.apache.maven.model.interpolation.StringSearchModelInterpolator;
+import org.apache.maven.model.interpolation.StringVisitorModelInterpolator;
 import org.codehaus.plexus.interpolation.ValueSource;
 
 @Named
-public class ExtendedStringSearchModelInterpolator extends StringSearchModelInterpolator
+public class ExtendedStringSearchModelInterpolator extends StringVisitorModelInterpolator
         implements ExtendedModelInterpolator {
 
     private static final List<String> NOT_INTERPOLATABLES = Stream.of(