From cce5b12e7f058ae93d780d3a6cda4226b9c76e15 Mon Sep 17 00:00:00 2001
From: Tim Krajcar <tkrajcar@newrelic.com>
Date: Wed, 29 Mar 2017 10:36:09 -0700
Subject: [PATCH] Update LICENSE, gemspec, and license tests to reflect removal
 of vendored code.

---
 LICENSE                        | 28 +---------------------------
 newrelic_rpm.gemspec           |  2 +-
 test/new_relic/license_test.rb | 16 ++++------------
 3 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/LICENSE b/LICENSE
index 0ee6e7c85d..a00049ecae 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,30 +1,4 @@
-This product includes jquery 1.4.2, written by John Resig
-and distributed under an MIT license.
-See https://github.com/jquery/jquery/blob/1.4.2/MIT-LICENSE.txt
-
-    Copyright (c) 2010 John Resig, http://jquery.com/
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-All other components of this product are
+All components of this product are
 Copyright (c) 2008-2017 New Relic, Inc.  All rights reserved.
 
 Certain inventions disclosed in this file may be claimed within
diff --git a/newrelic_rpm.gemspec b/newrelic_rpm.gemspec
index 27effa1dee..272b7c1b07 100644
--- a/newrelic_rpm.gemspec
+++ b/newrelic_rpm.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = [ "Tim Krajcar", "Matthew Wear", "Katherine Wu", "Kenichi Nakamura" ]
   s.date = Time.now.strftime('%Y-%m-%d')
-  s.licenses    = ['New Relic', 'MIT', 'Ruby']
+  s.licenses    = ['New Relic']
   s.description = <<-EOS
 New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep
diff --git a/test/new_relic/license_test.rb b/test/new_relic/license_test.rb
index a66f13df49..64e3a02a04 100644
--- a/test/new_relic/license_test.rb
+++ b/test/new_relic/license_test.rb
@@ -26,19 +26,11 @@ class LicenseTest < Minitest::Test
   # unless listed here the expectation is that these terms will not occur in
   # the source code.
   EXPECTED_LICENSE_OCCURRENCES = {
-    ['/newrelic_rpm.gemspec', 'MIT'] => 1, # licenses specificiation, which includes MIT for MIT-licensed portions of code
-    ['/LICENSE', 'MIT'] => 2,
-    ['/LICENSE', '(c)'] => 2,
-    ['/LICENSE', 'Copyright'] => 4,
+    ['/LICENSE', '(c)'] => 1,
+    ['/LICENSE', 'Copyright'] => 1,
     ['/LICENSE', 'rights reserved'] => 1,
-    ['/ui/views/layouts/newrelic_default.rhtml', 'rights reserved'] => 1,
-    ['/ui/views/newrelic/file/javascript/jquery-1.4.2.js', 'GPL'] => 3,
-    ['/ui/views/newrelic/file/javascript/jquery-1.4.2.js', 'BSD'] => 2,
-    ['/ui/views/newrelic/file/javascript/jquery-1.4.2.js', 'Copyright'] => 3,
-    ['/ui/views/newrelic/file/javascript/jquery-1.4.2.js', 'MIT'] => 3,
-    ['/test/new_relic/agent/agent_test_controller_test.rb', 'Apache'] => 1, # apache header tests
-    ['/lib/new_relic/agent/system_info.rb', 'BSD'] => 4,
-    ['/test/new_relic/agent/system_info_test.rb', 'BSD'] => 2
+    ['/lib/new_relic/agent/system_info.rb', 'BSD'] => 4, # reference to BSD the operating system, not BSD the license
+    ['/test/new_relic/agent/system_info_test.rb', 'BSD'] => 2 # reference to BSD the operating system, not BSD the license
   }
 
   def shebang