Skip to content

Commit

Permalink
Update LICENSE, gemspec, and license tests to reflect removal of vend…
Browse files Browse the repository at this point in the history
…ored code.
  • Loading branch information
tkrajcar authored and kwugirl committed Mar 30, 2017
1 parent 2aa79b7 commit cce5b12
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 40 deletions.
28 changes: 1 addition & 27 deletions 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
Expand Down
2 changes: 1 addition & 1 deletion newrelic_rpm.gemspec
Expand Up @@ -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
Expand Down
16 changes: 4 additions & 12 deletions test/new_relic/license_test.rb
Expand Up @@ -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
Expand Down

0 comments on commit cce5b12

Please sign in to comment.