Merge pull request #11948 from chef/lcg/maintest2

Other fixes for branch renaming

6 files changed, 17 insertions, 16 deletions

diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec
index cf83b360df..0cd5b263b8 100644
--- a/chef-config/chef-config.gemspec
+++ b/chef-config/chef-config.gemspec
@@ -16,10 +16,10 @@ Gem::Specification.new do |spec|
 
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/chef/chef/issues",
-    "changelog_uri" => "https://github.com/chef/chef/blob/master/CHANGELOG.md",
-    "documentation_uri" => "https://github.com/chef/chef/tree/master/chef-config/README.md",
-    "homepage_uri" => "https://github.com/chef/chef/tree/master/chef-config",
-    "source_code_uri" => "https://github.com/chef/chef/tree/master/chef-config",
+    "changelog_uri" => "https://github.com/chef/chef/blob/main/CHANGELOG.md",
+    "documentation_uri" => "https://github.com/chef/chef/tree/main/chef-config/README.md",
+    "homepage_uri" => "https://github.com/chef/chef/tree/main/chef-config",
+    "source_code_uri" => "https://github.com/chef/chef/tree/main/chef-config",
   }
 
   spec.require_paths = ["lib"]
diff --git a/chef-utils/README.md b/chef-utils/README.md
index 34d246e23f..75c9149865 100644
--- a/chef-utils/README.md
+++ b/chef-utils/README.md
@@ -1,12 +1,12 @@
 # Chef Utils gem
 
-**Umbrella Project**: [Chef Infra](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-infra.md)
+**Umbrella Project**: [Chef Infra](https://github.com/chef/chef-oss-practices/blob/main/projects/chef-infra.md)
 
-**Project State**: [Active](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md#active)
+**Project State**: [Active](https://github.com/chef/chef-oss-practices/blob/main/repo-management/repo-states.md#active)
 
-**Issues [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
+**Issues [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/main/repo-management/repo-states.md)**: 14 days
 
-**Pull Request [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
+**Pull Request [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/main/repo-management/repo-states.md)**: 14 days
 
 ## Getting Started
 
diff --git a/chef-utils/chef-utils.gemspec b/chef-utils/chef-utils.gemspec
index 8cbae405e3..e885aae175 100644
--- a/chef-utils/chef-utils.gemspec
+++ b/chef-utils/chef-utils.gemspec
@@ -10,17 +10,17 @@ Gem::Specification.new do |spec|
   spec.email         = ["oss@chef.io"]
 
   spec.summary       = %q{Basic utility functions for Core Chef Infra development}
-  spec.homepage      = "https://github.com/chef/chef/tree/master/chef-utils"
+  spec.homepage      = "https://github.com/chef/chef/tree/main/chef-utils"
   spec.license       = "Apache-2.0"
 
   spec.required_ruby_version = ">= 2.6"
 
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/chef/chef/issues",
-    "changelog_uri" => "https://github.com/chef/chef/blob/master/CHANGELOG.md",
-    "documentation_uri" => "https://github.com/chef/chef/tree/master/chef-utils/README.md",
-    "homepage_uri" => "https://github.com/chef/chef/tree/master/chef-utils",
-    "source_code_uri" => "https://github.com/chef/chef/tree/master/chef-utils",
+    "changelog_uri" => "https://github.com/chef/chef/blob/main/CHANGELOG.md",
+    "documentation_uri" => "https://github.com/chef/chef/tree/main/chef-utils/README.md",
+    "homepage_uri" => "https://github.com/chef/chef/tree/main/chef-utils",
+    "source_code_uri" => "https://github.com/chef/chef/tree/main/chef-utils",
   }
 
   spec.require_paths = ["lib"]
diff --git a/knife/Gemfile b/knife/Gemfile
index 0eda3c8e5f..a2321726c7 100644
--- a/knife/Gemfile
+++ b/knife/Gemfile
@@ -17,10 +17,10 @@ group(:omnibus_package, :pry) do
 end
 
 group(:chefstyle) do
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "main"
 end
 
-gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main"
 gem "chef", path: ".."
 gem "chef-utils", path: File.expand_path("../chef-utils", __dir__) if File.exist?(File.expand_path("../chef-utils", __dir__))
 gem "chef-config", path: File.expand_path("../chef-config", __dir__) if File.exist?(File.expand_path("../chef-config", __dir__))
diff --git a/knife/knife.gemspec b/knife/knife.gemspec
index 3b7f62e48f..b44635e7ae 100644
--- a/knife/knife.gemspec
+++ b/knife/knife.gemspec
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
 
   s.metadata = {
     "bug_tracker_uri"   => "https://github.com/chef/chef/issues",
-    "changelog_uri"     => "https://github.com/chef/chef/blob/master/CHANGELOG.md",
+    "changelog_uri"     => "https://github.com/chef/chef/blob/main/CHANGELOG.md",
     "documentation_uri" => "https://docs.chef.io/",
     "homepage_uri"      => "https://www.chef.io",
     "mailing_list_uri"  => "https://discourse.chef.io/",
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 127c6bf24e..b536b58fd5 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,3 +1,4 @@
+
 # THIS IS NOW HAND MANAGED, JUST EDIT THE THING
 # keep it machine-parsable since CI uses it
 #