Author: borges Date: 2011-08-03 06:18:10 -0400 (Wed, 03 Aug 2011) New Revision: 11099 Modified: branches/HORNETQ-720_Replication/ branches/HORNETQ-720_Replication/README branches/HORNETQ-720_Replication/hornetq-core/pom.xml Log: merge from trunk Property changes on: branches/HORNETQ-720_Replication ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:10878-11095 + /trunk:10878-11098 Modified: branches/HORNETQ-720_Replication/README =================================================================== --- branches/HORNETQ-720_Replication/README 2011-08-03 10:06:47 UTC (rev 11098) +++ branches/HORNETQ-720_Replication/README 2011-08-03 10:18:10 UTC (rev 11099) @@ -44,6 +44,6 @@ ** Install the m2Eclipse plugin, and use it to import the root project. Each sub-project will be imported automatically. -The M2Eclipse plugin has some limitations, after importing the projects -you should use "Maven / Update project configuration" to fix up the -projects. If necessary consult the M2Eclipse plugin FAQ. +The M2Eclipse plugin only works correctly with javacc Maven rules in +Eclipse 3.7. In Eclipse 3.6 after importing the projects you should use +"Maven / Update project configuration" to fix up the projects. Modified: branches/HORNETQ-720_Replication/hornetq-core/pom.xml =================================================================== --- branches/HORNETQ-720_Replication/hornetq-core/pom.xml 2011-08-03 10:06:47 UTC (rev 11098) +++ branches/HORNETQ-720_Replication/hornetq-core/pom.xml 2011-08-03 10:18:10 UTC (rev 11099) @@ -88,36 +88,6 @@ </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>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <versionRange>[2.6,)</versionRange> - <goals> - <goal>javacc</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project>