SM-2402: Use correct cxf.codegen-plugin version
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/c306d3bf Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/c306d3bf Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/c306d3bf Branch: refs/heads/servicemix-5.1.x Commit: c306d3bf5fd16232ca19c89c7fc8942373fb8fef Parents: 6f268ea Author: Krzysztof Sobkowiak <[email protected]> Authored: Sat Nov 8 00:59:04 2014 +0100 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Sat Nov 8 01:52:41 2014 +0100 ---------------------------------------------------------------------- parent/pom.xml | 21 +++++++++++++++++++++ pom.xml | 44 -------------------------------------------- 2 files changed, 21 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/c306d3bf/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2a82a2d..f193825 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -41,6 +41,7 @@ <activiti.version>5.15.1</activiti.version> <camel.version>2.13.3</camel.version> <cxf.version>2.7.13</cxf.version> + <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version> <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version> <karaf.version>2.3.8</karaf.version> @@ -410,4 +411,24 @@ </dependencies> </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-codegen-plugin</artifactId> + <version>${cxf.codegen-plugin.version}</version> + <dependencies> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>${xerces.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build> + </project> http://git-wip-us.apache.org/repos/asf/servicemix/blob/c306d3bf/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c07b23b..44e0116 100644 --- a/pom.xml +++ b/pom.xml @@ -65,8 +65,6 @@ </prerequisites> <properties> - <!-- CXF --> - <cxf.codegen-plugin.version>2.4.4</cxf.codegen-plugin.version> <!-- Geronimo --> <geronimo-connector.version>2.1.3</geronimo-connector.version> @@ -246,18 +244,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-codegen-plugin</artifactId> - <version>${cxf.codegen-plugin.version}</version> - <dependencies> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>${xerces.version}</version> - </dependency> - </dependencies> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> <version>${maven-release-plugin.version}</version> @@ -651,36 +637,6 @@ </plugins> </build> </profile> - - <profile> - <id>ibmjdk</id> - <activation> - <property> - <name>java.vendor</name> - <value>IBM Corporation</value> - </property> - </activation> - <build> - <plugins> - <!-- Need to add a xerces dependency to cxf-codegen-plugin when using - the ibm jdk to work around error: org.apache.xerces.impl.dv.DVFactoryException: - DTD factory class org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl does not - extend from DTDDVFactory. Can remove this when we upgrade to a cxf.version - which includes this in the cxf-codegen-plugin pom. --> - <plugin> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-codegen-plugin</artifactId> - <dependencies> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>${xerces.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - </profile> </profiles> </project>
