From 8278b03b66689243957cc5aa09562c694a12ab0a Mon Sep 17 00:00:00 2001 From: Juan Hernandez <juan.hernandez@redhat.com> Date: Mon, 20 Feb 2012 20:17:17 +0100 Subject: [PATCH 3/3] Adapt for Maven 3 --- plugin-core/pom.xml | 4 ++++ .../org/jvnet/jaxb2/maven2/AbstractXJC2Mojo.java | 2 +- pom.xml | 5 +++++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/plugin-core/pom.xml b/plugin-core/pom.xml index 98664cd..f7def2f 100644 --- a/plugin-core/pom.xml +++ b/plugin-core/pom.xml @@ -19,6 +19,10 @@ <!-- 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> </dependency> <dependency> 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 7dfeae6..695630f 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 @@ -926,7 +926,7 @@ public abstract class AbstractXJC2Mojo<O> extends AbstractMojo implements @SuppressWarnings("unchecked") final Set<Artifact> artifacts = MavenMetadataSource .createArtifacts(getArtifactFactory(), - Arrays.asList(dependencyResource), + Arrays.asList((Dependency) dependencyResource), Artifact.SCOPE_RUNTIME, null, getProject()); if (artifacts.size() != 1) { diff --git a/pom.xml b/pom.xml index d64f0e7..eb6e873 100644 --- a/pom.xml +++ b/pom.xml @@ -146,6 +146,11 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>${maven.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>${maven.version}</version> </dependency> -- 1.7.9