From e1601e313bc61c7a6193b70106a421060216a564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=AD=E5=B3=B6=20=E6=AD=A3=E5=B9=B3?= Date: Thu, 29 Jun 2017 23:32:52 +0900 Subject: [PATCH 1/9] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index acfb2de..3c6f2e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,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 From d0ae90e32dc177920841195d2219cec5a107e864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=AD=E5=B3=B6=20=E6=AD=A3=E5=B9=B3?= Date: Thu, 29 Jun 2017 23:45:08 +0900 Subject: [PATCH 2/9] Update .travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3c6f2e0..7f5635b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,9 @@ env: - GIT_AUTHOR_NAME=s-nakajima - GIT_AUTHOR_EMAIL=nakajimashouhei@gmail.com +mariadb: &mariadb + mariadb: "10.0" + before_script: - export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3 - git clone git://github.com/NetCommons3/NetCommons3 $NETCOMMONS_BUILD_DIR From dd325a48926dcb1455ebec8e1a54f095624671d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=AD=E5=B3=B6=20=E6=AD=A3=E5=B9=B3?= Date: Fri, 30 Jun 2017 00:49:23 +0900 Subject: [PATCH 3/9] Update .travis.yml --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f5635b..ac160cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,16 +12,13 @@ sudo: false env: matrix: - NETCOMMONS_VERSION=master DB=mysql - - NETCOMMONS_VERSION=master DB=mariadb + - NETCOMMONS_VERSION=master DB=mariadb-10.0 global: - secure: "TTEVvTjbwUpxFv+KI5ABe5kR25AzbktixeBYmeJ+xZn99fpW2GZ4slLwVmAL6+/qnXez06tKJalSbU5D4Z+s12c0WEbo2vLgviYrhe4/iW0Pzry3CCTrWVXE/F5KlzSH3BWIt1hIG3Qkjk4K0FqfmXDlvt4Tg4Jmq5oUhpHf5gI=" - GIT_COMMITTER_NAME=s-nakajima - GIT_COMMITTER_EMAIL=nakajimashouhei@gmail.com - GIT_AUTHOR_NAME=s-nakajima - GIT_AUTHOR_EMAIL=nakajimashouhei@gmail.com - -mariadb: &mariadb - mariadb: "10.0" before_script: - export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3 From 9f4866206b57227fd1261d329acec52d79d107d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=AD=E5=B3=B6=20=E6=AD=A3=E5=B9=B3?= Date: Fri, 30 Jun 2017 00:53:19 +0900 Subject: [PATCH 4/9] Update .travis.yml --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac160cb..c7687e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,6 @@ language: php php: - - 5.4 - - 5.5 - - 5.6 - 7.0 - 7.1 From 159d609b2f114d6c9a65914930db118cd1bb5ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=AD=E5=B3=B6=20=E6=AD=A3=E5=B9=B3?= Date: Fri, 30 Jun 2017 01:10:21 +0900 Subject: [PATCH 5/9] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c7687e4..8e15751 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 7.0 - 7.1 sudo: false From cd6e545e5fe79f597bca294de07971cdb7fcc9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=AD=E5=B3=B6=20=E6=AD=A3=E5=B9=B3?= Date: Fri, 30 Jun 2017 01:14:09 +0900 Subject: [PATCH 6/9] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8e15751..5a478b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_script: - 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: From 4d29f9146e195a913eea8bd60a7530492f8a7724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=AD=E5=B3=B6=20=E6=AD=A3=E5=B9=B3?= Date: Fri, 30 Jun 2017 01:18:06 +0900 Subject: [PATCH 7/9] Update .travis.yml --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a478b0..c493871 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,14 +8,18 @@ sudo: false env: matrix: - NETCOMMONS_VERSION=master DB=mysql - - NETCOMMONS_VERSION=master DB=mariadb-10.0 + - NETCOMMONS_VERSION=master DB=mariadb global: - secure: "TTEVvTjbwUpxFv+KI5ABe5kR25AzbktixeBYmeJ+xZn99fpW2GZ4slLwVmAL6+/qnXez06tKJalSbU5D4Z+s12c0WEbo2vLgviYrhe4/iW0Pzry3CCTrWVXE/F5KlzSH3BWIt1hIG3Qkjk4K0FqfmXDlvt4Tg4Jmq5oUhpHf5gI=" - GIT_COMMITTER_NAME=s-nakajima - GIT_COMMITTER_EMAIL=nakajimashouhei@gmail.com - GIT_AUTHOR_NAME=s-nakajima - GIT_AUTHOR_EMAIL=nakajimashouhei@gmail.com - + +mariadb: &mariadb + 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 From 143e9fdc8f1943c16d3aeae39cc51e5947bf1ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=AD=E5=B3=B6=20=E6=AD=A3=E5=B9=B3?= Date: Fri, 30 Jun 2017 01:26:46 +0900 Subject: [PATCH 8/9] Update .travis.yml --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c493871..1be7103 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,8 @@ env: - GIT_AUTHOR_NAME=s-nakajima - GIT_AUTHOR_EMAIL=nakajimashouhei@gmail.com -mariadb: &mariadb - addons: - mariadb: 10.0 +addons: + mariadb: 10.0 before_script: - export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3 From 142de1d103c71e988d6065c4e3f3879a3bed43c2 Mon Sep 17 00:00:00 2001 From: kteraguchi Date: Fri, 26 Jan 2018 16:39:07 +0900 Subject: [PATCH 9/9] Change license value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Packagistで以下エラーが発生したため Importing branch master (dev-master) Skipped branch master, Invalid package information: License "NetCommons License" is not a valid SPDX license identifier, see https://spdx.org/licenses/ if you use an open license. If the software is closed-source, you may use "proprietary" as license. --- composer.json | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) 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