Merge pull request #203 from katmsft/prvalidation

katmsft · web-flow · commit dfcac5656942 · 2021-10-28T17:09:05.000+08:00
Update gemspecs to resolve dependency hell for nokogiri.
diff --git a/blob/ChangeLog.md b/blob/ChangeLog.md
@@ -1,5 +1,6 @@
 2021.10 - version 2.0.2
-* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+* Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+* Added access tier information and creation time of blob in response.
 
 2020.8 - version 2.0.1
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
diff --git a/common/ChangeLog.md b/common/ChangeLog.md
@@ -1,5 +1,6 @@
 2021.10 - version 2.0.3
-* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+* Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+* Fixed handling of invalid connection strings
 
 2020.8 - version 2.0.2
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
diff --git a/common/azure-storage-common.gemspec b/common/azure-storage-common.gemspec
@@ -46,6 +46,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("net-http-persistent",     '~> 4.0')
   if RUBY_VERSION < "2.4.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  elsif RUBY_VERSION < "2.5.0"
+    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
   else
     s.add_runtime_dependency("nokogiri",                "~> 1", ">= 1.12.5")
   end
diff --git a/file/ChangeLog.md b/file/ChangeLog.md
@@ -1,5 +1,5 @@
 2021.10 - version 2.0.3
-* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+* Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
 
 2020.8 - version 2.0.2
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
diff --git a/file/azure-storage-file.gemspec b/file/azure-storage-file.gemspec
@@ -43,6 +43,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
   if RUBY_VERSION < "2.4.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  elsif RUBY_VERSION < "2.5.0"
+    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
   else
     s.add_runtime_dependency("nokogiri",                "~> 1", ">= 1.12.5")
   end
diff --git a/queue/ChangeLog.md b/queue/ChangeLog.md
@@ -1,5 +1,5 @@
 2021.10 - version 2.0.3
-* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+* Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
 
 2020.8 - version 2.0.2
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
diff --git a/queue/azure-storage-queue.gemspec b/queue/azure-storage-queue.gemspec
@@ -43,6 +43,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
   if RUBY_VERSION < "2.4.0"
     s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  elsif RUBY_VERSION < "2.5.0"
+    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
   else
     s.add_runtime_dependency("nokogiri",                "~> 1", ">= 1.12.5")
   end
diff --git a/table/ChangeLog.md b/table/ChangeLog.md
@@ -1,5 +1,5 @@
 2021.10 - version 2.0.3
-* Allow to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
+* Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
 
 2020.8 - version 2.0.2
 * Bumped up Nokogiri version to 1.11.0.rc2 for Ruby version later than or equal to 2.4.0.
