diff --git a/pom.xml b/pom.xml
index 00acceae..87bf83f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,19 +111,11 @@
   </properties>
 
   <dependencies>
-    <!-- till https://github.com/checkstyle/sonar-checkstyle/issues/40 -->
     <dependency>
-      <groupId>org.sonarsource.java</groupId>
-      <artifactId>sonar-java-plugin</artifactId>
-      <version>${sonar-java.version}</version>
+      <groupId>com.fasterxml.staxmate</groupId>
+      <artifactId>staxmate</artifactId>
+      <version>2.4.0</version>
       <scope>provided</scope>
-      <!-- to avoid 4.5.1 api pickup -->
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.sonar</groupId>
-          <artifactId>sonar-plugin-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- required to load external descriptiona, see CheckstyleRulesDefinition -->
     <dependency>
diff --git a/src/main/java/org/sonar/plugins/checkstyle/CheckstyleSensor.java b/src/main/java/org/sonar/plugins/checkstyle/CheckstyleSensor.java
index 44a899ab..55163c4c 100644
--- a/src/main/java/org/sonar/plugins/checkstyle/CheckstyleSensor.java
+++ b/src/main/java/org/sonar/plugins/checkstyle/CheckstyleSensor.java
@@ -22,7 +22,6 @@
 import org.sonar.api.batch.sensor.Sensor;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.plugins.java.Java;
 
 public class CheckstyleSensor implements Sensor {
 
@@ -34,7 +33,7 @@ public CheckstyleSensor(CheckstyleExecutor executor) {
 
     @Override
     public void describe(SensorDescriptor descriptor) {
-        descriptor.onlyOnLanguage(Java.KEY).name("CheckstyleSensor");
+        descriptor.onlyOnLanguage("java").name("CheckstyleSensor");
     }
 
     @Override
diff --git a/src/test/java/org/sonar/plugins/checkstyle/CheckstyleSensorTest.java b/src/test/java/org/sonar/plugins/checkstyle/CheckstyleSensorTest.java
index dae06332..af2b5888 100644
--- a/src/test/java/org/sonar/plugins/checkstyle/CheckstyleSensorTest.java
+++ b/src/test/java/org/sonar/plugins/checkstyle/CheckstyleSensorTest.java
@@ -27,7 +27,6 @@
 import org.junit.Test;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor;
-import org.sonar.plugins.java.Java;
 
 public class CheckstyleSensorTest {
 
@@ -37,7 +36,7 @@ public void shouldDescribePluginCorrectly() {
         final CheckstyleSensor sensor = new CheckstyleSensor(null);
 
         sensor.describe(descriptor);
-        assertThat(descriptor.languages()).containsOnly(Java.KEY);
+        assertThat(descriptor.languages()).containsOnly("java");
         assertThat(descriptor.name()).isNotEmpty();
     }