Import hyper to ASF, update LICENSE and NOTICE

3 files changed, 29 insertions, 2 deletions

diff --git a/LICENSE b/LICENSE
index a209352a0..6034c717e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2274,3 +2274,27 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
+
+For the src/hyper component:
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Game Analytics ApS
+
+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.
diff --git a/NOTICE b/NOTICE
index c04033897..481e75513 100644
--- a/NOTICE
+++ b/NOTICE
@@ -184,3 +184,7 @@ This product also includes the following third-party components:
     1997 Niels Provos <provos@physnet.uni-hamburg.de>
   - The asynchronous queue code (c_src/async_queue.c and c_src/async_queue.h)
     is from the esnappy project, copyright 2011 Konstantin V. Sorokin.
+
+* hyper
+
+  Copyright (c) 2014 Game Analytics ApS
diff --git a/rebar.config.script b/rebar.config.script
index ed1861acc..f8209643d 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -61,8 +61,7 @@ DepDescs = [
                    {tag, "v1.1.15"}, [raw]},
 %% Third party deps
 {folsom,           "folsom",           {tag, "CouchDB-0.8.2"}},
-{hyper,            {url, "https://github.com/GameAnalytics/hyper.git"},
-                   "4b1abc4284fc784f6def4f4928f715b0d33136f9"},
+{hyper,            "hyper",            {tag, "CouchDB-2.2.0"}},
 {ibrowse,          "ibrowse",          {tag, "CouchDB-4.0.1"}},
 {jiffy,            "jiffy",            {tag, "CouchDB-0.14.11-2"}},
 {mochiweb,         "mochiweb",         {tag, "v2.17.0"}},