fix eclipse import problems started getting import issues. maybe had residual settings covering for me previously.
- add missing m2e "ignore" in platforms/java7/pom.xml - add the same to platforms/android/pom.xml and remove it from the children android/{hardware,topology}/pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/f46dd81a Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/f46dd81a Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/f46dd81a Branch: refs/heads/master Commit: f46dd81a5a72118922dab634f5851d3a314862da Parents: 8ec73fa Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Tue Nov 7 14:16:16 2017 -0500 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Tue Nov 7 14:16:16 2017 -0500 ---------------------------------------------------------------------- platforms/android/android/hardware/pom.xml | 32 ---------------------- platforms/android/android/topology/pom.xml | 32 ---------------------- platforms/android/pom.xml | 32 ++++++++++++++++++++++ platforms/java7/pom.xml | 36 +++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f46dd81a/platforms/android/android/hardware/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/android/android/hardware/pom.xml b/platforms/android/android/hardware/pom.xml index 068dcbb..0da84c6 100644 --- a/platforms/android/android/hardware/pom.xml +++ b/platforms/android/android/hardware/pom.xml @@ -49,36 +49,4 @@ </dependency> </dependencies> - <build> - <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>net.orfjackal.retrolambda</groupId> - <artifactId>retrolambda-maven-plugin</artifactId> - <versionRange>[2.5.1,)</versionRange> - <goals> - <goal>process-main</goal> - <goal>process-test</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f46dd81a/platforms/android/android/topology/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/android/android/topology/pom.xml b/platforms/android/android/topology/pom.xml index b26056b..29b7dd8 100644 --- a/platforms/android/android/topology/pom.xml +++ b/platforms/android/android/topology/pom.xml @@ -54,36 +54,4 @@ </dependency> </dependencies> - <build> - <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>net.orfjackal.retrolambda</groupId> - <artifactId>retrolambda-maven-plugin</artifactId> - <versionRange>[2.5.1,)</versionRange> - <goals> - <goal>process-main</goal> - <goal>process-test</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f46dd81a/platforms/android/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/android/pom.xml b/platforms/android/pom.xml index cd27d7c..07874ab 100644 --- a/platforms/android/pom.xml +++ b/platforms/android/pom.xml @@ -126,6 +126,38 @@ </executions> </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>net.orfjackal.retrolambda</groupId> + <artifactId>retrolambda-maven-plugin</artifactId> + <versionRange>[2.5.1,)</versionRange> + <goals> + <goal>process-main</goal> + <goal>process-test</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore/> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> <!-- Additionally build the binary distribution package. --> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f46dd81a/platforms/java7/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/pom.xml b/platforms/java7/pom.xml index 7a5b717..832b6ad 100644 --- a/platforms/java7/pom.xml +++ b/platforms/java7/pom.xml @@ -116,6 +116,42 @@ </configuration> </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> + net.orfjackal.retrolambda + </groupId> + <artifactId> + retrolambda-maven-plugin + </artifactId> + <versionRange> + [2.5.1,) + </versionRange> + <goals> + <goal>process-main</goal> + <goal>process-test</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> <profiles>