jrjackson 0.4.2-java → 0.4.3-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. checksums.yaml +5 -5
  2. data/Mavenfile +4 -5
  3. data/Rakefile +24 -1
  4. data/changelog.md +4 -0
  5. data/jrjackson.gemspec +5 -6
  6. data/lib/com/fasterxml/jackson/core/jackson-annotations/2.9.1/jackson-annotations-2.9.1.jar +0 -0
  7. data/lib/com/fasterxml/jackson/core/jackson-core/2.9.1/jackson-core-2.9.1.jar +0 -0
  8. data/lib/com/fasterxml/jackson/core/jackson-databind/2.9.1/jackson-databind-2.9.1.jar +0 -0
  9. data/lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.1/jackson-module-afterburner-2.9.1.jar +0 -0
  10. data/lib/jrjackson/build_info.rb +10 -2
  11. data/lib/jrjackson/jars/jrjackson-1.2.21.jar +0 -0
  12. data/lib/jrjackson/jrjackson.rb +2 -1
  13. data/lib/jrjackson_jars.rb +8 -8
  14. data/pom.xml +11 -19
  15. data/src/main/java/com/jrjackson/RubyJacksonModule.java +5 -5
  16. metadata +22 -34
  17. data/.mvn/extensions.xml +0 -8
  18. data/lib/jrjackson/jars/jrjackson-1.2.20.jar +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 4bd57243067cdf667df3ade28015c6ca6fdeb6b4
4
- data.tar.gz: c948560166a4b9f5b8c495d6936eb828aab6e7b0
2
+ SHA256:
3
+ metadata.gz: f7c5da0f49c40b8588b90ecd1b060b29d7ade289744586010d3d35be6b9b218d
4
+ data.tar.gz: 3cdad361471439a14bac5fcdfeb99a38bc0975001c86ba2a2fc50258b93ee999
5
5
  SHA512:
6
- metadata.gz: 3fe884301c72b8dd614ca8ebeb7094a0d1ec44fc7abeb4c093a20dc756684e41865e2cabe82551bcd82fa19d3ce51de42a507b309d0d4ce4517f96c617586863
7
- data.tar.gz: f1d2ab4df91f94f957247fea5e7006da5d6fb275ed2f4bf278215e02b0ee9d583260390e45d9593a90b7f09759e1bbe0f1ee03798122645e3779b0b4add87467
6
+ metadata.gz: 51833b5446f8380457ac3e72d7c9a4d29422e69fc0f571d07932131c0e87da560eecad0ed61259c8cda0571b64f4a13a7368073d498f49546345fa3bf165c1d0
7
+ data.tar.gz: 8c5abf23abfb18da5cec7ca67adb7b610710c730a75f464f67581eeb7dd7e2f4df98b2e5d703ae0d547106243b40edef736dde711d43cd2f7acb430c9163ab2b
data/Mavenfile CHANGED
@@ -1,23 +1,22 @@
1
1
  #-*- mode: ruby -*-
2
2
 
3
- VERSION='1.2.20'
3
+ load File.expand_path('lib/jrjackson/build_info.rb', File.dirname(__FILE__))
4
+ VERSION = ::JrJackson::BuildInfo.jar_version
4
5
  gemspec :jar => "jrjackson/jars/jrjackson-#{VERSION}.jar"
5
6
 
6
7
  # overwrite groupId:artifacgtId:version from gem
7
8
  id "com.jrjackson.jruby:jrjackson:#{VERSION}"
8
9
  packaging :jar
9
10
 
10
-
11
11
  properties 'project.build.sourceEncoding' => 'UTF-8',
12
- 'netbeans.hint.jdkPlatform' => 'JDK_1.8',
13
12
  # create a pom.xml from this here
14
13
  'polyglot.dump.pom' => 'pom.xml'
15
14
 
16
15
  jar 'junit:junit', '4.11', :scope => :test
17
16
 
18
- jar 'org.jruby:jruby', '9.1.5.0', :scope => :provided
17
+ jar 'org.jruby:jruby', '9.1.13.0', :scope => :provided
19
18
 
20
- plugin :compiler, '3.1', :source => '1.7', :target => '1.7',
19
+ plugin :compiler, '3.1', :source => '1.8', :target => '1.8',
21
20
  :showDeprecation => false,
22
21
  :showWarnings => false,
23
22
  :executable => '${JAVA_HOME}/bin/javac',
data/Rakefile CHANGED
@@ -1,10 +1,33 @@
1
- require 'rspec/core/rake_task'
2
1
  require 'bundler'
2
+ require 'ruby-maven'
3
+ require 'rake/testtask'
3
4
 
4
5
  Bundler::GemHelper.install_tasks
5
6
 
7
+ Rake::TestTask.new do |t|
8
+ t.pattern = "test/*_test.rb"
9
+ end
10
+
6
11
  desc "Run benchmarks"
7
12
  task :benchmark do
8
13
  load 'benchmarking/benchmark.rb'
9
14
  end
10
15
 
16
+ desc "Pack jar after compiling classes, use this to rebuild the pom.xml"
17
+ task :compile do
18
+ RubyMaven.exec('prepare-package')
19
+ end
20
+
21
+ desc "Clean build"
22
+ task :clean do
23
+ RubyMaven.exec('clean')
24
+ end
25
+
26
+ task :default => [ :compile ]
27
+
28
+ require 'rubygems/package_task'
29
+ Gem::PackageTask.new( eval File.read( 'jrjackson.gemspec' ) ) do
30
+ desc 'Pack gem'
31
+ task :package => [:compile]
32
+ end
33
+
data/changelog.md CHANGED
@@ -1,3 +1,7 @@
1
+ v0.4.3
2
+ bump Jackson to v2.9.1
3
+ make static_mapper public
4
+
1
5
  v0.4.1
2
6
  fix for issue 55
3
7
  Refactor AnySerializer acceptable class detection that does not use an exception
data/jrjackson.gemspec CHANGED
@@ -19,13 +19,12 @@ Gem::Specification.new do |s|
19
19
 
20
20
  s.add_development_dependency 'bundler', '~> 1.10'
21
21
  s.add_development_dependency 'jar-dependencies', '< 2.0', '>= 0.3.2'
22
- s.add_development_dependency 'ruby-maven', '~>3.3.10'
23
22
 
24
- JACKSON_VERSION = '2.7.3'
25
- s.requirements << "jar com.fasterxml.jackson.core:jackson-core, #{JACKSON_VERSION}"
26
- s.requirements << "jar com.fasterxml.jackson.core:jackson-annotations, #{JACKSON_VERSION}"
27
- s.requirements << "jar com.fasterxml.jackson.core:jackson-databind, #{JACKSON_VERSION}"
28
- s.requirements << "jar com.fasterxml.jackson.module:jackson-module-afterburner, #{JACKSON_VERSION}"
23
+ jackson_version = JrJackson::BuildInfo.jackson_version
24
+ s.requirements << "jar com.fasterxml.jackson.core:jackson-core, #{jackson_version}"
25
+ s.requirements << "jar com.fasterxml.jackson.core:jackson-annotations, #{jackson_version}"
26
+ s.requirements << "jar com.fasterxml.jackson.core:jackson-databind, #{jackson_version}"
27
+ s.requirements << "jar com.fasterxml.jackson.module:jackson-module-afterburner, #{jackson_version}"
29
28
 
30
29
  s.files = JrJackson::BuildInfo.files
31
30
 
data/lib/jrjackson/build_info.rb CHANGED
@@ -1,15 +1,23 @@
1
1
  module JrJackson
2
2
  module BuildInfo
3
3
  def self.version
4
- '0.4.2'
4
+ '0.4.3'
5
5
  end
6
6
 
7
7
  def self.release_date
8
- '2016-11-28'
8
+ '2017-09-21'
9
9
  end
10
10
 
11
11
  def self.files
12
12
  `git ls-files`.split($/).select{|f| f !~ /\Abenchmarking/}
13
13
  end
14
+
15
+ def self.jackson_version
16
+ '2.9.1'
17
+ end
18
+
19
+ def self.jar_version
20
+ '1.2.21'
21
+ end
14
22
  end
15
23
  end
data/lib/jrjackson/jrjackson.rb CHANGED
@@ -4,8 +4,9 @@ unless RUBY_PLATFORM =~ /java/
4
4
  end
5
5
 
6
6
  require "jrjackson_jars"
7
+ require_relative "build_info"
7
8
 
8
- require_relative "jars/jrjackson-1.2.20.jar"
9
+ require_relative "jars/jrjackson-#{JrJackson::BuildInfo.jar_version}.jar"
9
10
 
10
11
  require 'com/jrjackson/jr_jackson'
11
12
  require 'bigdecimal'
data/lib/jrjackson_jars.rb CHANGED
@@ -2,15 +2,15 @@
2
2
  begin
3
3
  require 'jar_dependencies'
4
4
  rescue LoadError
5
- require 'com/fasterxml/jackson/core/jackson-databind/2.7.3/jackson-databind-2.7.3.jar'
6
- require 'com/fasterxml/jackson/core/jackson-annotations/2.7.3/jackson-annotations-2.7.3.jar'
7
- require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.7.3/jackson-module-afterburner-2.7.3.jar'
8
- require 'com/fasterxml/jackson/core/jackson-core/2.7.3/jackson-core-2.7.3.jar'
5
+ require 'com/fasterxml/jackson/core/jackson-databind/2.9.1/jackson-databind-2.9.1.jar'
6
+ require 'com/fasterxml/jackson/core/jackson-annotations/2.9.1/jackson-annotations-2.9.1.jar'
7
+ require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.9.1/jackson-module-afterburner-2.9.1.jar'
8
+ require 'com/fasterxml/jackson/core/jackson-core/2.9.1/jackson-core-2.9.1.jar'
9
9
  end
10
10
 
11
11
  if defined? Jars
12
- require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.7.3' )
13
- require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.7.3' )
14
- require_jar( 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.7.3' )
15
- require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.7.3' )
12
+ require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.9.1' )
13
+ require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.9.1' )
14
+ require_jar( 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.1' )
15
+ require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.9.1' )
16
16
  end
data/pom.xml CHANGED
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
11
11
  <modelVersion>4.0.0</modelVersion>
12
12
  <groupId>com.jrjackson.jruby</groupId>
13
13
  <artifactId>jrjackson</artifactId>
14
- <version>1.2.20</version>
14
+ <version>1.2.21</version>
15
15
  <name>A JRuby wrapper for the java jackson json processor jar</name>
16
16
  <description>A mostly native JRuby wrapper for the java jackson json processor jar</description>
17
17
  <url>http://github.com/guyboertje/jrjackson</url>
@@ -31,10 +31,9 @@ DO NOT MODIFIY - GENERATED CODE
31
31
  <url>http://github.com/guyboertje/jrjackson</url>
32
32
  </scm>
33
33
  <properties>
34
- <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
35
34
  <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
36
35
  <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
37
- <jruby.plugins.version>1.1.4</jruby.plugins.version>
36
+ <jruby.plugins.version>1.1.5</jruby.plugins.version>
38
37
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
39
38
  </properties>
40
39
  <dependencies>
@@ -52,32 +51,25 @@ DO NOT MODIFIY - GENERATED CODE
52
51
  <type>gem</type>
53
52
  <scope>test</scope>
54
53
  </dependency>
55
- <dependency>
56
- <groupId>rubygems</groupId>
57
- <artifactId>ruby-maven</artifactId>
58
- <version>[3.3.10,3.3.99999]</version>
59
- <type>gem</type>
60
- <scope>test</scope>
61
- </dependency>
62
54
  <dependency>
63
55
  <groupId>com.fasterxml.jackson.core</groupId>
64
56
  <artifactId>jackson-core</artifactId>
65
- <version>2.7.3</version>
57
+ <version>2.9.1</version>
66
58
  </dependency>
67
59
  <dependency>
68
60
  <groupId>com.fasterxml.jackson.core</groupId>
69
61
  <artifactId>jackson-annotations</artifactId>
70
- <version>2.7.3</version>
62
+ <version>2.9.1</version>
71
63
  </dependency>
72
64
  <dependency>
73
65
  <groupId>com.fasterxml.jackson.core</groupId>
74
66
  <artifactId>jackson-databind</artifactId>
75
- <version>2.7.3</version>
67
+ <version>2.9.1</version>
76
68
  </dependency>
77
69
  <dependency>
78
70
  <groupId>com.fasterxml.jackson.module</groupId>
79
71
  <artifactId>jackson-module-afterburner</artifactId>
80
- <version>2.7.3</version>
72
+ <version>2.9.1</version>
81
73
  </dependency>
82
74
  <dependency>
83
75
  <groupId>junit</groupId>
@@ -88,7 +80,7 @@ DO NOT MODIFIY - GENERATED CODE
88
80
  <dependency>
89
81
  <groupId>org.jruby</groupId>
90
82
  <artifactId>jruby</artifactId>
91
- <version>9.1.5.0</version>
83
+ <version>9.1.13.0</version>
92
84
  <scope>provided</scope>
93
85
  </dependency>
94
86
  </dependencies>
@@ -126,7 +118,7 @@ DO NOT MODIFIY - GENERATED CODE
126
118
  </executions>
127
119
  <configuration>
128
120
  <outputDirectory>lib/jrjackson/jars</outputDirectory>
129
- <finalName>jrjackson-1.2.20</finalName>
121
+ <finalName>jrjackson-1.2.21</finalName>
130
122
  </configuration>
131
123
  </plugin>
132
124
  <plugin>
@@ -137,7 +129,7 @@ DO NOT MODIFIY - GENERATED CODE
137
129
  <fileset>
138
130
  <directory>lib/jrjackson/jars</directory>
139
131
  <includes>
140
- <include>jrjackson-1.2.20.jar</include>
132
+ <include>jrjackson-1.2.21.jar</include>
141
133
  <include>*/**/*.jar</include>
142
134
  </includes>
143
135
  </fileset>
@@ -156,8 +148,8 @@ DO NOT MODIFIY - GENERATED CODE
156
148
  <artifactId>maven-compiler-plugin</artifactId>
157
149
  <version>3.1</version>
158
150
  <configuration>
159
- <source>1.7</source>
160
- <target>1.7</target>
151
+ <source>1.8</source>
152
+ <target>1.8</target>
161
153
  <showDeprecation>false</showDeprecation>
162
154
  <showWarnings>false</showWarnings>
163
155
  <executable>${JAVA_HOME}/bin/javac</executable>
data/src/main/java/com/jrjackson/RubyJacksonModule.java CHANGED
@@ -2,22 +2,22 @@ package com.jrjackson;
2
2
 
3
3
  import com.fasterxml.jackson.core.JsonFactory;
4
4
  import com.fasterxml.jackson.core.Version;
5
+ import com.fasterxml.jackson.databind.DeserializationFeature;
5
6
  import com.fasterxml.jackson.databind.ObjectMapper;
6
- import com.fasterxml.jackson.databind.module.SimpleModule;
7
7
  import com.fasterxml.jackson.databind.SerializationFeature;
8
- import com.fasterxml.jackson.databind.DeserializationFeature;
8
+ import com.fasterxml.jackson.databind.module.SimpleModule;
9
9
  import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
10
10
  import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
11
- import java.text.SimpleDateFormat;
12
-
13
11
  import org.jruby.Ruby;
14
12
  import org.jruby.runtime.builtin.IRubyObject;
15
13
 
14
+ import java.text.SimpleDateFormat;
15
+
16
16
  public class RubyJacksonModule extends SimpleModule {
17
17
 
18
18
  private static final SimpleDateFormat RDF = new RubyDateFormat("yyyy-MM-dd HH:mm:ss Z");
19
19
 
20
- private static final ObjectMapper static_mapper = new ObjectMapper();
20
+ public static final ObjectMapper static_mapper = new ObjectMapper();
21
21
  public static final JsonFactory factory = new JsonFactory(static_mapper).disable(JsonFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW);
22
22
 
23
23
  static {
metadata CHANGED
@@ -1,19 +1,19 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jrjackson
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.2
4
+ version: 0.4.3
5
5
  platform: java
6
6
  authors:
7
7
  - Guy Boertje
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-11-28 00:00:00.000000000 Z
11
+ date: 2017-09-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
15
15
  requirements:
16
- - - ~>
16
+ - - "~>"
17
17
  - !ruby/object:Gem::Version
18
18
  version: '1.10'
19
19
  name: bundler
@@ -21,16 +21,16 @@ dependencies:
21
21
  type: :development
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.10'
27
27
  - !ruby/object:Gem::Dependency
28
28
  requirement: !ruby/object:Gem::Requirement
29
29
  requirements:
30
- - - <
30
+ - - "<"
31
31
  - !ruby/object:Gem::Version
32
32
  version: '2.0'
33
- - - '>='
33
+ - - ">="
34
34
  - !ruby/object:Gem::Version
35
35
  version: 0.3.2
36
36
  name: jar-dependencies
@@ -38,26 +38,12 @@ dependencies:
38
38
  type: :development
39
39
  version_requirements: !ruby/object:Gem::Requirement
40
40
  requirements:
41
- - - <
41
+ - - "<"
42
42
  - !ruby/object:Gem::Version
43
43
  version: '2.0'
44
- - - '>='
44
+ - - ">="
45
45
  - !ruby/object:Gem::Version
46
46
  version: 0.3.2
47
- - !ruby/object:Gem::Dependency
48
- requirement: !ruby/object:Gem::Requirement
49
- requirements:
50
- - - ~>
51
- - !ruby/object:Gem::Version
52
- version: 3.3.10
53
- name: ruby-maven
54
- prerelease: false
55
- type: :development
56
- version_requirements: !ruby/object:Gem::Requirement
57
- requirements:
58
- - - ~>
59
- - !ruby/object:Gem::Version
60
- version: 3.3.10
61
47
  description: A mostly native JRuby wrapper for the java jackson json processor jar
62
48
  email:
63
49
  - guyboertje@gmail.com
@@ -65,9 +51,8 @@ executables: []
65
51
  extensions: []
66
52
  extra_rdoc_files: []
67
53
  files:
68
- - .gitignore
69
- - .jrubyr_c
70
- - .mvn/extensions.xml
54
+ - ".gitignore"
55
+ - ".jrubyr_c"
71
56
  - Gemfile
72
57
  - Mavenfile
73
58
  - README.md
@@ -76,12 +61,16 @@ files:
76
61
  - changelog.md
77
62
  - jrjackson.gemspec
78
63
  - lib/com/fasterxml/jackson/core/jackson-annotations/2.7.3/jackson-annotations-2.7.3.jar
64
+ - lib/com/fasterxml/jackson/core/jackson-annotations/2.9.1/jackson-annotations-2.9.1.jar
79
65
  - lib/com/fasterxml/jackson/core/jackson-core/2.7.3/jackson-core-2.7.3.jar
66
+ - lib/com/fasterxml/jackson/core/jackson-core/2.9.1/jackson-core-2.9.1.jar
80
67
  - lib/com/fasterxml/jackson/core/jackson-databind/2.7.3/jackson-databind-2.7.3.jar
68
+ - lib/com/fasterxml/jackson/core/jackson-databind/2.9.1/jackson-databind-2.9.1.jar
81
69
  - lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.7.3/jackson-module-afterburner-2.7.3.jar
70
+ - lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.1/jackson-module-afterburner-2.9.1.jar
82
71
  - lib/jrjackson.rb
83
72
  - lib/jrjackson/build_info.rb
84
- - lib/jrjackson/jars/jrjackson-1.2.20.jar
73
+ - lib/jrjackson/jars/jrjackson-1.2.21.jar
85
74
  - lib/jrjackson/jrjackson.rb
86
75
  - lib/jrjackson_jars.rb
87
76
  - lib/require_relative_patch.rb
@@ -140,23 +129,22 @@ require_paths:
140
129
  - lib
141
130
  required_ruby_version: !ruby/object:Gem::Requirement
142
131
  requirements:
143
- - - '>='
132
+ - - ">="
144
133
  - !ruby/object:Gem::Version
145
134
  version: '0'
146
135
  required_rubygems_version: !ruby/object:Gem::Requirement
147
136
  requirements:
148
- - - '>='
137
+ - - ">="
149
138
  - !ruby/object:Gem::Version
150
139
  version: '0'
151
140
  requirements:
152
- - jar com.fasterxml.jackson.core:jackson-core, 2.7.3
153
- - jar com.fasterxml.jackson.core:jackson-annotations, 2.7.3
154
- - jar com.fasterxml.jackson.core:jackson-databind, 2.7.3
155
- - jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.7.3
141
+ - jar com.fasterxml.jackson.core:jackson-core, 2.9.1
142
+ - jar com.fasterxml.jackson.core:jackson-annotations, 2.9.1
143
+ - jar com.fasterxml.jackson.core:jackson-databind, 2.9.1
144
+ - jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.1
156
145
  rubyforge_project:
157
- rubygems_version: 2.4.8
146
+ rubygems_version: 2.6.13
158
147
  signing_key:
159
148
  specification_version: 4
160
149
  summary: A JRuby wrapper for the java jackson json processor jar
161
150
  test_files: []
162
- has_rdoc:
data/.mvn/extensions.xml DELETED
@@ -1,8 +0,0 @@
1
- <?xml version="1.0" encoding="UTF-8"?>
2
- <extensions>
3
- <extension>
4
- <groupId>io.takari.polyglot</groupId>
5
- <artifactId>polyglot-ruby</artifactId>
6
- <version>0.1.15</version>
7
- </extension>
8
- </extensions>