diff --git a/.travis.yml b/.travis.yml
index acfb2de..1be7103 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,6 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
   - 7.1
 
 sudo: false
@@ -12,6 +8,7 @@ sudo: false
 env:
   matrix:
     - NETCOMMONS_VERSION=master DB=mysql
+    - NETCOMMONS_VERSION=master DB=mariadb
   global:
     - secure: "TTEVvTjbwUpxFv+KI5ABe5kR25AzbktixeBYmeJ+xZn99fpW2GZ4slLwVmAL6+/qnXez06tKJalSbU5D4Z+s12c0WEbo2vLgviYrhe4/iW0Pzry3CCTrWVXE/F5KlzSH3BWIt1hIG3Qkjk4K0FqfmXDlvt4Tg4Jmq5oUhpHf5gI="
     - GIT_COMMITTER_NAME=s-nakajima
@@ -19,12 +16,15 @@ env:
     - GIT_AUTHOR_NAME=s-nakajima
     - GIT_AUTHOR_EMAIL=nakajimashouhei@gmail.com
 
+addons:
+  mariadb: 10.0
+
 before_script:
   - export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3
   - git clone git://github.com/NetCommons3/NetCommons3 $NETCOMMONS_BUILD_DIR
   - cd $NETCOMMONS_BUILD_DIR
   - git checkout $NETCOMMONS_VERSION
-  - travis_wait . tools/build/plugins/cakephp/travis/pre.sh
+  - . tools/build/plugins/cakephp/travis/pre.sh
   - . tools/build/plugins/cakephp/travis/environment.sh
 
 script:
diff --git a/composer.json b/composer.json
index d86f040..5c4e33b 100644
--- a/composer.json
+++ b/composer.json
@@ -5,30 +5,35 @@
     "type": "cakephp-plugin",
     "extra": {
         "installer-paths": {
-            "app/Plugin/{$name}": ["type:cakephp-plugin"]
+            "app/Plugin/{$name}": [
+                "type:cakephp-plugin"
+            ]
         }
     },
     "require": {
-        "cakedc/migrations":            "~2.2",
-        "netcommons/blocks":            "@dev",
-        "netcommons/mails":             "@dev",
-        "netcommons/net-commons":      "@dev",
-        "netcommons/pages":             "@dev",
-        "netcommons/plugin-manager":   "@dev",
-        "netcommons/topics":            "@dev",
-        "netcommons/workflow":          "@dev",
-        "netcommons/wysiwyg":           "@dev"
+        "cakedc/migrations": "~2.2",
+        "netcommons/blocks": "@dev",
+        "netcommons/mails": "@dev",
+        "netcommons/net-commons": "@dev",
+        "netcommons/pages": "@dev",
+        "netcommons/plugin-manager": "@dev",
+        "netcommons/topics": "@dev",
+        "netcommons/workflow": "@dev",
+        "netcommons/wysiwyg": "@dev"
     },
-    "license": "NetCommons License",
+    "license": "LicenseRef-NetCommons",
+    "license-ref-net-commons": "https://raw.githubusercontent.com/NetCommons3/NetCommons3/master/license.txt",
     "authors": [
         {
             "name": "NetCommons Community",
             "homepage": "http://www.netcommons.org"
         }
     ],
-    "keywords":    ["cakephp", "announcements"],
+    "keywords": [
+        "cakephp",
+        "announcements"
+    ],
     "config": {
         "vendor-dir": "vendors"
     }
-}
-
+}
\ No newline at end of file