This is an automated email from the ASF dual-hosted git repository. lcwik pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
commit 27454acae3783322f36497e891806d8610ead97e Author: Daniel Kulp <[email protected]> AuthorDate: Fri Jan 26 14:23:20 2018 -0500 Add some m2e lifecycle things to get the various maven plugins running as needed in m2e/eclipse --- model/job-management/pom.xml | 18 +++++++++++ pom.xml | 46 ++++++++++++++++++++++++++++- sdks/java/extensions/sql/pom.xml | 7 ++--- sdks/java/maven-archetypes/examples/pom.xml | 27 +++++++++++++++++ 4 files changed, 93 insertions(+), 5 deletions(-) diff --git a/model/job-management/pom.xml b/model/job-management/pom.xml index 3e5803e..7210e9f 100644 --- a/model/job-management/pom.xml +++ b/model/job-management/pom.xml @@ -77,6 +77,24 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-grpc-source</id> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>${project.build.directory}/generated-sources/protobuf/java/grpc-java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> diff --git a/pom.xml b/pom.xml index 60f88b4..9d083ab 100644 --- a/pom.xml +++ b/pom.xml @@ -190,6 +190,7 @@ <!-- Default skipping --> <rat.skip>true</rat.skip> + </properties> <packaging>pom</packaging> @@ -343,7 +344,7 @@ <dependency> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-compiler-jdt</artifactId> - <version>0.26.0</version> + <version>1.0.0</version> </dependency> </dependencies> </plugin> @@ -1714,6 +1715,36 @@ </pluginExecution> <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> + </execute> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <versionRange>[2.4,)</versionRange> + <goals> + <goal>javacc</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnIncremental>false</runOnIncremental> + </execute> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <versionRange>[2.5,)</versionRange> @@ -1740,6 +1771,19 @@ <ignore /> </action> </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>net.revelc.code.formatter</groupId> + <artifactId>formatter-maven-plugin</artifactId> + <versionRange>[2.0.0,)</versionRange> + <goals> + <goal>format</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> diff --git a/sdks/java/extensions/sql/pom.xml b/sdks/java/extensions/sql/pom.xml index 3c626a4..81d9db9 100644 --- a/sdks/java/extensions/sql/pom.xml +++ b/sdks/java/extensions/sql/pom.xml @@ -166,7 +166,7 @@ </goals> <configuration> <cfgFile>${project.build.directory}/codegen/config.fmpp</cfgFile> - <outputDirectory>target/generated-sources</outputDirectory> + <outputDirectory>${project.build.directory}/generated-sources/fmpp</outputDirectory> <templateDirectory>${project.build.directory}/codegen/templates</templateDirectory> </configuration> </execution> @@ -176,7 +176,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.9</version> <executions> <execution> <id>add-generated-sources</id> @@ -186,7 +185,7 @@ </goals> <configuration> <sources> - <source>${project.build.directory}/generated-sources</source> + <source>${project.build.directory}/generated-sources/java</source> </sources> </configuration> </execution> @@ -211,7 +210,7 @@ </includes> <lookAhead>2</lookAhead> <isStatic>false</isStatic> - <outputDirectory>${project.build.directory}/generated-sources/</outputDirectory> + <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory> </configuration> </execution> </executions> diff --git a/sdks/java/maven-archetypes/examples/pom.xml b/sdks/java/maven-archetypes/examples/pom.xml index a994165..69afe5b 100644 --- a/sdks/java/maven-archetypes/examples/pom.xml +++ b/sdks/java/maven-archetypes/examples/pom.xml @@ -71,6 +71,33 @@ </execution> </executions> </plugin> + <!--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>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <versionRange>[1.5.0,)</versionRange> + <goals> + <goal>exec</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnIncremental>false</runOnIncremental> + </execute> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> </plugins> </pluginManagement> -- To stop receiving notification emails like this one, please contact [email protected].
