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 2014/06/14 11:06:26 UTC
[1/4] git commit: Fixed compile issue
Repository: camel
Updated Branches:
refs/heads/master 65a6ffba8 -> 58050d04e
Fixed compile issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2710e82b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2710e82b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2710e82b
Branch: refs/heads/master
Commit: 2710e82be633e3957f384165a820b8f7446bbdb5
Parents: 65a6ffb
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jun 14 10:49:16 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jun 14 10:49:16 2014 +0200
----------------------------------------------------------------------
.../apache/camel/component/gson/SpringGsonFieldNamePolicyTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2710e82b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonFieldNamePolicyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonFieldNamePolicyTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonFieldNamePolicyTest.java
index 4918c8f..b4c4412 100644
--- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonFieldNamePolicyTest.java
+++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonFieldNamePolicyTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.gson;
-import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
[2/4] git commit: Upgrade groovy
Posted by da...@apache.org.
Upgrade groovy
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f21310f0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f21310f0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f21310f0
Branch: refs/heads/master
Commit: f21310f0b4205089b36617f6153438ccad9caf56
Parents: 2710e82
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jun 14 10:49:35 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jun 14 10:49:35 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f21310f0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e68460d..3baf212 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -164,7 +164,7 @@
<google-gdata-version>1.41.5.w1</google-gdata-version>
<google-gdata-bundle-version>1.41.1_1</google-gdata-bundle-version>
<google-guava-version>16.0.1</google-guava-version>
- <groovy-version>2.3.2</groovy-version>
+ <groovy-version>2.3.3</groovy-version>
<gson-version>2.2.4</gson-version>
<guice-bundle-version>3.0_1</guice-bundle-version>
<guice-version>3.0</guice-version>
[3/4] git commit: Upgrade jasypt
Posted by da...@apache.org.
Upgrade jasypt
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/93cbd113
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93cbd113
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93cbd113
Branch: refs/heads/master
Commit: 93cbd113f8c413bcc74fb2e775cf280ff1bbf9c0
Parents: f21310f
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jun 14 10:56:47 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jun 14 10:56:47 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/93cbd113/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3baf212..65bcc74 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -200,8 +200,8 @@
<jackrabbit-version>2.8.0</jackrabbit-version>
<jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
<jasper-bundle-version>6.0.36_1</jasper-bundle-version>
- <jasypt-bundle-version>1.9.1_1</jasypt-bundle-version>
- <jasypt-version>1.9.1</jasypt-version>
+ <jasypt-bundle-version>1.9.2_1</jasypt-bundle-version>
+ <jasypt-version>1.9.2</jasypt-version>
<java-apns-bundle-version>0.2.3_1</java-apns-bundle-version>
<java-apns-version>0.2.3</java-apns-version>
<javacrumbs-version>0.22</javacrumbs-version>
[4/4] git commit: Netty and mvel upgrades
Posted by da...@apache.org.
Netty and mvel upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/58050d04
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/58050d04
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/58050d04
Branch: refs/heads/master
Commit: 58050d04e4ca5835aaa578298ea872b5330aef3c
Parents: 93cbd11
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jun 14 11:06:15 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jun 14 11:06:15 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/58050d04/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 65bcc74..5e04e79 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -304,11 +304,11 @@
<msv-version>20050913</msv-version>
<mustache-java-version>0.8.15</mustache-java-version>
<mustache-bundle-version>0.8.15_1/</mustache-bundle-version>
- <mvel-version>2.1.7.Final</mvel-version>
+ <mvel-version>2.1.9.Final</mvel-version>
<mybatis-version>3.2.7</mybatis-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
- <netty3-version>3.9.1.Final</netty3-version>
- <netty-version>4.0.19.Final</netty-version>
+ <netty3-version>3.9.2.Final</netty3-version>
+ <netty-version>4.0.20.Final</netty-version>
<ode-version>1.3.4</ode-version>
<!-- should be in-sync with deltaspike -->
<openwebbeans-version>1.1.5</openwebbeans-version>
@@ -420,7 +420,7 @@
<wsdl4j-bundle-version>1.6.2_6</wsdl4j-bundle-version>
<xalan-bundle-version>2.7.1_7</xalan-bundle-version>
<xalan-version>2.7.1</xalan-version>
- <xbean-spring-version>3.16</xbean-spring-version>
+ <xbean-spring-version>3.18</xbean-spring-version>
<!-- xbean-asm4-bundle is used by openjpa -->
<xbean-asm4-bundle-version>3.14</xbean-asm4-bundle-version>
<xerces-bundle-version>2.11.0_1</xerces-bundle-version>