From 6a5eb2a743dc4117fd81fdb68eea0c3fb861a903 Mon Sep 17 00:00:00 2001 From: Nick Muerdter Date: Sat, 4 Feb 2017 15:46:30 -0700 Subject: [PATCH] Update dependencies. --- Gemfile | 4 +- Gemfile.lock | 12 ++--- build/cmake/versions.cmake | 12 ++--- src/api-umbrella/web-app/Gemfile | 21 ++------ src/api-umbrella/web-app/Gemfile.lock | 73 ++++++++------------------- 5 files changed, 39 insertions(+), 83 deletions(-) diff --git a/Gemfile b/Gemfile index 4c8849db7..6930f2b16 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem "multi_json", "~> 1.12.1" gem "oj", "~> 2.18.1" # Database libraries -gem "mongoid", "~> 6.0.3" +gem "mongoid", "~> 6.1.0" gem "elasticsearch", "~> 2.0.1" gem "elasticsearch-persistence", "~> 0.1.9" @@ -42,7 +42,7 @@ gem "database_cleaner", "~> 1.5.3" gem "rails_compatible_cookies_utils", "~> 0.1.0" # Localization tests -gem "i18n", "~> 0.7.0" +gem "i18n", "~> 0.8.0" # URL parsing/generation gem "addressable", "~> 2.5.0" diff --git a/Gemfile.lock b/Gemfile.lock index 08270b76a..7319beeea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,8 +76,8 @@ GEM faraday (0.11.0) multipart-post (>= 1.2, < 3) ffi (1.9.17) - hashie (3.4.6) - i18n (0.7.0) + hashie (3.5.1) + i18n (0.8.0) ice_nine (0.11.2) launchy (2.4.3) addressable (~> 2.3) @@ -97,9 +97,9 @@ GEM ruby-progressbar mongo (2.4.1) bson (>= 4.2.1, < 5.0.0) - mongoid (6.0.3) + mongoid (6.1.0) activemodel (~> 5.0) - mongo (~> 2.3) + mongo (>= 2.4.1, < 3.0.0) multi_json (1.12.1) multipart-post (2.0.0) nokogiri (1.7.0.1) @@ -160,14 +160,14 @@ DEPENDENCIES elasticsearch-persistence (~> 0.1.9) factory_girl (~> 4.8.0) faker (~> 1.7.2) - i18n (~> 0.7.0) + i18n (~> 0.8.0) lazyhash (~> 0.1.1) minitest (~> 5.10.1) minitest-capybara (~> 0.8.2)! minitest-ci (~> 3.1.0) minitest-hooks (~> 1.4.0) minitest-reporters (~> 1.1.14) - mongoid (~> 6.0.3) + mongoid (~> 6.1.0) multi_json (~> 1.12.1) nokogiri (~> 1.7.0) oj (~> 2.18.1) diff --git a/build/cmake/versions.cmake b/build/cmake/versions.cmake index c99cd1ae6..a2c3f9c14 100644 --- a/build/cmake/versions.cmake +++ b/build/cmake/versions.cmake @@ -11,8 +11,8 @@ set(JSON_C_VERSION 0.12.1) set(JSON_C_HASH 5a617da9aade997938197ef0f8aabd7f97b670c216dc173977e1d56eef9e1291) set(GLIDE_VERSION 0.12.3) set(GLIDE_HASH 6bf0971dc56fb8ce0c4ba5d20e9ac0f7) -set(GOLANG_VERSION 1.7.4) -set(GOLANG_HASH 47fda42e46b4c3ec93fa5d4d4cc6a748aa3f9411a2a2b7e08e3a6d80d753ec8b) +set(GOLANG_VERSION 1.7.5) +set(GOLANG_HASH 2e4dd6c44f0693bef4e7b46cc701513d74c3cc44f2419bf519d7868b12931ac3) set(KYLIN_VERSION 1.6.0) set(KYLIN_HASH 3f15f35c5ad7168ab401858dd8759dee) set(LIBCIDR_VERSION 1.2.3) @@ -70,16 +70,16 @@ set(MAVEN_HASH 516923b3955b6035ba6b0a5b031fbd8b) set(MAILHOG_VERSION 0.2.1) set(MAILHOG_HASH 6602fd7f69276e7efba310362e958133) set(MONGO_ORCHESTRATION_VERSION 0.6.7) -set(MONGODB_VERSION 3.2.11) -set(MONGODB_HASH 9916a076bd2e2fa8e8fbad94bb083fae) +set(MONGODB_VERSION 3.2.12) +set(MONGODB_HASH 0cc86a1a93177185a682ff157e98e450) set(MORA_VERSION a4543bce9676b367ca2af7fcad0589dc87c3d60d) set(MORA_HASH 99f1c5c2026d202d253976ba43b94c6f) set(NGX_DYUPS_VERSION 77899d31d47967811870b60247a864912d18d6d8) set(NGX_DYUPS_HASH ed0944ce196353898518a4aeee395136) set(NGX_TXID_VERSION f1c197cb9c42e364a87fbb28d5508e486592ca42) set(NGX_TXID_HASH 408ee86eb6e42e27a51514f711c41d6b) -set(NODEJS_VERSION 6.9.4) -set(NODEJS_HASH d28c331e1af88468e8220477e9b4d48d4ce041855b9c939ea2320de2929e7ce1) +set(NODEJS_VERSION 6.9.5) +set(NODEJS_HASH 4831ba1a9f678f91dd7e2516eaa781341651b91ac908121db902f5355f0211d8) set(OPENRESTY_VERSION 1.11.2.2) set(OPENRESTY_HASH f4b9aa960e57ca692c4d3da731b7e38b) set(OPENSSL_VERSION 1.0.2k) diff --git a/src/api-umbrella/web-app/Gemfile b/src/api-umbrella/web-app/Gemfile index c39066d26..d5be3c0ce 100644 --- a/src/api-umbrella/web-app/Gemfile +++ b/src/api-umbrella/web-app/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 4.2.7.1" # Rails app server -gem "puma", "~> 3.6.2" +gem "puma", "~> 3.7.0" # Error notification service (optional) gem "rollbar", "~> 2.14.0" @@ -22,10 +22,10 @@ gem "oj", "~> 2.18.1", :platforms => [:ruby] gem "oj_mimic_json", "~> 1.0.1", :platforms => [:ruby] # SQL escape libraries for Kylin analytics. -gem "sequel", "~> 4.42.1" +gem "sequel", "~> 4.43.0" # MongoDB -gem "mongoid", "~> 5.1.6" +gem "mongoid", "~> 5.2.0" # Soft-delete gem "mongoid-paranoia", "~> 2.0.0" @@ -34,10 +34,7 @@ gem "mongoid-paranoia", "~> 2.0.0" gem "mongoid_delorean", "~> 1.3.0" # Display deeply nested validation errors on embedded documents. -# -# Fork to fix Mongoid 4+ compatibility: -# https://github.com/glooko/mongoid-embedded-errors/pull/6 -gem "mongoid-embedded-errors", "~> 2.0.1", :git => "https://github.com/calfzhou/mongoid-embedded-errors.git" +gem "mongoid-embedded-errors", "~> 2.1.1" # Data migrations gem "mongoid_rails_migrations", "~> 1.1.0" @@ -61,9 +58,7 @@ gem "devise", "~> 4.2.0" gem "omniauth", "~> 1.3.2" gem "omniauth-cas", "~> 1.1.0", :git => "https://github.com/GUI/omniauth-cas.git", :branch => "rexml", :require => false gem "omniauth-facebook", "~> 4.0.0", :require => false -# Use master for e-mail verification: -# https://github.com/intridea/omniauth-github/pull/48 -gem "omniauth-github", :git => "https://github.com/intridea/omniauth-github.git", :require => false +gem "omniauth-github", "~> 1.2.0" gem "omniauth-google-oauth2", "~> 0.4.1", :require => false gem "omniauth-ldap", "~> 1.0.5", :require => false gem "omniauth-twitter", "~> 1.3.0", :require => false @@ -127,9 +122,3 @@ group :development, :test do # Debug inspecting/printing. gem "awesome_print", "~> 1.7.0" end - -group :development do - # Deployment - gem "capistrano", "~> 3.7.1" - gem "capistrano-rails", "~> 1.2.2" -end diff --git a/src/api-umbrella/web-app/Gemfile.lock b/src/api-umbrella/web-app/Gemfile.lock index 9cfdbfe8c..2fc8821ec 100644 --- a/src/api-umbrella/web-app/Gemfile.lock +++ b/src/api-umbrella/web-app/Gemfile.lock @@ -23,21 +23,6 @@ GIT activesupport (>= 3) mongoid (>= 3) -GIT - remote: https://github.com/calfzhou/mongoid-embedded-errors.git - revision: 4add4cd70154c34f79b5db8781ef0b13da23cec9 - specs: - mongoid-embedded-errors (2.0.1) - mongoid (>= 3.0.0) - -GIT - remote: https://github.com/intridea/omniauth-github.git - revision: 45f2fc73d6d06f30863adac0e6aa112bcaaadf67 - specs: - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (>= 1.1.1, < 2.0) - GIT remote: https://github.com/zerowidth/lucene_query_parser.git revision: ef723c40103203a55f85b3ec02743b17d4d5e773 @@ -86,38 +71,23 @@ GEM tzinfo (~> 1.1) addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) - airbrussh (1.1.2) - sshkit (>= 1.6.1, != 1.7.0) arel (6.0.4) awesome_print (1.7.0) bcrypt (3.1.11) blankslate (3.1.3) - brakeman (3.4.1) + brakeman (3.5.0) bson (4.2.1) builder (3.2.3) bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - capistrano (3.7.1) - airbrussh (>= 1.0.0) - capistrano-harrow - i18n - rake (>= 10.0.0) - sshkit (>= 1.9.0) - capistrano-bundler (1.2.0) - capistrano (~> 3.1) - sshkit (~> 1.2) - capistrano-harrow (0.5.3) - capistrano-rails (1.2.2) - capistrano (~> 3.1) - capistrano-bundler (~> 1.1) concurrent-ruby (1.0.4) countries (2.0.6) i18n_data (~> 0.7.0) money (~> 6.7) sixarm_ruby_unaccent (~> 1.1) unicode_utils (~> 1.4) - css_parser (1.4.7) + css_parser (1.4.8) addressable csv_builder (2.1.1) actionpack (>= 3.0.0) @@ -147,7 +117,7 @@ GEM multipart-post (>= 1.2, < 3) globalid (0.3.7) activesupport (>= 4.1.0) - hashie (3.4.6) + hashie (3.5.1) htmlentities (4.3.4) http_accept_language (2.1.0) i18n (0.7.0) @@ -174,14 +144,16 @@ GEM sixarm_ruby_unaccent (>= 1.1.1, < 2) mongo (2.4.1) bson (>= 4.2.1, < 5.0.0) - mongoid (5.1.6) + mongoid (5.2.0) activemodel (~> 4.0) - mongo (~> 2.1) - origin (~> 2.2) + mongo (>= 2.4.1, < 3.0.0) + origin (~> 2.3) tzinfo (>= 0.3.37) mongoid-compatibility (0.4.1) activesupport mongoid (>= 2.0) + mongoid-embedded-errors (2.1.1) + mongoid (>= 3.0) mongoid-paranoia (2.0.0) activesupport (~> 4.0) mongoid (>= 4.0.0, <= 6.0.0) @@ -197,9 +169,6 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) net-ldap (0.15.0) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.0.1) nokogiri (1.7.0.1) mini_portile2 (~> 2.1.0) non-stupid-digest-assets (1.0.9) @@ -218,6 +187,9 @@ GEM rack (>= 1.0, < 3) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) + omniauth-github (1.2.0) + omniauth (~> 1.3.2) + omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-google-oauth2 (0.4.1) jwt (~> 1.5.2) multi_json (~> 1.3) @@ -241,14 +213,14 @@ GEM orm_adapter (0.5.0) parslet (1.7.1) blankslate (>= 2.0, <= 4.0) - premailer (1.9.1) - css_parser (>= 1.4.5) + premailer (1.9.2) + css_parser (>= 1.4.8) htmlentities (>= 4.0.0) premailer-rails (1.9.5) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) public_suffix (2.0.5) - puma (3.6.2) + puma (3.7.0) pundit (1.1.0) activesupport (>= 3.0.0) pyu-ruby-sasl (0.0.3.3) @@ -294,7 +266,7 @@ GEM multi_json rubyntlm (0.3.4) safe_yaml (1.0.4) - sequel (4.42.1) + sequel (4.43.0) sixarm_ruby_unaccent (1.1.1) sprockets (3.7.1) concurrent-ruby (~> 1.0) @@ -303,9 +275,6 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.11.5) - net-scp (>= 1.1.2) - net-ssh (>= 2.8.0) thor (0.19.4) thread_safe (0.3.5) tzinfo (1.2.2) @@ -321,8 +290,6 @@ DEPENDENCIES awesome_print (~> 1.7.0) brakeman bundler-audit - capistrano (~> 3.7.1) - capistrano-rails (~> 1.2.2) countries (~> 2.0.6) csv_builder (~> 2.1.1) daemons (~> 1.2.4) @@ -334,8 +301,8 @@ DEPENDENCIES jbuilder (~> 2.6.0) kramdown (~> 1.13.2) lucene_query_parser! - mongoid (~> 5.1.6) - mongoid-embedded-errors (~> 2.0.1)! + mongoid (~> 5.2.0) + mongoid-embedded-errors (~> 2.1.1) mongoid-paranoia (~> 2.0.0) mongoid-store! mongoid_delorean (~> 1.3.0) @@ -348,12 +315,12 @@ DEPENDENCIES omniauth (~> 1.3.2) omniauth-cas (~> 1.1.0)! omniauth-facebook (~> 4.0.0) - omniauth-github! + omniauth-github (~> 1.2.0) omniauth-google-oauth2 (~> 0.4.1) omniauth-ldap (~> 1.0.5) omniauth-twitter (~> 1.3.0) premailer-rails (~> 1.9.5) - puma (~> 3.6.2) + puma (~> 3.7.0) pundit (~> 1.1.0) rabl (~> 0.13.1) rack-proxy (~> 0.6.0) @@ -364,7 +331,7 @@ DEPENDENCIES rollbar (~> 2.14.0) safe_yaml (~> 1.0.4) seed-fu! - sequel (~> 4.42.1) + sequel (~> 4.43.0) BUNDLED WITH 1.14.3