diff --git a/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java b/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java
index 8124cb5..78f7aff 100644
--- a/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java
+++ b/plugin-2.1/src/test/java/org/jvnet/mjiip/v_2_1/JAXBGenerateTest.java
@@ -23,6 +23,7 @@ import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.MavenProjectHelper;
 
 public abstract class JAXBGenerateTest extends AbstractMojoTestCase {
 
@@ -36,7 +37,7 @@ public abstract class JAXBGenerateTest extends AbstractMojoTestCase {
 		super.setUp();
 
 		mavenProjectBuilder = (MavenProjectBuilder) getContainer().lookup(
-				MavenProjectBuilder.ROLE);
+				MavenProjectHelper.ROLE);
 	}
 
 	protected static File getBaseDir() {
diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml
index ec44704..00898f0 100644
--- a/plugin-core/pom.xml
+++ b/plugin-core/pom.xml
@@ -32,6 +32,10 @@
 			<artifactId>txw2</artifactId>
 		</dependency>
 		<!-- Maven plugin and api classes -->
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-compat</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-plugin-api</artifactId>
@@ -46,7 +50,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-project</artifactId>
+			<artifactId>maven-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java
index 2d97d08..925914e 100644
--- a/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java
+++ b/plugin-core/src/main/java/org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java
@@ -1322,7 +1322,7 @@ public abstract class AbstractXJC2Mojo<O> extends AbstractMojo implements
 			@SuppressWarnings("unchecked")
 			final Set<Artifact> artifacts = MavenMetadataSource
 					.createArtifacts(getArtifactFactory(),
-							Arrays.<Dependency>asList(dependencyResource),
+							Arrays.<Dependency>asList((Dependency) dependencyResource),
 							Artifact.SCOPE_RUNTIME, null, getProject());
 
 			if (artifacts.size() != 1) {
diff --git a/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java b/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java
index 35cd0ff..da75800 100644
--- a/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java
+++ b/plugin/src/test/java/org/jvnet/jaxb2/maven2/JAXBGenerateTest.java
@@ -23,6 +23,7 @@ import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.MavenProjectHelper;
 import org.jvnet.mjiip.v_2.XJC2Mojo;
 
 public abstract class JAXBGenerateTest extends AbstractMojoTestCase {
@@ -37,7 +38,7 @@ public abstract class JAXBGenerateTest extends AbstractMojoTestCase {
 		super.setUp();
 
 		mavenProjectBuilder = (MavenProjectBuilder) getContainer().lookup(
-				MavenProjectBuilder.ROLE);
+				MavenProjectHelper.ROLE);
 	}
 
 	protected static File getBaseDir() {
diff --git a/pom.xml b/pom.xml
index 53d5dac..7070059 100644
--- a/pom.xml
+++ b/pom.xml
@@ -341,7 +341,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven</groupId>
-				<artifactId>maven-project</artifactId>
+				<artifactId>maven-compat</artifactId>
 				<version>${maven.version}</version>
 			</dependency>
 			<dependency>
-- 
2.33.0