Update poms to fully load into M2E
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/06bb7a27 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/06bb7a27 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/06bb7a27 Branch: refs/heads/trunk Commit: 06bb7a2716f0cea216381b03f555dd497cb627ef Parents: 433912f Author: Daniel Kulp <[email protected]> Authored: Tue Jul 8 16:50:18 2014 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Thu Jul 10 13:47:55 2014 -0400 ---------------------------------------------------------------------- activemq-client/pom.xml | 52 ++++++++++- activemq-console/pom.xml | 53 ++++++++++++ activemq-kahadb-store/pom.xml | 22 ++++- activemq-karaf-itest/pom.xml | 35 ++++++++ activemq-leveldb-store/pom.xml | 4 +- activemq-osgi/pom.xml | 33 +++++++ activemq-runtime-config/pom.xml | 91 +++++++++++--------- activemq-web-console/pom.xml | 6 ++ .../src/main/webapp/WEB-INF/jspf/old.jspf | 21 ----- 9 files changed, 254 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/06bb7a27/activemq-client/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml index 708def5..1cc2da7 100755 --- a/activemq-client/pom.xml +++ b/activemq-client/pom.xml @@ -231,8 +231,58 @@ </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> + <runOnIncremental>true</runOnIncremental> + </execute> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> <profiles> http://git-wip-us.apache.org/repos/asf/activemq/blob/06bb7a27/activemq-console/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml index 8fff679..d7e5b2e 100644 --- a/activemq-console/pom.xml +++ b/activemq-console/pom.xml @@ -190,8 +190,61 @@ </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/proto</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.fusesource.hawtbuf + </groupId> + <artifactId> + hawtbuf-protoc + </artifactId> + <versionRange>[1.11,)</versionRange> + <goals> + <goal>compile</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute> + <runOnIncremental>true</runOnIncremental> + </execute> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/activemq/blob/06bb7a27/activemq-kahadb-store/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml index bfa7493..0f6309d 100755 --- a/activemq-kahadb-store/pom.xml +++ b/activemq-kahadb-store/pom.xml @@ -164,7 +164,9 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <execute> + <runOnIncremental>true</runOnIncremental> + </execute> </action> </pluginExecution> </pluginExecutions> @@ -215,6 +217,24 @@ </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/proto</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> http://git-wip-us.apache.org/repos/asf/activemq/blob/06bb7a27/activemq-karaf-itest/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml index ef361da..9689592 100644 --- a/activemq-karaf-itest/pom.xml +++ b/activemq-karaf-itest/pom.xml @@ -219,6 +219,41 @@ </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.servicemix.tooling + </groupId> + <artifactId> + depends-maven-plugin + </artifactId> + <versionRange>[1.2,)</versionRange> + <goals> + <goal> + generate-depends-file + </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/blob/06bb7a27/activemq-leveldb-store/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml index bd8d8f4..764f3c4 100644 --- a/activemq-leveldb-store/pom.xml +++ b/activemq-leveldb-store/pom.xml @@ -420,6 +420,7 @@ <configuration> <sources> <source>${basedir}/src/main/scala</source> + <source>${basedir}/target/generated-sources/proto</source> </sources> </configuration> </execution> @@ -459,7 +460,8 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <execute><runOnIncremental>true</runOnIncremental></execute> + <!--<ignore/>--> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/activemq/blob/06bb7a27/activemq-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index 356e2f9..1609b6b 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -308,6 +308,39 @@ </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-dependency-plugin + </artifactId> + <versionRange>[2.8,)</versionRange> + <goals> + <goal>unpack</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/blob/06bb7a27/activemq-runtime-config/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml index 6c1fab4..3d1e305 100755 --- a/activemq-runtime-config/pom.xml +++ b/activemq-runtime-config/pom.xml @@ -100,27 +100,6 @@ <build> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>properties-maven-plugin</artifactId> - <version>1.0-alpha-2</version> - <executions> - <execution> - <phase>initialize</phase> - <goals> - <goal>set-system-properties</goal> - </goals> - <configuration> - <properties> - <property> - <name>javax.xml.accessExternalSchema</name> - <value>file</value> - </property> - </properties> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>${maven-dependency-plugin-version}</version> @@ -168,31 +147,32 @@ </executions> </plugin> <plugin> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <version>${maven-jaxb2-plugin-version}</version> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-xjc-plugin</artifactId> + <version>3.0.1</version> <executions> <execution> <goals> - <goal>generate</goal> + <goal>xsdtojava</goal> </goals> </execution> </executions> <configuration> - <extension>true</extension> - <args> - <arg>-XtoString</arg> - <arg>-XhashCode</arg> - <arg>-Xequals</arg> - <arg>-Xequals-equalsStrategyClass=org.apache.activemq.plugin.jaxb2_commons.ElementAwareEqualsStrategy</arg> - </args> - <plugins> - <plugin> - <groupId>org.jvnet.jaxb2_commons</groupId> - <artifactId>jaxb2-basics</artifactId> - <version>${jaxb-basics-version}</version> - </plugin> - </plugins> + <extensions> + <extension>org.jvnet.jaxb2_commons:jaxb2-basics:${jaxb-basics-version}</extension> + </extensions> + <xsdOptions> + <xsdOption> + <xsd>${basedir}/src/main/resources/activemq.xsd</xsd> + <bindingFile>${basedir}/src/main/resources/binding.xjb</bindingFile> + <extensionArgs> + <extensionArgs>-XtoString</extensionArgs> + <extensionArgs>-XhashCode</extensionArgs> + <extensionArgs>-Xequals</extensionArgs> + <extensionArgs>-Xequals-equalsStrategyClass=org.apache.activemq.plugin.jaxb2_commons.ElementAwareEqualsStrategy</extensionArgs> + </extensionArgs> + </xsdOption> + </xsdOptions> </configuration> </plugin> <plugin> @@ -218,6 +198,39 @@ </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-dependency-plugin + </artifactId> + <versionRange>[2.8,)</versionRange> + <goals> + <goal>unpack</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/blob/06bb7a27/activemq-web-console/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index c3ed2b0..b304347 100755 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -170,6 +170,12 @@ <artifactId>geronimo-servlet_2.5_spec</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jsp_2.2_spec</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> <!-- j2ee jars --> <dependency> http://git-wip-us.apache.org/repos/asf/activemq/blob/06bb7a27/activemq-web-console/src/main/webapp/WEB-INF/jspf/old.jspf ---------------------------------------------------------------------- diff --git a/activemq-web-console/src/main/webapp/WEB-INF/jspf/old.jspf b/activemq-web-console/src/main/webapp/WEB-INF/jspf/old.jspf deleted file mode 100644 index f952019..0000000 --- a/activemq-web-console/src/main/webapp/WEB-INF/jspf/old.jspf +++ /dev/null @@ -1,21 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"; %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %> -<%@ taglib prefix="display" uri="http://displaytag.sf.net"; %> - -<%@ taglib prefix="c" tagdir="/WEB-INF/tags/c" %>
