Skip to content

Commit

Permalink
Revert Gemfile tag reference update and put back branch reference
Browse files Browse the repository at this point in the history
  • Loading branch information
simaishi committed Aug 11, 2020
1 parent 2a4c49e commit 14508c7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundle
#
# VMDB specific gems
#
gem "manageiq-gems-pending", ">0", :require => 'manageiq-gems-pending', :git => "https://github.com/ManageIQ/manageiq-gems-pending.git", :tag => "jansa-1-rc2"
gem "manageiq-gems-pending", ">0", :require => 'manageiq-gems-pending', :git => "https://github.com/ManageIQ/manageiq-gems-pending.git", :branch => "jansa"

# Modified gems for gems-pending. Setting sources here since they are git references
gem "handsoap", "=0.2.5.5", :require => false, :source => "https://rubygems.manageiq.org"

# when using this Gemfile inside a providers Gemfile, the dependency for the provider is already declared
def manageiq_plugin(plugin_name)
unless dependencies.detect { |d| d.name == plugin_name }
gem plugin_name, :git => "https://github.com/ManageIQ/#{plugin_name}", :tag => "jansa-1-rc2"
gem plugin_name, :git => "https://github.com/ManageIQ/#{plugin_name}", :branch => "jansa"
end
end

Expand Down Expand Up @@ -94,7 +94,7 @@ gem "american_date"
### providers
group :amazon, :manageiq_default do
manageiq_plugin "manageiq-providers-amazon"
gem "amazon_ssa_support", :require => false, :git => "https://github.com/ManageIQ/amazon_ssa_support.git", :tag => "jansa-1-rc2" # Temporary dependency to be moved to manageiq-providers-amazon when officially release
gem "amazon_ssa_support", :require => false, :git => "https://github.com/ManageIQ/amazon_ssa_support.git", :branch => "jansa" # Temporary dependency to be moved to manageiq-providers-amazon when officially release
end

group :ansible_tower, :manageiq_default do
Expand Down

0 comments on commit 14508c7

Please sign in to comment.