From 478dbd32f22bfcdaba67ebc482c2162ff7e00edc Mon Sep 17 00:00:00 2001
From: Matt Buck <Matthew_Buck@rapid7.com>
Date: Fri, 3 Oct 2014 12:07:23 -0500
Subject: [PATCH] Bump to newly-released versions of gems

MSP-11412
---
 Gemfile                      |  4 ++--
 Gemfile.lock                 | 26 +++++++++++++-------------
 metasploit-framework.gemspec |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1e1933fccc..d52e81aa2b 100755
--- a/Gemfile
+++ b/Gemfile
@@ -8,9 +8,9 @@ group :db do
   gem 'activerecord', '>= 3.0.0', '< 4.0.0'
 
   # Metasploit::Credential database models
-  gem 'metasploit-credential', '~> 0.11.0.pre.engine.pre.requires'
+  gem 'metasploit-credential', '~> 0.12.0'
   # Database models shared between framework and Pro.
-  gem 'metasploit_data_models', '~> 0.21.0.pre.engine.pre.requires'
+  gem 'metasploit_data_models', '~> 0.21.0'
   # Needed for module caching in Mdm::ModuleDetails
   gem 'pg', '>= 0.11'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 4954a16674..184676a154 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,8 +7,8 @@ PATH
       bcrypt
       jsobfu (~> 0.2.0)
       json
-      metasploit-concern (~> 0.3.0.pre.engine.pre.requires)
-      metasploit-model (~> 0.28.0.pre.engine.pre.requires)
+      metasploit-concern (~> 0.3.0)
+      metasploit-model (~> 0.28.0)
       meterpreter_bins (= 0.0.7)
       msgpack
       nokogiri
@@ -97,26 +97,26 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metasploit-concern (0.3.0.pre.engine.pre.requires)
+    metasploit-concern (0.3.0)
       activesupport (~> 3.0, >= 3.0.0)
       railties (< 4.0.0)
-    metasploit-credential (0.11.0.pre.engine.pre.requires)
-      metasploit-concern
-      metasploit-model
-      metasploit_data_models
+    metasploit-credential (0.12.0)
+      metasploit-concern (~> 0.3.0)
+      metasploit-model (~> 0.28.0)
+      metasploit_data_models (~> 0.21.0)
       pg
       railties (< 4.0.0)
       rubyntlm
       rubyzip (~> 1.1)
-    metasploit-model (0.28.0.pre.engine.pre.requires)
+    metasploit-model (0.28.0)
       activesupport
       railties (< 4.0.0)
-    metasploit_data_models (0.21.0.pre.engine.pre.requires)
+    metasploit_data_models (0.21.0)
       activerecord (>= 3.2.13, < 4.0.0)
       activesupport
       arel-helpers
-      metasploit-concern
-      metasploit-model
+      metasploit-concern (~> 0.3.0)
+      metasploit-model (~> 0.28.0)
       pg
       railties (< 4.0.0)
     meterpreter_bins (0.0.7)
@@ -218,9 +218,9 @@ DEPENDENCIES
   factory_girl (>= 4.1.0)
   factory_girl_rails
   fivemat (= 1.2.1)
-  metasploit-credential (~> 0.11.0.pre.engine.pre.requires)
+  metasploit-credential (~> 0.12.0)
   metasploit-framework!
-  metasploit_data_models (~> 0.21.0.pre.engine.pre.requires)
+  metasploit_data_models (~> 0.21.0)
   network_interface (~> 0.0.1)
   pcaprub
   pg (>= 0.11)
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index f228ab6c65..f12d0ce749 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -60,10 +60,10 @@ Gem::Specification.new do |spec|
   # Needed for some admin modules (scrutinizer_add_user.rb)
   spec.add_runtime_dependency 'json'
   # Metasploit::Concern hooks
-  spec.add_runtime_dependency 'metasploit-concern', '~> 0.3.0.pre.engine.pre.requires'
+  spec.add_runtime_dependency 'metasploit-concern', '~> 0.3.0'
   # Things that would normally be part of the database model, but which
   # are needed when there's no database
-  spec.add_runtime_dependency 'metasploit-model', '~> 0.28.0.pre.engine.pre.requires'
+  spec.add_runtime_dependency 'metasploit-model', '~> 0.28.0'
   # Needed for Meterpreter on Windows, soon others.
   spec.add_runtime_dependency 'meterpreter_bins', '0.0.7'
   # Needed by msfgui and other rpc components