logstash-output-scalyr 0.1.25.beta → 0.1.26.beta

data/vendor/bundle/jruby/2.5.0/gems/{jrjackson-0.4.8-java → jrjackson-0.4.14-java}/changelog.md

@@ -1,5 +1,28 @@
+v0.4.14
+  Bump jackson-databind to v2.9.10.8
+
+v0.4.13
+  Bump jackson-databind to v2.9.10.6
+
+v0.4.12
+  Bump jackson-databind to v2.9.10.4
+
+v0.4.11
+  Bump Jackson to v2.9.10, and jackson-databind to v2.9.10.1
+
+v0.4.10
+  fix concurrency issue when serializing dates.
+  Cache UTC TimeZone class to avoid unnecessary calls to synchronized method
+  Use a ThreadLocal to hold per-thread instances of SimpleDateFormat to avoid
+   unnecessary expensive clonings of that object
+  Replace unsafe call to setDateFormat on static ObjectMapper class by creating
+   an amended SerializationConfig
+
+v0.4.9
+  bump Jackson to v2.9.9, and jackson-databind to v2.9.9.3
+
 v0.4.8
-  fix serialisation of big numbers as Ruby 2.4 unifies Fixnum and Bignum into Integer 
+  fix serialisation of big numbers as Ruby 2.4 unifies Fixnum and Bignum into Integer
 
 v0.4.4
   fix for issue 64
@@ -8,7 +31,7 @@ v0.4.4
 v0.4.3
   bump Jackson to v2.9.1
   make static_mapper public
-  
+
 v0.4.1
   fix for issue 55
     Refactor AnySerializer acceptable class detection that does not use an exception

data/vendor/bundle/jruby/2.5.0/gems/{jrjackson-0.4.8-java → jrjackson-0.4.14-java}/jrjackson.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'jar-dependencies', '< 2.0', '>= 0.3.2'
 
   jackson_version = JrJackson::BuildInfo.jackson_version
+  jackson_databind_version = JrJackson::BuildInfo.jackson_databind_version
   s.requirements << "jar com.fasterxml.jackson.core:jackson-core, #{jackson_version}"
   s.requirements << "jar com.fasterxml.jackson.core:jackson-annotations, #{jackson_version}"
-  s.requirements << "jar com.fasterxml.jackson.core:jackson-databind, #{jackson_version}"
+  s.requirements << "jar com.fasterxml.jackson.core:jackson-databind, #{jackson_databind_version}"
   s.requirements << "jar com.fasterxml.jackson.module:jackson-module-afterburner, #{jackson_version}"
 
   s.files = JrJackson::BuildInfo.files

data/vendor/bundle/jruby/2.5.0/gems/{jrjackson-0.4.8-java → jrjackson-0.4.14-java}/lib/jrjackson/build_info.rb

@@ -1,11 +1,11 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.4.8'
+      '0.4.14'
     end
 
     def self.release_date
-      '2019-05-01'
+      '2021-01-06'
     end
 
     def self.files
@@ -13,11 +13,15 @@ module JrJackson
     end
 
     def self.jackson_version
-      '2.9.7'
+      '2.9.10'
+    end
+
+    def self.jackson_databind_version
+      '2.9.10.8'
     end
 
     def self.jar_version
-      '1.2.26'
+      '1.2.32'
     end
 
     private
@@ -34,7 +38,7 @@ module JrJackson
       [
         "lib/com/fasterxml/jackson/core/jackson-annotations/#{jackson_version}/jackson-annotations-#{jackson_version}.jar",
         "lib/com/fasterxml/jackson/core/jackson-core/#{jackson_version}/jackson-core-#{jackson_version}.jar",
-        "lib/com/fasterxml/jackson/core/jackson-databind/#{jackson_version}/jackson-databind-#{jackson_version}.jar",
+        "lib/com/fasterxml/jackson/core/jackson-databind/#{jackson_databind_version}/jackson-databind-#{jackson_databind_version}.jar",
         "lib/com/fasterxml/jackson/module/jackson-module-afterburner/#{jackson_version}/jackson-module-afterburner-#{jackson_version}.jar",
         "lib/jrjackson/jars/jrjackson-#{jar_version}.jar"
       ]

data/vendor/bundle/jruby/2.5.0/gems/{jrjackson-0.4.8-java → jrjackson-0.4.14-java}/lib/jrjackson_jars.rb

@@ -2,15 +2,15 @@
 begin
   require 'jar_dependencies'
 rescue LoadError
-  require 'com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7.jar'
-  require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.9.7/jackson-module-afterburner-2.9.7.jar'
-  require 'com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7.jar'
-  require 'com/fasterxml/jackson/core/jackson-annotations/2.9.7/jackson-annotations-2.9.7.jar'
+  require 'com/fasterxml/jackson/core/jackson-databind/2.9.10.8/jackson-databind-2.9.10.8.jar'
+  require 'com/fasterxml/jackson/core/jackson-annotations/2.9.10/jackson-annotations-2.9.10.jar'
+  require 'com/fasterxml/jackson/core/jackson-core/2.9.10/jackson-core-2.9.10.jar'
+  require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.9.10/jackson-module-afterburner-2.9.10.jar'
 end
 
 if defined? Jars
-  require_jar 'com.fasterxml.jackson.core', 'jackson-databind', '2.9.7'
-  require_jar 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.7'
-  require_jar 'com.fasterxml.jackson.core', 'jackson-core', '2.9.7'
-  require_jar 'com.fasterxml.jackson.core', 'jackson-annotations', '2.9.7'
+  require_jar 'com.fasterxml.jackson.core', 'jackson-databind', '2.9.10.8'
+  require_jar 'com.fasterxml.jackson.core', 'jackson-annotations', '2.9.10'
+  require_jar 'com.fasterxml.jackson.core', 'jackson-core', '2.9.10'
+  require_jar 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.10'
 end

data/vendor/bundle/jruby/2.5.0/gems/{jrjackson-0.4.8-java → jrjackson-0.4.14-java}/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
-  <version>1.2.26</version>
+  <version>1.2.32</version>
   <name>A JRuby wrapper for the java jackson json processor jar</name>
   <description>A mostly native JRuby wrapper for the java jackson json processor jar</description>
   <url>http://github.com/guyboertje/jrjackson</url>
@@ -54,22 +54,22 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.9.7</version>
+      <version>2.9.10</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.9.7</version>
+      <version>2.9.10</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.7</version>
+      <version>2.9.10.8</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-afterburner</artifactId>
-      <version>2.9.7</version>
+      <version>2.9.10</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -80,7 +80,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.4.0</version>
+      <version>9.2.13.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -118,7 +118,7 @@ DO NOT MODIFIY - GENERATED CODE
         </executions>
         <configuration>
           <outputDirectory>lib/jrjackson/jars</outputDirectory>
-          <finalName>jrjackson-1.2.26</finalName>
+          <finalName>jrjackson-1.2.32</finalName>
         </configuration>
       </plugin>
       <plugin>
@@ -129,7 +129,7 @@ DO NOT MODIFIY - GENERATED CODE
             <fileset>
               <directory>lib/jrjackson/jars</directory>
               <includes>
-                <include>jrjackson-1.2.26.jar</include>
+                <include>jrjackson-1.2.32.jar</include>
                 <include>*/**/*.jar</include>
               </includes>
             </fileset>
@@ -163,23 +163,6 @@ DO NOT MODIFIY - GENERATED CODE
           <skipTests>true</skipTests>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.torquebox.mojo</groupId>
-        <artifactId>jruby9-exec-maven-plugin</artifactId>
-        <version>0.3.1</version>
-        <executions>
-          <execution>
-            <id>vendor-jars</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <script>require 'jars/installer';Jars::Installer.vendor_jars!</script>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

data/vendor/bundle/jruby/2.5.0/gems/{jrjackson-0.4.8-java → jrjackson-0.4.14-java}/src/main/java/com/jrjackson/RubyAnySerializer.java

@@ -234,13 +234,13 @@ public class RubyAnySerializer extends JsonSerializer<IRubyObject> {
         if (df == null) {
             // DateFormat should always be set
             provider.defaultSerializeDateValue(dt.getJavaDate(), jgen);
-        } else if (df instanceof RubyDateFormat) {
+        } // RWB Note: I believe this is no longer used
+        else if (df instanceof RubyDateFormat) {
             // why another branch? I thought there was an easy win on to_s
             // maybe with jruby 9000
-            RubyDateFormat rdf = (RubyDateFormat) df.clone();
-            jgen.writeString(rdf.format(dt.getJavaDate()));
+            RubyDateFormat clonedRubyDateFormat = (RubyDateFormat) df.clone();
+            jgen.writeString(clonedRubyDateFormat.format(dt.getJavaDate()));
         } else {
-            SimpleDateFormat sdf = (SimpleDateFormat) df.clone();
             jgen.writeString(df.format(dt.getJavaDate()));
         }
     }

data/vendor/bundle/jruby/2.5.0/gems/{jrjackson-0.4.8-java → jrjackson-0.4.14-java}/src/main/java/com/jrjackson/RubyJacksonModule.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
@@ -17,6 +18,16 @@ import java.util.TimeZone;
 public class RubyJacksonModule extends SimpleModule {
     public static final ObjectMapper static_mapper = new ObjectMapper();
     public static final JsonFactory factory = new JsonFactory(static_mapper).disable(JsonFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW);
+    private static final TimeZone utcTimeZone = TimeZone.getTimeZone("UTC");
+
+    private static final ThreadLocal<SimpleDateFormat>  dateFormat = new ThreadLocal<SimpleDateFormat> ()  {
+        @Override
+        protected SimpleDateFormat initialValue() {
+            SimpleDateFormat rdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
+            rdf.setTimeZone(utcTimeZone);
+            return rdf;
+        }
+    };
 
     static {
         static_mapper.registerModule(new RubyJacksonModule().addSerializer(
@@ -27,7 +38,7 @@ public class RubyJacksonModule extends SimpleModule {
     }
 
     private RubyJacksonModule() {
-        super("JrJacksonStrModule", new Version(1, 2, 18, "0", "com.jrjackson.jruby", "jrjackson"));
+        super("JrJacksonStrModule", new Version(1, 2, 28, "0", "com.jrjackson.jruby", "jrjackson"));
     }
 
     public static ObjectMapper mapperWith(Ruby ruby, RubyKeyConverter nameConverter,
@@ -46,17 +57,18 @@ public class RubyJacksonModule extends SimpleModule {
     }
 
     public static DefaultSerializerProvider createProvider(SimpleDateFormat sdf) {
-        static_mapper.setDateFormat(sdf);
+        // Use a copy of the SerializationConfig to avoid calling setDateFormat on the static ObjectMapper
+        // object, removing its thread safety properties. In future, we might want to think about doing
+        // a refactor to use ObjectWriters instead of modifying serialization configs.
+        SerializationConfig config = static_mapper.getSerializationConfig().with(sdf);
         return ((DefaultSerializerProvider) static_mapper.getSerializerProvider()).createInstance(
-                static_mapper.getSerializationConfig(),
+                config,
                 static_mapper.getSerializerFactory()
         );
     }
 
     public static DefaultSerializerProvider createProvider() {
-        SimpleDateFormat rdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
-        rdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return createProvider(rdf);
+        return createProvider(dateFormat.get());
     }
 
     public static ObjectMapper rawBigNumberMapper() {

data/vendor/bundle/jruby/2.5.0/gems/{jrjackson-0.4.8-java → jrjackson-0.4.14-java}/test/jrjackson_test.rb

@@ -548,6 +548,21 @@ class JrJacksonTest < Test::Unit::TestCase
     assert_equal "{\"foo\":9223372036854775808,\"bar\":65536}", actual
   end
 
+
+  # This test failed more often than not before fixing the underlying code
+  # and would fail every time if `100_000.times` was changed to `loop`
+  def test_concurrent_dump
+    now = Time.now
+    num_threads = 100
+
+    threads = num_threads.times.map do |i|
+      Thread.new do
+        100_000.times { JrJackson::Json.dump("a" => now) }
+      end
+    end
+    threads.each(&:join)
+  end
+
   # -----------------------------
 
   def assert_bigdecimal_equal(expected, actual)

data/vendor/bundle/jruby/2.5.0/specifications/{jrjackson-0.4.8-java.gemspec → jrjackson-0.4.14-java.gemspec}

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-# stub: jrjackson 0.4.8 java lib
+# stub: jrjackson 0.4.14 java lib
 
 Gem::Specification.new do |s|
   s.name = "jrjackson".freeze
-  s.version = "0.4.8"
+  s.version = "0.4.14"
   s.platform = "java".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Guy Boertje".freeze]
-  s.date = "2019-05-01"
+  s.date = "2021-01-06"
   s.description = "A mostly native JRuby wrapper for the java jackson json processor jar".freeze
   s.email = ["guyboertje@gmail.com".freeze]
   s.homepage = "http://github.com/guyboertje/jrjackson".freeze
   s.licenses = ["Apache License 2.0".freeze]
-  s.requirements = ["jar com.fasterxml.jackson.core:jackson-core, 2.9.7".freeze, "jar com.fasterxml.jackson.core:jackson-annotations, 2.9.7".freeze, "jar com.fasterxml.jackson.core:jackson-databind, 2.9.7".freeze, "jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.7".freeze]
+  s.requirements = ["jar com.fasterxml.jackson.core:jackson-core, 2.9.10".freeze, "jar com.fasterxml.jackson.core:jackson-annotations, 2.9.10".freeze, "jar com.fasterxml.jackson.core:jackson-databind, 2.9.10.8".freeze, "jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.10".freeze]
   s.rubygems_version = "2.7.10".freeze
   s.summary = "A JRuby wrapper for the java jackson json processor jar".freeze
 
@@ -25,13 +25,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>.freeze, ["~> 1.10"])
-      s.add_development_dependency(%q<jar-dependencies>.freeze, ["< 2.0", ">= 0.3.2"])
+      s.add_development_dependency(%q<jar-dependencies>.freeze, [">= 0.3.2", "< 2.0"])
     else
       s.add_dependency(%q<bundler>.freeze, ["~> 1.10"])
-      s.add_dependency(%q<jar-dependencies>.freeze, ["< 2.0", ">= 0.3.2"])
+      s.add_dependency(%q<jar-dependencies>.freeze, [">= 0.3.2", "< 2.0"])
     end
   else
     s.add_dependency(%q<bundler>.freeze, ["~> 1.10"])
-    s.add_dependency(%q<jar-dependencies>.freeze, ["< 2.0", ">= 0.3.2"])
+    s.add_dependency(%q<jar-dependencies>.freeze, [">= 0.3.2", "< 2.0"])
   end
 end