Update poms to fully load into M2E. Thanks dkulp
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5b7bc905 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5b7bc905 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5b7bc905 Branch: refs/heads/trunk Commit: 5b7bc9057f7183f2cf8d132c7d4e836a9755ad44 Parents: 06bb7a2 Author: Hadrian Zbarcea <[email protected]> Authored: Thu Jul 10 13:41:41 2014 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Thu Jul 10 13:47:55 2014 -0400 ---------------------------------------------------------------------- activemq-runtime-config/pom.xml | 52 ++------------------ .../src/main/resources/binding.xjb | 2 +- 2 files changed, 4 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/5b7bc905/activemq-runtime-config/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml index 3d1e305..0dbafa2 100755 --- a/activemq-runtime-config/pom.xml +++ b/activemq-runtime-config/pom.xml @@ -100,58 +100,13 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin-version}</version> - <executions> - <execution> - <id>unpack-xsd</id> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-spring</artifactId> - <version>${project.version}</version> - <type>jar</type> - <overWrite>true</overWrite> - <includes>activemq.xsd</includes> - </artifactItem> - </artifactItems> - <outputDirectory>src/main/resources</outputDirectory> - </configuration> - </execution> - <execution> - <id>unpack-spring-xsd</id> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring-version}</version> - <type>jar</type> - <overWrite>true</overWrite> - <includes>org/springframework/beans/factory/xml/spring-beans-3.0.xsd</includes> - </artifactItem> - </artifactItems> - <outputDirectory>src/main/resources</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.cxf</groupId> <artifactId>cxf-xjc-plugin</artifactId> <version>3.0.1</version> <executions> <execution> + <id>compile-xsd</id> + <phase>generate-sources</phase> <goals> <goal>xsdtojava</goal> </goals> @@ -163,7 +118,7 @@ </extensions> <xsdOptions> <xsdOption> - <xsd>${basedir}/src/main/resources/activemq.xsd</xsd> + <xsd>${basedir}/../activemq-spring/target/classes/activemq.xsd</xsd> <bindingFile>${basedir}/src/main/resources/binding.xjb</bindingFile> <extensionArgs> <extensionArgs>-XtoString</extensionArgs> @@ -196,7 +151,6 @@ </includes> </configuration> </plugin> - </plugins> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/activemq/blob/5b7bc905/activemq-runtime-config/src/main/resources/binding.xjb ---------------------------------------------------------------------- diff --git a/activemq-runtime-config/src/main/resources/binding.xjb b/activemq-runtime-config/src/main/resources/binding.xjb index 64b66ce..aceb265 100644 --- a/activemq-runtime-config/src/main/resources/binding.xjb +++ b/activemq-runtime-config/src/main/resources/binding.xjb @@ -19,7 +19,7 @@ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"; xmlns:xs="http://www.w3.org/2001/XMLSchema";> - <jxb:bindings schemaLocation="activemq.xsd" node="/xs:schema"> + <jxb:bindings schemaLocation="../../../../activemq-spring/target/classes/activemq.xsd" node="/xs:schema"> <jxb:schemaBindings> <jxb:nameXmlTransform>
