diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e253936..1c69a284 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         maven: [ '3.8.8', '3.9.9' ]
-        java: [ '11', '17' ]
+        java: [ '17', '21' ]
         os: [ 'ubuntu-latest', 'windows-latest' ]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/pom.xml b/pom.xml
index 75ce8079..778218f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.scoverage</groupId>
     <artifactId>scoverage-maven-plugin</artifactId>
-    <version>2.0.7-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <name>SCoverage Maven Plugin</name>
@@ -211,7 +211,11 @@ under the License.
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.13.0</version>
                     <configuration>
-                        <release>11</release>
+                        <release>17</release>
+                        <compilerArgs>
+                            <arg>-Xlint:all</arg>
+                            <arg>-Xlint:-processing</arg>
+                        </compilerArgs>
                     </configuration>
                 </plugin>
 
@@ -272,10 +276,10 @@ under the License.
                         <detectJavaApiLink>false</detectJavaApiLink>
                         <subpackages>org.scoverage.plugin</subpackages>
                         <links>
-                            <link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
-                            <link>https://maven.apache.org/ref/${maven.version}/apidocs/</link>
+                            <link>https://docs.oracle.com/en/java/javase/17/docs/api/</link>
                             <link>https://maven.apache.org/shared-archives/maven-reporting-api-${maven-reporting-api.version}/apidocs/</link>
                             <link>https://maven.apache.org/doxia/components/doxia-archives/doxia-${doxia.version}/apidocs/</link>
+                            <link>https://maven.apache.org/ref/${maven.version}/apidocs/</link>
                         </links>
                         <notimestamp>true</notimestamp>
                     </configuration>
diff --git a/src/main/java/org/scoverage/plugin/SCoveragePreCompileMojo.java b/src/main/java/org/scoverage/plugin/SCoveragePreCompileMojo.java
index 927a287f..05874d5a 100644
--- a/src/main/java/org/scoverage/plugin/SCoveragePreCompileMojo.java
+++ b/src/main/java/org/scoverage/plugin/SCoveragePreCompileMojo.java
@@ -24,6 +24,7 @@
 import java.io.OutputStreamWriter;
 import java.util.*;
 import java.util.stream.Collectors;
+import javax.inject.Inject;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -37,7 +38,6 @@
 import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -171,13 +171,13 @@ public class SCoveragePreCompileMojo
     /**
      * Artifact factory used to look up artifacts in the remote repository.
      */
-    @Component
+    @Inject
     private ArtifactFactory factory;
 
     /**
      * Artifact resolver used to resolve artifacts.
      */
-    @Component
+    @Inject
     private ArtifactResolver resolver;
 
     /**
diff --git a/src/main/java/org/scoverage/plugin/SCoverageReportMojo.java b/src/main/java/org/scoverage/plugin/SCoverageReportMojo.java
index 14120cfb..1978be42 100644
--- a/src/main/java/org/scoverage/plugin/SCoverageReportMojo.java
+++ b/src/main/java/org/scoverage/plugin/SCoverageReportMojo.java
@@ -388,7 +388,7 @@ public void execute()
 
         try
         {
-            RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" );
+            RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html", null );
             SiteRendererSink sink = new SiteRendererSink( context );
             Locale locale = Locale.getDefault();
             generate( sink, locale );
diff --git a/src/main/java/org/scoverage/plugin/ScalaVersion.java b/src/main/java/org/scoverage/plugin/ScalaVersion.java
index 2816a602..6da25d92 100644
--- a/src/main/java/org/scoverage/plugin/ScalaVersion.java
+++ b/src/main/java/org/scoverage/plugin/ScalaVersion.java
@@ -80,7 +80,7 @@ public ScalaVersion(String s) {
         // compute compatible
         compatible =
                 modifier != null ? full : // non-stable versions are not compatible with anything else
-                        isScala2() ? major + "." + minor : // Scala 2.X.Y is compatible with any Scala 2.X.Z
+                        major == 2 ? major + "." + minor : // Scala 2.X.Y is compatible with any Scala 2.X.Z
                                 major + ""; // Scala 3.X is compatible with any Scala 3.Y
     }