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 2012/03/13 11:39:04 UTC
svn commit: r1300061 - in /camel/trunk:
components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java
parent/pom.xml platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: davsclaus
Date: Tue Mar 13 10:39:04 2012
New Revision: 1300061
URL: http://svn.apache.org/viewvc?rev=1300061&view=rev
Log:
CAMEL-5078: A number of dependency upgrades.
Modified:
camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java?rev=1300061&r1=1300060&r2=1300061&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java (original)
+++ camel/trunk/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshallTest.java Tue Mar 13 10:39:04 2012
@@ -61,8 +61,7 @@ public class AvroMarshalAndUnmarshallTes
private void marshalAndUnmarshal(String inURI, String outURI) throws Exception {
- Value input = Value.newBuilder().build();
- input.setValue("test body");
+ Value input = Value.newBuilder().setValue("test body").build();
MockEndpoint mock = getMockEndpoint("mock:reverse");
mock.expectedMessageCount(1);
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1300061&r1=1300060&r2=1300061&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Mar 13 10:39:04 2012
@@ -42,7 +42,7 @@
<aries-blueprint-version>0.3</aries-blueprint-version>
<asm-bundle-version>3.3_2</asm-bundle-version>
<atomikos-trascations-version>3.7.0</atomikos-trascations-version>
- <avro-version>1.6.1</avro-version>
+ <avro-version>1.6.2</avro-version>
<avro-bundle-version>1.6.1_1</avro-bundle-version>
<axiom-version>1.2.12</axiom-version>
<beanio-version>1.2.3</beanio-version>
@@ -68,10 +68,10 @@
<dozer-version>5.3.2</dozer-version>
<easymock-version>3.0</easymock-version>
<ehcache-bundle-version>2.4.3_1</ehcache-bundle-version>
- <flatpack-version>3.2.0_1</flatpack-version>
+ <flatpack-version>3.2.0_2</flatpack-version>
<fop-version>1.0</fop-version>
- <ftpserver-version>1.0.5</ftpserver-version>
- <freemarker-version>2.3.18</freemarker-version>
+ <ftpserver-version>1.0.6</ftpserver-version>
+ <freemarker-version>2.3.19</freemarker-version>
<geronimo-el-spec-version>1.0.1</geronimo-el-spec-version>
<geronimo-j2ee-connector-spec-version>2.0.0</geronimo-j2ee-connector-spec-version>
<geronimo-j2ee-jacc-spec-version>1.1</geronimo-j2ee-jacc-spec-version>
@@ -94,47 +94,47 @@
<hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
<hsqldb-version>2.2.8</hsqldb-version>
<httpunit-version>1.6.2</httpunit-version>
- <httpcore4-version>4.1.2</httpcore4-version>
- <httpclient4-version>4.1.2</httpclient4-version>
+ <httpcore4-version>4.1.4</httpcore4-version>
+ <httpclient4-version>4.1.3</httpclient4-version>
<httpclient-version>3.1</httpclient-version>
<icu4j-version>4.0.1</icu4j-version>
- <jackson-version>1.9.2</jackson-version>
- <jackrabbit-version>2.2.4</jackrabbit-version>
+ <jackson-version>1.9.5</jackson-version>
+ <jackrabbit-version>2.2.11</jackrabbit-version>
<jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
<jasypt-version>1.9.0</jasypt-version>
<java-apns-version>0.1.6</java-apns-version>
<javassist-bundle-version>3.12.1.GA_2</javassist-bundle-version>
<javax-mail-version>1.4.4</javax-mail-version>
- <jaxen-version>1.1.1</jaxen-version>
- <jclouds-version>1.3.1</jclouds-version>
- <jclouds-feature-version>1.3.1</jclouds-feature-version>
- <jdom-version>1.1</jdom-version>
+ <jaxen-version>1.1.3</jaxen-version>
+ <jclouds-version>1.3.2</jclouds-version>
+ <jclouds-feature-version>1.3.2_1</jclouds-feature-version>
+ <jdom-version>1.1.3</jdom-version>
<jetty-version>7.5.4.v20111024</jetty-version>
- <jettison-version>1.3</jettison-version>
+ <jettison-version>1.3.1</jettison-version>
<jexcelapi-version>2.4.2</jexcelapi-version>
<jibx-version>1.2.3</jibx-version>
<jruby-version>1.6.7</jruby-version>
- <jsmpp-version>2.1.0_3</jsmpp-version>
- <jsch-version>0.1.44-1</jsch-version>
- <juel-version>2.1.2</juel-version>
- <junit-version>4.8.1</junit-version>
+ <jsmpp-version>2.1.0_4</jsmpp-version>
+ <jsch-version>0.1.46</jsch-version>
+ <juel-version>2.1.3</juel-version>
+ <junit-version>4.10</junit-version>
<jt400-version>6.0</jt400-version>
<karaf-version>2.2.5</karaf-version>
- <krati-version>0.4.3</krati-version>
+ <krati-version>0.4.4</krati-version>
<log4j-version>1.2.16</log4j-version>
- <lucene-version>3.0.3</lucene-version>
+ <lucene-version>3.5.0</lucene-version>
<mina-version>1.1.7</mina-version>
<mina2-version>2.0.4</mina2-version>
- <mockito-version>1.8.5</mockito-version>
+ <mockito-version>1.9.0</mockito-version>
<mongo-java-driver-version>2.7.3</mongo-java-driver-version>
<mvel-version>2.0.18</mvel-version>
<mybatis-version>3.0.6</mybatis-version>
<!-- transitive dependency from avro -->
- <netty-bundle-version>3.2.6.Final_1</netty-bundle-version>
+ <netty-bundle-version>3.2.7.Final_1</netty-bundle-version>
<netty-version>3.3.1.Final</netty-version>
- <ode-version>1.3.3</ode-version>
+ <ode-version>1.3.4</ode-version>
<openwebbeans-version>1.1.3</openwebbeans-version>
- <ognl-version>3.0.2_1</ognl-version>
+ <ognl-version>3.0.4_1</ognl-version>
<osgi-version>4.2.0</osgi-version>
<paranamer-bundle-version>2.4_1</paranamer-bundle-version>
<pax-exam-version>1.2.4</pax-exam-version>
@@ -146,17 +146,17 @@
<qpid-version>0.12</qpid-version>
<quartz-version>1.8.5</quartz-version>
<quickfix-version>1.5.1</quickfix-version>
- <restlet-version>2.0.10</restlet-version>
+ <restlet-version>2.0.11</restlet-version>
<rome-version>1.0</rome-version>
<saxon-version>9.3.0.11</saxon-version>
<scala-version>2.9.1</scala-version>
<scala-plugin-version>2.15.2</scala-plugin-version>
<servicemix-specs-version>1.9.0</servicemix-specs-version>
<shiro-version>1.2.0</shiro-version>
- <slf4j-version>1.6.1</slf4j-version>
+ <slf4j-version>1.6.4</slf4j-version>
<smack-version>3.2.1</smack-version>
<snappy-bundle-version>1.0.4.1_1</snappy-bundle-version>
- <snmp4j-version>1.8.1_5</snmp4j-version>
+ <snmp4j-version>1.10.1_1</snmp4j-version>
<solr-version>3.5.0</solr-version>
<spring-integration-version>2.1.0.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
@@ -167,16 +167,16 @@
<spymemcached-version>2.5</spymemcached-version>
<sshd-version>0.6.0</sshd-version>
<stax-api-version>1.0.1</stax-api-version>
- <stringtemplate-version>3.0</stringtemplate-version>
+ <stringtemplate-version>3.2.1</stringtemplate-version>
<tagsoup-version>1.2.1</tagsoup-version>
<testng-version>6.0.1</testng-version>
<twitter4j-version>2.2.5</twitter4j-version>
<velocity-version>1.7</velocity-version>
- <woodstox-version>4.1.1</woodstox-version>
+ <woodstox-version>4.1.2</woodstox-version>
<xbean-spring-version>3.5</xbean-spring-version>
<xml-resolver-version>1.2</xml-resolver-version>
- <xstream-version>1.4.1</xstream-version>
- <xmlsec-version>1.4.5</xmlsec-version>
+ <xstream-version>1.4.2</xstream-version>
+ <xmlsec-version>1.5.1</xmlsec-version>
<xerces-version>2.9.1</xerces-version>
<xalan-version>2.7.1</xalan-version>
<xmlunit-version>1.3</xmlunit-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1300061&r1=1300060&r2=1300061&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Mar 13 10:39:04 2012
@@ -34,34 +34,34 @@
<!-- some of the bundles is located at: http://repo1.maven.org/maven2/org/apache/servicemix/bundles/ -->
<properties>
- <ant-bundle-version>1.7.0_5</ant-bundle-version>
- <antlr-bundle-version>2.7.7_2</antlr-bundle-version>
- <aopalliance-bundle-version>1.0_5</aopalliance-bundle-version>
- <asm2-bundle-version>2.2.3_4</asm2-bundle-version>
+ <ant-bundle-version>1.7.0_6</ant-bundle-version>
+ <antlr-bundle-version>2.7.7_5</antlr-bundle-version>
+ <aopalliance-bundle-version>1.0_6</aopalliance-bundle-version>
+ <asm2-bundle-version>2.2.3_5</asm2-bundle-version>
<aws-java-sdk-bundle-version>1.3.0_1</aws-java-sdk-bundle-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>
- <bcpg-jdk16-bundle-version>1.46_1</bcpg-jdk16-bundle-version>
- <cglib-version>2.1_3_6</cglib-version>
- <cometd-java-server-bundle-version>2.3.1_1</cometd-java-server-bundle-version>
- <commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version>
- <commons-csv-version>1.0-r706899_3</commons-csv-version>
+ <bcpg-jdk16-bundle-version>1.46_2</bcpg-jdk16-bundle-version>
+ <cglib-version>2.1_3_7</cglib-version>
+ <cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
+ <commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
+ <commons-csv-version>1.0-r706900_3</commons-csv-version>
<commons-configuration-version>1.6</commons-configuration-version>
<commons-daemon-version>1.0.5</commons-daemon-version>
<commons-digester-version>2.1</commons-digester-version>
- <commons-httpclient-bundle-version>3.1_6</commons-httpclient-bundle-version>
- <commons-io-bundle-version>1.3.2_3</commons-io-bundle-version>
+ <commons-httpclient-bundle-version>3.1_7</commons-httpclient-bundle-version>
+ <commons-io-bundle-version>1.4_3</commons-io-bundle-version>
<commons-jxpath-version>1.3</commons-jxpath-version>
<commons-math-version>2.2</commons-math-version>
- <commons-dbcp-bundle-version>1.4_1</commons-dbcp-bundle-version>
- <dom4j-bundle-version>1.6.1_4</dom4j-bundle-version>
+ <commons-dbcp-bundle-version>1.4_2</commons-dbcp-bundle-version>
+ <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
<el-api-1.0-version>1.0.1</el-api-1.0-version>
- <fastinfoset-version>1.2.7_3</fastinfoset-version>
+ <fastinfoset-version>1.2.7_4</fastinfoset-version>
<features.file>features.xml</features.file>
<flatpack-bundle-version>3.2.0_2</flatpack-bundle-version>
<felix-configadmin-version>1.2.4</felix-configadmin-version>
<felix-framework-version>2.0.5</felix-framework-version>
<fop-bundle-version>1.0_2</fop-bundle-version>
- <freemarker-bundle-version>2.3.18_1</freemarker-bundle-version>
+ <freemarker-bundle-version>2.3.18_2</freemarker-bundle-version>
<geronimo-el-version>1.0.1</geronimo-el-version>
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
@@ -69,71 +69,68 @@
<guice-bundle-version>2.0_2</guice-bundle-version>
<hadoop-bundle-version>0.20.203.0_1</hadoop-bundle-version>
<hapi-bundle-version>0.5.1_5</hapi-bundle-version>
- <hibernate-validator-bundle-version>4.1.0.Final_2</hibernate-validator-bundle-version>
- <ibatis-bundle-version>2.3.4.726_2</ibatis-bundle-version>
- <irclib-bundle-version>1.10_4</irclib-bundle-version>
+ <hibernate-validator-bundle-version>4.1.0.Final_3</hibernate-validator-bundle-version>
+ <ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
+ <irclib-bundle-version>1.10_5</irclib-bundle-version>
<isorelax-bundle-version>20050913_4</isorelax-bundle-version>
- <java-apns-bundle-version>0.1.6_2</java-apns-bundle-version>
- <jaxb-bundle-version>2.2.1.1_1</jaxb-bundle-version>
+ <java-apns-bundle-version>0.1.6_3</java-apns-bundle-version>
+ <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version>
<jasypt-bundle-version>1.9.0_1</jasypt-bundle-version>
- <jetty6-bundle-version>6.1.26_3</jetty6-bundle-version>
+ <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
<jexcelapi-bundle-version>2.4.2_4</jexcelapi-bundle-version>
<javax.el-bundle-version>2.1.0</javax.el-bundle-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
- <jettison-bundle-version>1.3</jettison-bundle-version>
- <jing-bundle-version>20030619_4</jing-bundle-version>
- <jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
+ <jing-bundle-version>20030619_5</jing-bundle-version>
+ <jodatime-bundle-version>1.5.2_5</jodatime-bundle-version>
<josql-bundle-version>1.5_5</josql-bundle-version>
- <jsch-bundle-version>0.1.44_2</jsch-bundle-version>
- <jsendnsca-bundle-version>1.3.1_1</jsendnsca-bundle-version>
+ <jsch-bundle-version>0.1.45_1</jsch-bundle-version>
+ <jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version>
<jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
<juel-bundle-version>2.1.2_2</juel-bundle-version>
- <junit-bundle-version>4.7_1</junit-bundle-version>
- <jsmpp-bundle-version>2.1.0_3</jsmpp-bundle-version>
- <kxml2-bundle-version>2.3.0_1</kxml2-bundle-version>
- <lucene-bundle-version>3.0.3_1</lucene-bundle-version>
- <mvel-bundle-version>2.0.18_2</mvel-bundle-version>
- <mina-bundle-version>1.1.7_5</mina-bundle-version>
- <neethi-bundle-version>3.0.0</neethi-bundle-version>
- <oro-bundle-version>2.0.8_5</oro-bundle-version>
- <openjpa-bundle-version>1.2.1_2</openjpa-bundle-version>
- <opensaml-version>2.4.1_1</opensaml-version>
+ <junit-bundle-version>4.10_1</junit-bundle-version>
+ <jsmpp-bundle-version>2.1.0_4</jsmpp-bundle-version>
+ <kxml2-bundle-version>2.3.0_2</kxml2-bundle-version>
+ <lucene-bundle-version>3.5.0_1</lucene-bundle-version>
+ <mvel-bundle-version>2.0.18_3</mvel-bundle-version>
+ <mina-bundle-version>1.1.7_6</mina-bundle-version>
+ <neethi-bundle-version>3.0.1</neethi-bundle-version>
+ <oro-bundle-version>2.0.8_6</oro-bundle-version>
+ <opensaml-version>2.5.1_2</opensaml-version>
<oscache-bundle-version>2.4_5</oscache-bundle-version>
- <protobuf-java-bundle-version>2.3.0_1</protobuf-java-bundle-version>
- <quartz-bundle-version>1.8.5_1</quartz-bundle-version>
- <qpid-bundle-version>0.12_1</qpid-bundle-version>
- <quickfix-bundle-version>1.5.1_1</quickfix-bundle-version>
- <regexp-bundle-version>1.3_2</regexp-bundle-version>
- <rhino-bundle-version>1.7R2_2</rhino-bundle-version>
- <rome-bundle-version>1.0_2</rome-bundle-version>
+ <protobuf-java-bundle-version>2.3.0_3</protobuf-java-bundle-version>
+ <quartz-bundle-version>1.8.5_2</quartz-bundle-version>
+ <qpid-bundle-version>0.12_2</qpid-bundle-version>
+ <quickfix-bundle-version>1.5.1_2</quickfix-bundle-version>
+ <regexp-bundle-version>1.3_3</regexp-bundle-version>
+ <rhino-bundle-version>1.7R2_3</rhino-bundle-version>
+ <rome-bundle-version>1.0_3</rome-bundle-version>
<saxon-bundle-version>9.3.0.11_1</saxon-bundle-version>
- <scala-bundle-version>2.9.1_1</scala-bundle-version>
+ <scala-bundle-version>2.9.1_2</scala-bundle-version>
<scriptengines-version>1.1</scriptengines-version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<serp-bundle-version>1.13.1_4</serp-bundle-version>
- <smack-bundle-version>3.2.0_1</smack-bundle-version>
- <solrj-bundle-version>3.5.0_1</solrj-bundle-version>
+ <smack-bundle-version>3.2.1_1</smack-bundle-version>
+ <solrj-bundle-version>3.5.0_2</solrj-bundle-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spymemcached-bundle-version>2.5_2</spymemcached-bundle-version>
<stringtemplate-bundle-version>3.2_5</stringtemplate-bundle-version>
<tagsoup-bundle-version>1.2_5</tagsoup-bundle-version>
<twitter4j-bundle-version>2.2.5_2</twitter4j-bundle-version>
- <velocity-bundle-version>1.7_3</velocity-bundle-version>
- <xalan-bundle-version>2.7.1_4</xalan-bundle-version>
+ <velocity-bundle-version>1.7_4</velocity-bundle-version>
+ <xalan-bundle-version>2.7.1_5</xalan-bundle-version>
<xerces-bundle-version>2.9.1_5</xerces-bundle-version>
<xmlbeans-bundle-version>2.5.0_2</xmlbeans-bundle-version>
<xmlschema-version>2.0</xmlschema-version>
- <xmlsec-bundle-version>1.4.5_1</xmlsec-bundle-version>
- <xmlresolver-bundle-version>1.2_4</xmlresolver-bundle-version>
- <xpp3-bundle-version>1.1.4c_5</xpp3-bundle-version>
- <xstream-bundle-version>1.4.1_1</xstream-bundle-version>
+ <xmlresolver-bundle-version>1.2_5</xmlresolver-bundle-version>
+ <xpp3-bundle-version>1.1.4c_6</xpp3-bundle-version>
+ <xstream-bundle-version>1.4.2_2</xstream-bundle-version>
<werken-xpath-bundle-version>0.9.4_5</werken-xpath-bundle-version>
<woodstox-core-bundle-version>${woodstox-version}</woodstox-core-bundle-version>
<stax2-api-bundle-version>3.1.1</stax2-api-bundle-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
- <wsdl4j-bundle-version>1.6.2_5</wsdl4j-bundle-version>
- <wss4j-version>1.6.1</wss4j-version>
+ <wsdl4j-bundle-version>1.6.2_6</wsdl4j-bundle-version>
+ <wss4j-version>1.6.5</wss4j-version>
</properties>
<!-- The validate plugin will export these provided dependencies bundles' export packages first -->
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1300061&r1=1300060&r2=1300061&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue Mar 13 10:39:04 2012
@@ -765,7 +765,7 @@
</feature>
<feature name='camel-xmlsecurity' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.santuario/xmlsec/${xmlsec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
@@ -779,7 +779,7 @@
<bundle>mvn:org.apache.camel/camel-xmpp/${project.version}</bundle>
</feature>
<feature name='camel-xstream' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>