Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Jackson to v2.9.4 to resolve CVE-2017-15095 et al #67

Merged
merged 3 commits into from
Feb 19, 2018
Merged

Bump Jackson to v2.9.4 to resolve CVE-2017-15095 et al #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e470c7
ignore removed package time files
Feb 16, 2018
bdcae1e
Bump Jackson version to 2.9.4
Feb 16, 2018
46074b7
add explicit references to jackson version when including jars in gem
Feb 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ Rakefile.old
linked
/libyjpagent.so
/.project

lib/jrjackson_jars.rb
lib/com/fasterxml/jackson/
lib/jrjackson/jars/jrjackson-*.jar
pom.xml
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you sure you want that in the .gitignore?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I think so. They are only needed during the package phase. AFACT they don't need to be in Github. No?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

1 change: 0 additions & 1 deletion jrjackson.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,4 @@ Gem::Specification.new do |s|
s.requirements << "jar com.fasterxml.jackson.module:jackson-module-afterburner, #{jackson_version}"

s.files = JrJackson::BuildInfo.files

end
30 changes: 25 additions & 5 deletions lib/jrjackson/build_info.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,43 @@
module JrJackson
module BuildInfo
def self.version
'0.4.4'
'0.4.5'
end

def self.release_date
'2017-10-06'
'2018-02-17'
end

def self.files
`git ls-files`.split($/).select{|f| f !~ /\Abenchmarking/}
git_files.concat(generated_jar_files).concat(generated_files)
end

def self.jackson_version
'2.9.1'
'2.9.4'
end

def self.jar_version
'1.2.22'
'1.2.23'
end

private

def self.generated_files
Dir.glob( %w(pom.xml lib/jrjackson_jars.rb) )
end

def self.git_files
`git ls-files`.split($/).reject{|s| s.start_with?("benchmarking")}
end

def self.generated_jar_files
[
"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/module/jackson-module-afterburner/#{jackson_version}/jackson-module-afterburner-#{jackson_version}.jar",
"lib/jrjackson/jars/jrjackson-#{jar_version}.jar"
]
end
end
end