This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch ldapversion in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 08573e25d93beb9dedf6be20d9d95ae2be638784 Author: Sebb <s...@apache.org> AuthorDate: Sat May 4 22:59:41 2024 +0100 Allow update to ruby-ldap version --- asf.gemspec | 10 ++++++++-- lib/Gemfile | 9 ++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/asf.gemspec b/asf.gemspec index 6ac263a2..fa2529e6 100644 --- a/asf.gemspec +++ b/asf.gemspec @@ -1,10 +1,16 @@ version = File.read(File.expand_path('../asf.version', __FILE__)).strip +ldapversion = +begin + File.read(File.expand_path('../asfldap.version', __FILE__)).strip +rescue Exception => e + nil +end Gem::Specification.new do |s| # Change these as appropriate s.name = "whimsy-asf" - s.license = 'Apache License, Version 2.0' + s.license = 'Apache-2.0' s.version = version s.summary = "Whimsy 'model' of the ASF" s.author = "Sam Ruby" @@ -23,7 +29,7 @@ Gem::Specification.new do |s| # relevant versions s.add_dependency("nokogiri") s.add_dependency("rack") - s.add_dependency("ruby-ldap") + s.add_dependency("ruby-ldap", ldapversion) s.add_dependency("tzinfo") s.add_dependency("tzinfo-data") s.add_dependency("wunderbar") diff --git a/lib/Gemfile b/lib/Gemfile index bc814767..7d8dfc35 100644 --- a/lib/Gemfile +++ b/lib/Gemfile @@ -1,10 +1,17 @@ source 'https://rubygems.org' +ldapversion = +begin + File.read(File.expand_path('../../asfldap.version', __FILE__)).strip +rescue Exception => e + nil +end + # lib needs these at run-time gem 'json' gem 'nokogiri' gem 'rake' -gem 'ruby-ldap' +gem 'ruby-ldap', ldapversion gem 'wunderbar' gem 'pdf-reader'