Repository: camel
Updated Branches:
  refs/heads/master 201572b28 -> d3954d6c2


Revert "CAMEL-10477 - jruby 1.7.26"

This reverts commit 057bbaeab3a947b67803ed500d9565bb63d105e8.


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

Branch: refs/heads/master
Commit: d3954d6c2e1c3fec385f368cc3111c84fe4dfb93
Parents: 201572b
Author: Thomas Diesler <[email protected]>
Authored: Mon Nov 21 11:09:43 2016 +0100
Committer: Claus Ibsen <[email protected]>
Committed: Mon Nov 21 11:35:52 2016 +0100

----------------------------------------------------------------------
 .../org/apache/camel/builder/script/RubyScriptTextTest.java    | 6 ------
 .../apache/camel/builder/script/example/RubyFilterTest.java    | 6 ------
 parent/pom.xml                                                 | 3 ++-
 3 files changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d3954d6c/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 8876e45..b340092 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,7 +24,6 @@ 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;
 
@@ -35,11 +34,6 @@ 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/d3954d6c/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 56be196..07beadd 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,7 +18,6 @@ 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;
 
 /**
@@ -26,11 +25,6 @@ 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/d3954d6c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2c70d24..298a1fe 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -346,7 +346,8 @@
     <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.26</jruby-version>
+    <!-- Upgrade to 1.7.26 causes stability issues. See CAMEL-10477 -->
+    <jruby-version>1.7.18</jruby-version>
     <jsendnsca-version>1.3.1</jsendnsca-version>
     <jsmpp-version>2.3.0</jsmpp-version>
     <jsch-version>0.1.54</jsch-version>

Reply via email to