You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/10/19 22:34:23 UTC

svn commit: r1024403 - in /servicemix/smx3/trunk: core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java pom.xml

Author: jbonofre
Date: Tue Oct 19 20:34:22 2010
New Revision: 1024403

URL: http://svn.apache.org/viewvc?rev=1024403&view=rev
Log:
Fix checkstyle mistake in the import order.
Upgrade to CXF 2.2.11, Jetty 6.1.25 and Camel 2.5-SNAPSHOT.

Modified:
    servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
    servicemix/smx3/trunk/pom.xml

Modified: servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java?rev=1024403&r1=1024402&r2=1024403&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java Tue Oct 19 20:34:22 2010
@@ -45,6 +45,8 @@ import javax.swing.event.EventListenerLi
 import javax.transaction.TransactionManager;
 import javax.xml.namespace.QName;
 
+import org.w3c.dom.DocumentFragment;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.JbiConstants;
@@ -81,7 +83,6 @@ import org.apache.servicemix.jbi.messagi
 import org.apache.servicemix.jbi.nmr.Broker;
 import org.apache.servicemix.jbi.nmr.DefaultBroker;
 import org.apache.servicemix.jbi.nmr.flow.Flow;
-import org.w3c.dom.DocumentFragment;
 
 /**
  * The main container

Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=1024403&r1=1024402&r2=1024403&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Tue Oct 19 20:34:22 2010
@@ -39,7 +39,7 @@
     </description>
     
     <prerequisites>
-        <maven>2.0.6</maven>
+        <maven>2.2.1</maven>
     </prerequisites>
 
     <scm>
@@ -100,9 +100,9 @@
         <spring-version>3.0.3.RELEASE</spring-version>
         <activemq-version>5.4.1</activemq-version>
         <activeio-version>3.1.2</activeio-version>
-        <camel-version>2.4.0</camel-version>
+        <camel-version>2.5-SNAPSHOT</camel-version>
         <jencks-version>2.2</jencks-version>
-        <jetty-version>6.1.22</jetty-version>
+        <jetty-version>6.1.25</jetty-version>
         <jetty-servlet-api-version>6.1.14</jetty-servlet-api-version>
         <geronimo-version>2.0.2</geronimo-version>
         <geronimo-annotation-version>1.1.1</geronimo-annotation-version>
@@ -118,7 +118,7 @@
         <oro-version>2.0.8</oro-version>
         <sitemesh-version>2.2.1</sitemesh-version>
         <woden-version>1.0.0M6</woden-version>
-        <cxf-version>2.2.10</cxf-version>
+        <cxf-version>2.2.11</cxf-version>
         <jaxb.version>2.1</jaxb.version>
         <jaxb.impl.version>2.1.12</jaxb.impl.version>
         <jaxb.xjc.version>2.1.12</jaxb.xjc.version>