DRILL-445: Enable FMPP maven plugin execution with eclipse
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/1e25c0d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/1e25c0d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/1e25c0d2 Branch: refs/heads/master Commit: 1e25c0d287b8ca55d7ae3242b638659c68d115da Parents: 741aab0 Author: Aditya Kishore <[email protected]> Authored: Tue Mar 25 01:11:01 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Wed Mar 26 23:28:05 2014 -0700 ---------------------------------------------------------------------- exec/java-exec/pom.xml | 53 ++++++++++++++++++++++++++++++++++++++++++++- pom.xml | 14 ------------ 2 files changed, 52 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/1e25c0d2/exec/java-exec/pom.xml ---------------------------------------------------------------------- diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index 4f7cc0d..310c790 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -335,7 +335,7 @@ </configuration> <executions> <execution> - <id>generate-sources</id> + <id>generate-fmpp-sources</id> <phase>validate</phase> <goals> <goal>generate</goal> @@ -344,6 +344,25 @@ </executions> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.5</version> + <executions> + <execution> + <id>add-fmpp-sources</id> + <phase>validate</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>${project.build.directory}/generated-sources</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>2.1</version> @@ -381,6 +400,38 @@ </plugin> </plugins> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>com.googlecode.fmpp-maven-plugin</groupId> + <artifactId>fmpp-maven-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>generate</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute > + <runOnIncremental>false</runOnIncremental> + <runOnConfiguration>true</runOnConfiguration> + </execute > + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/1e25c0d2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index df1026b..76523bf 100644 --- a/pom.xml +++ b/pom.xml @@ -295,20 +295,6 @@ </pluginExecution> <pluginExecution> <pluginExecutionFilter> - <groupId>com.googlecode.fmpp-maven-plugin</groupId> - <artifactId>fmpp-maven-plugin</artifactId> - <versionRange>[1.0,)</versionRange> - <goals> - <goal>run</goal> - <goal>generate</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <versionRange>[1.2,)</versionRange>
