Merge branch 'jruby-9.1'

jruby · Oct 24, 2017 · 52778a5 · 52778a5
2 parents b050c57 + 4c676ce
commit 52778a5
Showing 5 changed files with 30 additions and 8 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -262,7 +262,6 @@
 
 
   plugin :shade do
-    version( '3.1.0' )
     execute_goals( 'shade',
                    :id => 'create lib/jruby.jar',
                    :phase => 'package',

diff --git a/core/pom.xml b/core/pom.xml
@@ -599,7 +599,6 @@ DO NOT MODIFIY - GENERATED CODE
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
         <executions>
           <execution>
             <id>create lib/jruby.jar</id>

diff --git a/core/src/main/java/org/jruby/RubySignal.java b/core/src/main/java/org/jruby/RubySignal.java
@@ -97,11 +97,21 @@ public static Map<String, Integer> list() {
     @JRubyMethod(meta = true)
     public static IRubyObject list(ThreadContext context, IRubyObject recv) {
         Ruby runtime = recv.getRuntime();
-        RubyHash names = RubyHash.newHash(runtime);
-        for (Map.Entry<String, Integer> sig : RubySignal.list().entrySet()) {
-            names.op_aset(context, runtime.freezeAndDedupString(runtime.newString(sig.getKey())), runtime.newFixnum(sig.getValue()));
+        RubyHash names;
+
+        synchronized (recv) {
+            names = (RubyHash) recv.getInternalVariables().getInternalVariable("signal_list");
+            if (names == null) {
+                names = RubyHash.newHash(runtime);
+                for (Map.Entry<String, Integer> sig : RubySignal.list().entrySet()) {
+                    names.op_aset(context, runtime.freezeAndDedupString(runtime.newString(sig.getKey())), runtime.newFixnum(sig.getValue()));
+                }
+                names.op_aset(context, runtime.freezeAndDedupString(runtime.newString("EXIT")), runtime.newFixnum(0));
+            } else {
+                names.dup(context);
+            }
         }
-        names.op_aset(context, runtime.freezeAndDedupString(runtime.newString("EXIT")), runtime.newFixnum(0));
+
         return names;
     }
 

diff --git a/pom.rb b/pom.rb
@@ -128,7 +128,7 @@
     end
 
     plugin :compiler, '3.3'
-    plugin :shade, '2.4.3'
+    plugin :shade, '3.1.0'
     plugin :surefire, '2.15'
     plugin :plugin, '3.2'
     plugin( :invoker, '1.8',
@@ -148,6 +148,9 @@
 
     plugin 'org.eclipse.m2e:lifecycle-mapping:1.0.0'
     plugin :'scm-publish', '1.0-beta-2'
+    plugin 'org.apache.felix:maven-bundle-plugin' do
+      dependency(groupId: 'biz.aQute.bnd', artifactId: 'biz.aQute.bndlib', version: '3.5.0')
+    end
   end
 
   plugin( :site,

diff --git a/pom.xml b/pom.xml
@@ -282,7 +282,7 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>2.4.3</version>
+          <version>3.1.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -336,6 +336,17 @@ DO NOT MODIFIY - GENERATED CODE
           <artifactId>maven-scm-publish-plugin</artifactId>
           <version>1.0-beta-2</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <dependencies>
+            <dependency>
+              <groupId>biz.aQute.bnd</groupId>
+              <artifactId>biz.aQute.bndlib</artifactId>
+              <version>3.5.0</version>
+            </dependency>
+          </dependencies>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>