From 6f4b8fb98210b0724f3d105ea7f0950b6154d0ab Mon Sep 17 00:00:00 2001 From: Ruslan Baidan Date: Thu, 19 Mar 2020 15:09:19 +0100 Subject: [PATCH 1/2] Preapred the release 2.9.12 --- CHANGELOG.md | 20 +++++++++++ VERSION.json | 2 +- composer.lock | 98 +++++++++++++++++++++++++++------------------------ package.json | 2 +- 4 files changed, 73 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf4dcf2..de5bebe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,26 @@ MONARC Changelog ================ +## 2.9.12 (2020-03-20) + +### New + +- batch import of information risks from csv/xlsx file + ([#246](https://github.com/monarc-project/MonarcAppFO/issues/246)). + +### Enhancement + +- use a better encryption method for the export of objects and analysis + ([#260](https://github.com/monarc-project/MonarcAppFO/issues/260)). + +### Fix + +- Remove comment field of threat in export object of library + ([#245](https://github.com/monarc-project/MonarcAppFO/issues/245)). +- Edition and creation of operational risk linked a tag in use on risk analysis + ([#262](https://github.com/monarc-project/MonarcAppFO/issues/262)). + + ## 2.9.11 (2020-02-21) ### New diff --git a/VERSION.json b/VERSION.json index b9dcd60..5b6b394 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1 +1 @@ -{"major":2, "minor":9, "hotfix":11} +{"major":2, "minor":9, "hotfix":12} diff --git a/composer.lock b/composer.lock index 499b5f0..49d3a9d 100644 --- a/composer.lock +++ b/composer.lock @@ -2678,16 +2678,16 @@ }, { "name": "laminas/laminas-mime", - "version": "2.7.2", + "version": "2.7.3", "source": { "type": "git", "url": "https://github.com/laminas/laminas-mime.git", - "reference": "2dbace2c69542e5a251af3becb6d7209ac9fb42b" + "reference": "e844abb02e868fae154207929190292ad25057cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/2dbace2c69542e5a251af3becb6d7209ac9fb42b", - "reference": "2dbace2c69542e5a251af3becb6d7209ac9fb42b", + "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/e844abb02e868fae154207929190292ad25057cc", + "reference": "e844abb02e868fae154207929190292ad25057cc", "shasum": "" }, "require": { @@ -2701,7 +2701,7 @@ "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", "laminas/laminas-mail": "^2.6", - "phpunit/phpunit": "^5.7.21 || ^6.3" + "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20" }, "suggest": { "laminas/laminas-mail": "Laminas\\Mail component" @@ -2728,7 +2728,7 @@ "laminas", "mime" ], - "time": "2019-12-31T17:25:27+00:00" + "time": "2020-03-06T08:38:03+00:00" }, { "name": "laminas/laminas-modulemanager", @@ -3351,16 +3351,16 @@ }, { "name": "laminas/laminas-validator", - "version": "2.13.1", + "version": "2.13.2", "source": { "type": "git", "url": "https://github.com/laminas/laminas-validator.git", - "reference": "36702f033486bf1953e254f5299aad205302e79d" + "reference": "e7bf6a2eedc0508ebde0ebc66662efeb0abbcb2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/36702f033486bf1953e254f5299aad205302e79d", - "reference": "36702f033486bf1953e254f5299aad205302e79d", + "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/e7bf6a2eedc0508ebde0ebc66662efeb0abbcb2c", + "reference": "e7bf6a2eedc0508ebde0ebc66662efeb0abbcb2c", "shasum": "" }, "require": { @@ -3426,7 +3426,7 @@ "laminas", "validator" ], - "time": "2020-01-15T09:59:30+00:00" + "time": "2020-03-16T11:38:27+00:00" }, { "name": "laminas/laminas-view", @@ -3573,16 +3573,16 @@ }, { "name": "monarc/core", - "version": "v2.9.15", + "version": "v2.9.16", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-core.git", - "reference": "0dd391fc28c1fd6545119fa9f790d9f7d28937cb" + "reference": "26ed93240b81938a6dd16986a2f997491bc9353a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/0dd391fc28c1fd6545119fa9f790d9f7d28937cb", - "reference": "0dd391fc28c1fd6545119fa9f790d9f7d28937cb", + "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/26ed93240b81938a6dd16986a2f997491bc9353a", + "reference": "26ed93240b81938a6dd16986a2f997491bc9353a", "shasum": "" }, "require": { @@ -3657,20 +3657,20 @@ } ], "description": "Core for monarc/monarc application", - "time": "2020-02-24T15:41:30+00:00" + "time": "2020-03-19T13:49:23+00:00" }, { "name": "monarc/frontoffice", - "version": "v2.9.15", + "version": "v2.9.16", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-client.git", - "reference": "82b4a2f415a2b659900a6900dee8afd9c1b4458e" + "reference": "47d867809dd4724f45f37b2e22b51b120af0bc1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/82b4a2f415a2b659900a6900dee8afd9c1b4458e", - "reference": "82b4a2f415a2b659900a6900dee8afd9c1b4458e", + "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/47d867809dd4724f45f37b2e22b51b120af0bc1f", + "reference": "47d867809dd4724f45f37b2e22b51b120af0bc1f", "shasum": "" }, "require": { @@ -3739,7 +3739,7 @@ } ], "description": "Frontoffice for monarc/monarc application", - "time": "2020-02-22T10:31:22+00:00" + "time": "2020-03-03T12:35:00+00:00" }, { "name": "monarc/phpword", @@ -4501,16 +4501,16 @@ }, { "name": "symfony/config", - "version": "v5.0.4", + "version": "v5.0.5", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "7640c6704f56bf64045066bc5d93fd9d664baa63" + "reference": "938905f46df484b2aeae9016fd658aed577cdceb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/7640c6704f56bf64045066bc5d93fd9d664baa63", - "reference": "7640c6704f56bf64045066bc5d93fd9d664baa63", + "url": "https://api.github.com/repos/symfony/config/zipball/938905f46df484b2aeae9016fd658aed577cdceb", + "reference": "938905f46df484b2aeae9016fd658aed577cdceb", "shasum": "" }, "require": { @@ -4561,20 +4561,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2020-01-04T14:08:26+00:00" + "time": "2020-02-04T09:41:09+00:00" }, { "name": "symfony/console", - "version": "v5.0.4", + "version": "v5.0.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "91c294166c38d8c0858a86fad76d8c14dc1144c8" + "reference": "d29e2d36941de13600c399e393a60b8cfe59ac49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/91c294166c38d8c0858a86fad76d8c14dc1144c8", - "reference": "91c294166c38d8c0858a86fad76d8c14dc1144c8", + "url": "https://api.github.com/repos/symfony/console/zipball/d29e2d36941de13600c399e393a60b8cfe59ac49", + "reference": "d29e2d36941de13600c399e393a60b8cfe59ac49", "shasum": "" }, "require": { @@ -4637,11 +4637,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2020-01-25T15:56:29+00:00" + "time": "2020-02-24T15:05:31+00:00" }, { "name": "symfony/filesystem", - "version": "v5.0.4", + "version": "v5.0.5", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -4924,16 +4924,16 @@ }, { "name": "symfony/yaml", - "version": "v5.0.4", + "version": "v5.0.5", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "69b44e3b8f90949aee2eb3aa9b86ceeb01cbf62a" + "reference": "a4b613d7e44f62941adff5a802cff70adee57d3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/69b44e3b8f90949aee2eb3aa9b86ceeb01cbf62a", - "reference": "69b44e3b8f90949aee2eb3aa9b86ceeb01cbf62a", + "url": "https://api.github.com/repos/symfony/yaml/zipball/a4b613d7e44f62941adff5a802cff70adee57d3f", + "reference": "a4b613d7e44f62941adff5a802cff70adee57d3f", "shasum": "" }, "require": { @@ -4979,7 +4979,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2020-01-21T11:12:28+00:00" + "time": "2020-02-03T13:51:17+00:00" }, { "name": "true/punycode", @@ -5035,12 +5035,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "1df6b9d09d2b074fd3f0f10a7696d9f797d4772c" + "reference": "b81a572cb1acffadea621e55c95af4ba94a91624" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/1df6b9d09d2b074fd3f0f10a7696d9f797d4772c", - "reference": "1df6b9d09d2b074fd3f0f10a7696d9f797d4772c", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/b81a572cb1acffadea621e55c95af4ba94a91624", + "reference": "b81a572cb1acffadea621e55c95af4ba94a91624", "shasum": "" }, "conflict": { @@ -5055,6 +5055,7 @@ "bagisto/bagisto": "<0.1.5", "bolt/bolt": "<3.6.10", "brightlocal/phpwhois": "<=4.2.5", + "buddypress/buddypress": "<5.1.2", "bugsnag/bugsnag-laravel": ">=2,<2.0.2", "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.5.18|>=3.6,<3.6.15|>=3.7,<3.7.7", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", @@ -5083,20 +5084,21 @@ "drupal/core": ">=7,<7.69|>=8,<8.7.11|>=8.8,<8.8.1", "drupal/drupal": ">=7,<7.69|>=8,<8.7.11|>=8.8,<8.8.1", "endroid/qr-code-bundle": "<3.4.2", - "enshrined/svg-sanitize": "<0.12", + "enshrined/svg-sanitize": "<0.13.1", "erusev/parsedown": "<1.7.2", "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1|>=5.4,<5.4.11.1|>=2017.12,<2017.12.0.1", "ezsystems/ezplatform": ">=1.7,<1.7.9.1|>=1.13,<1.13.5.1|>=2.5,<2.5.4", "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6", "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2", "ezsystems/ezplatform-user": ">=1,<1.0.1", - "ezsystems/ezpublish-kernel": ">=5.3,<5.3.12.1|>=5.4,<5.4.13.1|>=6,<6.7.9.1|>=6.8,<6.13.5.1|>=7,<7.2.4.1|>=7.3,<7.3.2.1", - "ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.6|>=5.4,<5.4.12.3|>=2011,<2017.12.4.3|>=2018.6,<2018.6.1.4|>=2018.9,<2018.9.1.3", + "ezsystems/ezpublish-kernel": ">=5.3,<5.3.12.1|>=5.4,<5.4.14.1|>=6,<6.7.9.1|>=6.8,<6.13.6.2|>=7,<7.2.4.1|>=7.3,<7.3.2.1|>=7.5,<7.5.6.2", + "ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.6|>=5.4,<5.4.14.1|>=2011,<2017.12.7.2|>=2018.6,<2018.6.1.4|>=2018.9,<2018.9.1.3|>=2019.3,<2019.3.4.2", "ezsystems/repository-forms": ">=2.3,<2.3.2.1", "ezyang/htmlpurifier": "<4.1.1", "firebase/php-jwt": "<2", "fooman/tcpdf": "<6.2.22", "fossar/tcpdf-parser": "<6.2.22", + "friendsofsymfony/oauth2-php": "<1.3", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", "fuel/core": "<1.8.1", @@ -5108,6 +5110,7 @@ "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30", "illuminate/database": ">=4,<4.0.99|>=4.1,<4.1.29", "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", + "illuminate/view": ">=7,<7.1.2", "ivankristianto/phpwhois": "<=4.3", "james-heinrich/getid3": "<1.9.9", "joomla/session": "<1.3.1", @@ -5115,7 +5118,7 @@ "kazist/phpwhois": "<=4.2.6", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laravel/framework": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30", + "laravel/framework": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30|>=7,<7.1.2", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "league/commonmark": "<0.18.3", "librenms/librenms": "<1.53", @@ -5158,7 +5161,7 @@ "serluck/phpwhois": "<=4.2.6", "shopware/shopware": "<5.3.7", "silverstripe/admin": ">=1.0.3,<1.0.4|>=1.1,<1.1.1", - "silverstripe/assets": ">=1,<1.3.5", + "silverstripe/assets": ">=1,<1.3.5|>=1.4,<1.4.4", "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4", "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", @@ -5179,6 +5182,7 @@ "socalnick/scn-social-auth": "<1.15.2", "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", + "ssddanbrown/bookstack": "<0.25.3", "stormpath/sdk": ">=0,<9.9.99", "studio-42/elfinder": "<2.1.49", "swiftmailer/swiftmailer": ">=4,<5.4.5", @@ -5229,7 +5233,7 @@ "typo3/phar-stream-wrapper": ">=1,<2.1.1|>=3,<3.1.1", "ua-parser/uap-php": "<3.8", "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2", - "verot/class.upload.php": "<1.0.3|>=2,<2.0.4", + "verot/class.upload.php": "<=1.0.3|>=2,<=2.0.4", "wallabag/tcpdf": "<6.2.22", "willdurand/js-translation-bundle": "<2.1.1", "yii2mod/yii2-cms": "<1.9.2", @@ -5286,7 +5290,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2020-02-19T06:23:50+00:00" + "time": "2020-03-15T11:13:32+00:00" } ], "aliases": [], diff --git a/package.json b/package.json index f0f2667..3391da9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "MONARC", - "version": "2.9.11", + "version": "2.9.12", "description": "Monarc front office application", "private": true, "repository": { From 0ca8aed1e1344130bccacf6c49e6d52b53018e63 Mon Sep 17 00:00:00 2001 From: Ruslan Baidan Date: Thu, 19 Mar 2020 15:11:26 +0100 Subject: [PATCH 2/2] Uncommented the mysql server start for the build. --- .github/workflows/php.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 2b97a3c..49d9cf7 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -28,8 +28,8 @@ jobs: #mysql user: $MYSQL_USER # Required if "mysql root password" is empty, default is empty. The superuser for the specified database. Can use secrets, too #mysql password: $MYSQL_PASSWORD # Required if "mysql user" exists. The password for the "mysql user" - #- name: Start MySQL (SUDO) - #run: sudo service mysql start + - name: Start MySQL (SUDO) + run: sudo service mysql start - name: Setup PHP uses: shivammathur/setup-php@v1