diff --git a/pom.xml b/pom.xml
index b7035db..f352a49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,21 +24,20 @@ See the Apache License Version 2.0 for the specific language governing permissio
   <version>0.0.8-SNAPSHOT</version>
   
   <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-component-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>3.4.2</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <version>2.1.1</version>
-      <scope>provided</scope>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.36</version>
     </dependency>
   </dependencies>
 
@@ -51,16 +50,18 @@ See the Apache License Version 2.0 for the specific language governing permissio
     </resources>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <version>1.3.8</version>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+        <version>0.3.5</version>
         <executions>
-          <execution>
-            <goals>
-              <goal>descriptor</goal>
-            </goals>
-          </execution>
-        </executions>
+            <execution>
+              <id>index-project</id>
+              <goals>
+                <goal>main-index</goal>
+                <goal>test-index</goal>
+              </goals>
+            </execution>
+          </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java b/src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java
index 6441fb7..93a5e52 100644
--- a/src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java
+++ b/src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java
@@ -13,16 +13,19 @@
 
 package org.sonatype.plexus.build.incremental;
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
 
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.Scanner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Filesystem based non-incremental build context implementation which behaves as if all files
@@ -34,9 +37,11 @@
  * isIncremental returns false
  * getValue always returns null
  */
-@Component( role = BuildContext.class, hint = "default")
-public class DefaultBuildContext extends AbstractLogEnabled implements BuildContext {
+@Named("default")
+@Singleton
+public class DefaultBuildContext implements BuildContext {
 
+  private final Logger logger = LoggerFactory.getLogger(DefaultBuildContext.class);
   /** {@inheritDoc} */
   public boolean hasDelta(String relpath) {
     return true;
@@ -125,10 +130,10 @@ public void addWarning(File file, int line, int column, String message, Throwabl
   public void addMessage(File file, int line, int column, String message, int severity, Throwable cause) {
     switch(severity) {
       case BuildContext.SEVERITY_ERROR:
-        getLogger().error(getMessage(file, line, column, message), cause);
+        logger.error(getMessage(file, line, column, message), cause);
         return;
       case BuildContext.SEVERITY_WARNING:
-        getLogger().warn(getMessage(file, line, column, message), cause);
+        logger.warn(getMessage(file, line, column, message), cause);
         return;
     }
     throw new IllegalArgumentException("severity=" + severity);