Author: ningjiang
Date: Sun Jun 17 09:25:00 2012
New Revision: 1351079
URL: http://svn.apache.org/viewvc?rev=1351079&view=rev
Log:
CAMEL-5325 try to fix the build error of camel-soap in windows
Modified:
camel/trunk/components/camel-jmx/pom.xml
camel/trunk/components/camel-soap/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-jmx/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jmx/pom.xml?rev=1351079&r1=1351078&r2=1351079&view=diff
==============================================================================
--- camel/trunk/components/camel-jmx/pom.xml (original)
+++ camel/trunk/components/camel-jmx/pom.xml Sun Jun 17 09:25:00 2012
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.8.1</version>
+ <version>${jaxb2-plugin-version}</version>
<executions>
<execution>
<goals>
Modified: camel/trunk/components/camel-soap/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/pom.xml?rev=1351079&r1=1351078&r2=1351079&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/pom.xml (original)
+++ camel/trunk/components/camel-soap/pom.xml Sun Jun 17 09:25:00 2012
@@ -121,36 +121,32 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <version>${cxf-xjc-utils-version}</version>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <version>${jaxb2-plugin-version}</version>
<executions>
<execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <!-- Add a workaround for running the build within
Chinese code page in Windows -->
- <fork>always</fork>
-
<additionalJvmArgs>-Duser.language=en</additionalJvmArgs>
- <xsdOptions>
- <xsdOption>
-
<xsd>${basedir}/src/main/resources/soap.xsd</xsd>
- </xsdOption>
- </xsdOptions>
- </configuration>
<goals>
- <goal>xsdtojava</goal>
+ <goal>generate</goal>
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-dv</artifactId>
- <version>${cxf-xjc-utils-version}</version>
- </dependency>
- </dependencies>
+ <configuration>
+ <strict>false</strict>
+ <extension>true</extension>
+ <args>
+ <arg>-Xfluent-api</arg>
+ </args>
+ <plugins>
+ <plugin>
+ <groupId>net.java.dev.jaxb2-commons</groupId>
+ <artifactId>jaxb-fluent-api</artifactId>
+ <version>2.1.8</version>
+ </plugin>
+ </plugins>
+ </configuration>
</plugin>
+
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1351079&r1=1351078&r2=1351079&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Jun 17 09:25:00 2012
@@ -124,6 +124,7 @@
<juel-version>2.1.3</juel-version>
<junit-version>4.10</junit-version>
<jt400-version>6.0</jt400-version>
+ <jaxb2-plugin-version>0.8.1</jaxb2-plugin-version>
<karaf-version>2.2.7</karaf-version>
<krati-version>0.4.5</krati-version>
<leveldbjni-version>1.2</leveldbjni-version>
