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 2016/11/15 21:49:48 UTC
camel git commit: CAMEL-10477 - jruby 1.7.26
Repository: camel
Updated Branches:
refs/heads/master f0cebafe0 -> 057bbaeab
CAMEL-10477 - jruby 1.7.26
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/057bbaea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/057bbaea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/057bbaea
Branch: refs/heads/master
Commit: 057bbaeab3a947b67803ed500d9565bb63d105e8
Parents: f0cebaf
Author: Paolo Antinori <pa...@redhat.com>
Authored: Mon Nov 14 18:33:21 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Nov 15 22:49:36 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/builder/script/RubyScriptTextTest.java | 6 ++++++
.../apache/camel/builder/script/example/RubyFilterTest.java | 6 ++++++
parent/pom.xml | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/057bbaea/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
index b340092..8876e45 100755
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyScriptTextTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -34,6 +35,11 @@ public class RubyScriptTextTest extends CamelTestSupport {
final int messageCount = 500;
+ @Before
+ public void configEnv(){
+ System.setProperty("org.jruby.embed.localcontext.scope", "threadsafe");
+ }
+
@Test
public void parallelExecutionWithCachedScriptAndReusedScriptEngine() throws Exception {
context.addRoutes(new RouteBuilder() {
http://git-wip-us.apache.org/repos/asf/camel/blob/057bbaea/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
index 07beadd..56be196 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.builder.script.example;
import org.apache.camel.CamelContext;
import org.apache.camel.spring.SpringCamelContext;
+import org.junit.Before;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -25,6 +26,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
*/
public class RubyFilterTest extends XPathFilterTest {
+ @Before
+ public void setUpEnv() {
+ System.setProperty("org.jruby.embed.localcontext.scope", "threadsafe");
+ }
+
@Override
public void testSendMatchingMessage() throws Exception {
super.testSendMatchingMessage();
http://git-wip-us.apache.org/repos/asf/camel/blob/057bbaea/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 48a4db9..0e0c95f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -346,7 +346,7 @@
<johnzon-version>0.9.5</johnzon-version>
<josql-bundle-version>1.5_5</josql-bundle-version>
<josql-version>1.5</josql-version>
- <jruby-version>1.7.18</jruby-version>
+ <jruby-version>1.7.26</jruby-version>
<jsendnsca-version>1.3.1</jsendnsca-version>
<jsmpp-version>2.3.0</jsmpp-version>
<jsch-version>0.1.54</jsch-version>