[CXF-6268] Updates for 3.0.x branch
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7a260861 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7a260861 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7a260861 Branch: refs/heads/3.0.x-fixes Commit: 7a2608611dd2a1702ea161601fd609ff7bab491c Parents: 5f751d7 Author: Daniel Kulp <[email protected]> Authored: Tue Mar 31 14:35:15 2015 -0400 Committer: Daniel Kulp <[email protected]> Committed: Tue Mar 31 14:35:15 2015 -0400 ---------------------------------------------------------------------- maven-plugins/codegen-plugin/pom.xml | 21 +++++--------------- .../cxf/maven_plugin/AbstractCodegenMoho.java | 2 +- parent/pom.xml | 6 ++++++ 3 files changed, 12 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/7a260861/maven-plugins/codegen-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml index 72b5115..d18f04f 100644 --- a/maven-plugins/codegen-plugin/pom.xml +++ b/maven-plugins/codegen-plugin/pom.xml @@ -57,6 +57,11 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-toolchain</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <scope>provided</scope> </dependency> @@ -139,22 +144,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <configuration> - <!-- see http://jira.codehaus.org/browse/MNG-5346 --> - <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> - </configuration> - <executions> - <execution> - <id>mojo-descriptor</id> - <goals> - <goal>descriptor</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-install-plugin</artifactId> <executions> <execution> http://git-wip-us.apache.org/repos/asf/cxf/blob/7a260861/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java ---------------------------------------------------------------------- diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java index c63385b..68cc9d7 100644 --- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java +++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java @@ -230,8 +230,8 @@ public abstract class AbstractCodegenMoho extends AbstractMojo { private ArtifactRepositoryFactory artifactRepositoryFactory; /** * The toolchain manager. + * @component */ - @Component private ToolchainManager toolchainManager; /** http://git-wip-us.apache.org/repos/asf/cxf/blob/7a260861/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 8ea31f5..540bbad 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -757,6 +757,12 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-toolchain</artifactId> + <version>${cxf.maven.core.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>${cxf.maven.core.version}</version> <scope>provided</scope>
