Merge pull request #4474 from chef/jk/bump-12.7.0

Bump version to 12.7.0, and make "rake version" use just one VERSION file

5 files changed, 9 insertions, 11 deletions

diff --git a/VERSION b/VERSION
index 062985d417..e12d94fbf3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.6.0
+12.7.0
diff --git a/chef-config/VERSION b/chef-config/VERSION
deleted file mode 100644
index 062985d417..0000000000
--- a/chef-config/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-12.6.0
diff --git a/chef-config/lib/chef-config/package_task.rb b/chef-config/lib/chef-config/package_task.rb
index 59620ad03a..37eed6415a 100644
--- a/chef-config/lib/chef-config/package_task.rb
+++ b/chef-config/lib/chef-config/package_task.rb
@@ -47,10 +47,6 @@ module ChefConfig
       @module_path || module_name.downcase
     end
 
-    # Path to a VERSION file with a single string that contains the package version.
-    # By default, this is root_path/VERSION
-    attr_accessor :version_file_path
-
     # Directory used to store package files and output that is generated.
     # This has the same meaning (or lack thereof) as package_dir in
     # rake/packagetask.
@@ -70,7 +66,6 @@ module ChefConfig
       @module_name = module_name
       @component_paths = []
       @module_path = nil
-      @version_file_path = "VERSION"
       @package_dir = "pkg"
       @git_remote = "origin"
       @generate_version_class = false
@@ -84,8 +79,12 @@ module ChefConfig
       File.expand_path("lib/#{module_path}/version.rb", root_path)
     end
 
+    def chef_root_path
+      module_name == "Chef" ? root_path : File.dirname(root_path)
+    end
+
     def version
-      IO.read(File.expand_path(version_file_path, root_path)).strip
+      IO.read(File.join(chef_root_path, "VERSION")).strip
     end
 
     def full_package_dir
@@ -175,7 +174,7 @@ module ChefConfig
 
 #{class_or_module} #{module_name}
   #{module_name.upcase}_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '#{version}'
+  VERSION = "#{version}"
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index dd2a5bb9ad..cb93b06432 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = "12.6.0"
+  VERSION = "12.7.0"
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0a7b5f66e0..a466ce6c91 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = "12.6.0"
+  VERSION = "12.7.0"
 end
 
 #