Updates needed to get artemis to be loaded into m2e.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/86f705b5 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/86f705b5 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/86f705b5 Branch: refs/heads/master Commit: 86f705b5c575950fef62710adb2357a44cfca2ff Parents: b19db27 Author: Daniel Kulp <[email protected]> Authored: Mon Jun 8 13:55:00 2015 -0400 Committer: Daniel Kulp <[email protected]> Committed: Mon Jun 8 14:27:41 2015 -0400 ---------------------------------------------------------------------- artemis-dto/pom.xml | 29 +++++++++++++++++++++++ artemis-maven-plugin/pom.xml | 42 ++++++++++++++++++++++----------- artemis-selector/pom.xml | 49 ++++++++++++++++++++++++++++++++++++++- pom.xml | 29 ++++++++++++++--------- 4 files changed, 124 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/86f705b5/artemis-dto/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml index 139d00e..f62bcf9 100644 --- a/artemis-dto/pom.xml +++ b/artemis-dto/pom.xml @@ -105,6 +105,35 @@ </dependencies> </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.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <versionRange>[1.7,)</versionRange> + <goals> + <goal>run</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> <profiles> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/86f705b5/artemis-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-maven-plugin/pom.xml b/artemis-maven-plugin/pom.xml index c6994f1..40deaa5 100644 --- a/artemis-maven-plugin/pom.xml +++ b/artemis-maven-plugin/pom.xml @@ -59,18 +59,34 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.0</version> - <configuration> - <showWarnings>true</showWarnings> - <source>1.6</source> - <target>1.6</target> - </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>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <versionRange>[3.3,)</versionRange> + <goals> + <goal>descriptor</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> - </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/86f705b5/artemis-selector/pom.xml ---------------------------------------------------------------------- diff --git a/artemis-selector/pom.xml b/artemis-selector/pom.xml index bea1cc1..d9270f7 100644 --- a/artemis-selector/pom.xml +++ b/artemis-selector/pom.xml @@ -36,7 +36,7 @@ <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> - <version>2.6.0</version> + <version>2.7.2</version> <optional>true</optional> </dependency> @@ -68,7 +68,54 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>${basedir}/target/generated-sources/javacc</source> + </sources> + </configuration> + </execution> + </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> + <execute></execute> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/86f705b5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d5d1824..4207ef2 100644 --- a/pom.xml +++ b/pom.xml @@ -97,6 +97,8 @@ <skipLicenseCheck>true</skipLicenseCheck> <skipStyleCheck>true</skipStyleCheck> <geronimo.jms.2.spec.version>1.0-alpha-1</geronimo.jms.2.spec.version> + + <javac-compiler-id>javac-with-errorprone</javac-compiler-id> </properties> <scm> @@ -443,6 +445,17 @@ </dependencyManagement> <profiles> + <profile> + <id>M2E</id> + <activation> + <property> + <name>m2e.version</name> + </property> + </activation> + <properties> + <javac-compiler-id>javac</javac-compiler-id> + </properties> + </profile> <profile> <id>dev</id> <modules> @@ -661,11 +674,14 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.2</version> <!-- Enable Google's Error-Prone https://github.com/google/error-prone --> <configuration> - <compilerId>javac-with-errorprone</compilerId> + <showWarnings>true</showWarnings> + <source>1.7</source> + <target>1.7</target> <forceJavacCompilerUse>true</forceJavacCompilerUse> + <compilerId>${javac-compiler-id}</compilerId> <compilerArgs> <arg>-Xep:NonAtomicVolatileUpdate:ERROR</arg> <arg>-Xep:SynchronizeOnNonFinalField:ERROR</arg> @@ -838,15 +854,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <showWarnings>true</showWarnings> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <additionalparam>-Xdoclint:none</additionalparam>
