You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/12/14 08:09:09 UTC

[4/4] camel git commit: CAMEL-8708: Fixed CS.

CAMEL-8708: Fixed CS.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/50d8821d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/50d8821d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/50d8821d

Branch: refs/heads/camel-2.16.x
Commit: 50d8821d03c4adf7140774a87c433e3d0ccc4c74
Parents: db71706
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Dec 14 08:07:05 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Dec 14 08:08:49 2015 +0100

----------------------------------------------------------------------
 components/camel-soap/pom.xml                                   | 5 +++--
 .../org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java | 4 ++--
 parent/pom.xml                                                  | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/50d8821d/components/camel-soap/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index e4cc6b0..eae36f2 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -109,8 +109,8 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-          		<forkCount>1</forkCount>
-	  		<reuseForks>false</reuseForks>
+          		  <forkCount>1</forkCount>
+	  		        <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
             <plugin>
@@ -121,6 +121,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-xjc-plugin</artifactId>
+                <version>${cxf-xjc-plugin-version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources-jaxb</id>

http://git-wip-us.apache.org/repos/asf/camel/blob/50d8821d/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
----------------------------------------------------------------------
diff --git a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
index ce70d4e..aa41248 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
@@ -21,6 +21,8 @@ import java.io.InputStream;
 
 import javax.xml.ws.soap.SOAPFaultException;
 
+import com.example.customerservice.GetCustomersByName;
+
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Produce;
@@ -30,8 +32,6 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-import com.example.customerservice.GetCustomersByName;
-
 /**
  * Checks that a static soap request is unmarshalled to the correct java
  * objects

http://git-wip-us.apache.org/repos/asf/camel/blob/50d8821d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d7282f8..ca8fa59 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -127,6 +127,7 @@
     <cxf-version>3.1.4</cxf-version>
     <cxf-version-range>[3.0,4.0)</cxf-version-range>
     <cxf-xjc-utils-version>3.0.4</cxf-xjc-utils-version>
+    <cxf-xjc-plugin-version>3.0.4</cxf-xjc-plugin-version>
     <deltaspike-version>1.5.1</deltaspike-version>
     <derby-version>10.11.1.1</derby-version>
     <disruptor-version>3.3.2</disruptor-version>