From 6d535b774afef6f495cba61a3e1b237dfd497257 Mon Sep 17 00:00:00 2001
From: Mike Linksvayer <mlinksva@github.com>
Date: Tue, 26 Dec 2017 13:15:29 -0800
Subject: [PATCH 1/3] NCSA "developed by" ordering

"Development Group" comes before "Name of Institution", so `project` should come before `fullname` as these most closely correspond.

As noted in https://github.com/spdx/license-list-XML/pull/556
---
 _licenses/ncsa.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt
index ce26d43..93b99b7 100644
--- a/_licenses/ncsa.txt
+++ b/_licenses/ncsa.txt
@@ -32,8 +32,8 @@ University of Illinois/NCSA Open Source License
 
 Copyright (c) [year] [fullname]. All rights reserved. 
 
-Developed by: [fullname] 
-              [project] 
+Developed by: [project] 
+              [fullname] 
               [project_url]
                   
 Permission is hereby granted, free of charge, to any person 

From 43d7e40bc2234130161163ba049bfbdb7e46d4c6 Mon Sep 17 00:00:00 2001
From: Mike Linksvayer <mlinksva@github.com>
Date: Fri, 29 Dec 2017 13:15:57 -0800
Subject: [PATCH 2/3] update ruby to current pages version

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0b42a5e..fe5828b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ script: "./script/cibuild"
 #environment
 language: ruby
 rvm:
-  - 2.4.0
+  - 2.4.2
 
 addons:
   apt:

From 102887fbeb75fb53f49c303856cb87359405c6c1 Mon Sep 17 00:00:00 2001
From: Mike Linksvayer <mlinksva@github.com>
Date: Fri, 29 Dec 2017 14:30:08 -0800
Subject: [PATCH 3/3] use SPDX license list 3.0

---
 _licenses/bsd-2-clause.txt       |  2 +-
 _licenses/bsd-3-clause-clear.txt |  2 +-
 _licenses/bsd-3-clause.txt       |  2 +-
 spec/spec_helper.rb              | 11 ++++++++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt
index 524d663..1bcd590 100644
--- a/_licenses/bsd-2-clause.txt
+++ b/_licenses/bsd-2-clause.txt
@@ -1,5 +1,5 @@
 ---
-title: BSD 2-clause "Simplified" License
+title: BSD 2-Clause "Simplified" License
 spdx-id: BSD-2-Clause
 redirect_from: /licenses/bsd/
 source: https://opensource.org/licenses/BSD-2-Clause
diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt
index 1fd8552..30b8289 100644
--- a/_licenses/bsd-3-clause-clear.txt
+++ b/_licenses/bsd-3-clause-clear.txt
@@ -1,5 +1,5 @@
 ---
-title: BSD 3-clause Clear License
+title: BSD 3-Clause Clear License
 spdx-id: BSD-3-Clause-Clear
 source: https://spdx.org/licenses/BSD-3-Clause-Clear.html
 
diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt
index e644905..fc804a7 100644
--- a/_licenses/bsd-3-clause.txt
+++ b/_licenses/bsd-3-clause.txt
@@ -1,5 +1,5 @@
 ---
-title: BSD 3-clause "New" or "Revised" License
+title: BSD 3-Clause "New" or "Revised" License
 spdx-id: BSD-3-Clause
 source: https://opensource.org/licenses/BSD-3-Clause
 hidden: false
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4070ccf..9912e62 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -71,8 +71,13 @@ def rule?(tag, group)
 end
 
 def spdx_list
-  url = 'https://raw.githubusercontent.com/sindresorhus/spdx-license-list/master/spdx.json'
-  SpecHelper.spdx ||= JSON.parse(open(url).read)
+  SpecHelper.spdx ||= begin
+    url = 'https://spdx.org/licenses/licenses.json'
+    list = JSON.parse(open(url).read)['licenses']
+    list.each_with_object({}) do |values, memo|
+      memo[values['licenseId']] = values
+    end
+  end
 end
 
 def spdx_ids
@@ -86,7 +91,7 @@ end
 def osi_approved_licenses
   SpecHelper.osi_approved_licenses ||= begin
     licenses = {}
-    list = spdx_list.select { |_id, meta| meta['osiApproved'] }
+    list = spdx_list.select { |_id, meta| meta['isOsiApproved'] }
     list.each do |id, meta|
       licenses[id.downcase] = meta['name']
     end