From 6f64740977eeae14482a62eca18db5603bfb5727 Mon Sep 17 00:00:00 2001 From: nruest Date: Thu, 12 May 2016 12:55:09 -0400 Subject: [PATCH 1/5] A couple more updates from the repo move. --- CollectionService/composer.json | 4 +- README.md | 20 ++++++++ TransactionService/composer.json | 2 +- composer.json | 16 +++++-- composer.lock | 81 ++++++-------------------------- 5 files changed, 49 insertions(+), 74 deletions(-) diff --git a/CollectionService/composer.json b/CollectionService/composer.json index 459035ff..d0282210 100644 --- a/CollectionService/composer.json +++ b/CollectionService/composer.json @@ -11,8 +11,8 @@ }], "require": { "islandora/chullo": "^0.0", - "islandora/resource-service" : "dev-sprint-002", - "islandora/transaction-service" : "dev-sprint-002", + "islandora/resource-service" : "master", + "islandora/transaction-service" : "master", "silex/silex": "^1.3", "symfony/config": "^3.0", "twig/twig": "^1.23", diff --git a/README.md b/README.md index 504198a9..2d29eecc 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,26 @@ This mounts all the various individual microservices under the `/islandora` URL, See the individual services for more information on their endpoints. +## Maintainers/Sponsors + +* UPEI +* discoverygarden inc. +* LYRASIS +* McMaster University +* University of Limerick +* York University +* University of Manitoba +* Simon Fraser University +* PALS +* American Philosophical Society +* common media inc. + +Maintainers: + +* [Jared Whiklo](https://github.com/whikloj) +* [Diego Pino](https://github.com/diegopino) +* [Nick Ruest](https://github.com/ruebot) + ## License [MIT](https://opensource.org/licenses/MIT) diff --git a/TransactionService/composer.json b/TransactionService/composer.json index 88f12673..2bef2844 100644 --- a/TransactionService/composer.json +++ b/TransactionService/composer.json @@ -9,7 +9,7 @@ ], "require": { "islandora/chullo": "^0.0", - "islandora/resource-service": "dev-sprint-002", + "islandora/resource-service": "master", "silex/silex": "^1.3" }, "autoload": { diff --git a/composer.json b/composer.json index 2af66ece..31b55b1d 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,8 @@ ], "require": { "islandora/chullo": "^0.0", - "islandora/resource-service": "dev-sprint-002", - "islandora/collection-service": "dev-sprint-002", + "islandora/resource-service" : "master", + "islandora/transaction-service" : "master", "silex/silex": "^1.3", "symfony/config": "^3.0", "twig/twig": "^1.23", @@ -46,11 +46,19 @@ }, { "name": "Jared Whiklo", - "email": "jwhiklo@gmail.com" + "email": "jwhiklo@gmail.com", + "role": "Maintainer" }, { "name": "Nick Ruest", - "email": "ruestn@gmail.com" + "email": "ruestn@gmail.com", + "role": "Maintainer" + }, + { + "name": "Diego Pino", + "email": "dpino@krayon.cl", + "role": "Maintainer" } + ] } diff --git a/composer.lock b/composer.lock index 8407902e..8f4f8e14 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "ef74a8745a28385e26b7cf9a6de3ced6", - "content-hash": "b9c4018e1765abb8739fc99cd2c33961", + "hash": "75f9f24598d3aa984992bb2f5958611f", + "content-hash": "094f3a28fa486c0c261599d2d0e326cf", "packages": [ { "name": "easyrdf/easyrdf", @@ -295,60 +295,9 @@ "homepage": "https://github.com/islandora-claw/chullo", "time": "2016-04-29 02:25:55" }, - { - "name": "islandora/collection-service", - "version": "dev-sprint-002", - "dist": { - "type": "path", - "url": "CollectionService", - "reference": "3b8d55953d3916ebdce5c454d2c70dd364185661", - "shasum": null - }, - "require": { - "easyrdf/easyrdf": "^0.9.1", - "islandora/chullo": "^0.0", - "islandora/resource-service": "dev-sprint-002", - "islandora/transaction-service": "dev-sprint-002", - "ml/json-ld": "^1.0", - "silex/silex": "^1.3", - "symfony/config": "^3.0", - "symfony/yaml": "^3.0", - "twig/twig": "^1.23" - }, - "require-dev": { - "phpunit/phpunit": "^4.8", - "squizlabs/php_codesniffer": "^2.0@dev" - }, - "type": "library", - "autoload": { - "psr-4": { - "Islandora\\CollectionService\\": "src/" - } - }, - "authors": [ - { - "name": "Islandora Foundation", - "email": "community@islandora.ca", - "role": "Owner" - }, - { - "name": "Diego Pino Navarro", - "email": "dpino@krayon.cl" - }, - { - "name": "Jared Whiklo", - "email": "jwhiklo@gmail.com" - }, - { - "name": "Nick Ruest", - "email": "ruestn@gmail.com" - } - ], - "description": "RESTful service providing PCDM Collections in Fedora 4" - }, { "name": "islandora/resource-service", - "version": "dev-sprint-002", + "version": "dev-master", "dist": { "type": "path", "url": "ResourceService", @@ -396,16 +345,16 @@ }, { "name": "islandora/transaction-service", - "version": "dev-sprint-002", + "version": "dev-master", "dist": { "type": "path", "url": "TransactionService", - "reference": "ae5a46f9221abc2005217811cf1faf5d513b96fd", + "reference": "d0ec3bdefa103d251780da32ea065a315de26dac", "shasum": null }, "require": { "islandora/chullo": "^0.0", - "islandora/resource-service": "dev-sprint-002", + "islandora/resource-service": "master", "silex/silex": "^1.3" }, "require-dev": { @@ -941,12 +890,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "5f4f7b4aaf3615f62183e818f5efa542d4fb95f2" + "reference": "61c2c5bde2c32fdb8e60a03644e99451d7a069c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/5f4f7b4aaf3615f62183e818f5efa542d4fb95f2", - "reference": "5f4f7b4aaf3615f62183e818f5efa542d4fb95f2", + "url": "https://api.github.com/repos/symfony/debug/zipball/61c2c5bde2c32fdb8e60a03644e99451d7a069c8", + "reference": "61c2c5bde2c32fdb8e60a03644e99451d7a069c8", "shasum": "" }, "require": { @@ -990,7 +939,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-03-30 10:41:47" + "time": "2016-05-12 15:59:27" }, { "name": "symfony/event-dispatcher", @@ -2393,12 +2342,12 @@ "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "e2e47568fcdc8b5f18f1dca088659944681e9ab5" + "reference": "0434c489d21e402199fb0b4ab581af5009cb706d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e2e47568fcdc8b5f18f1dca088659944681e9ab5", - "reference": "e2e47568fcdc8b5f18f1dca088659944681e9ab5", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/0434c489d21e402199fb0b4ab581af5009cb706d", + "reference": "0434c489d21e402199fb0b4ab581af5009cb706d", "shasum": "" }, "require": { @@ -2463,14 +2412,12 @@ "phpcs", "standards" ], - "time": "2016-05-06 21:49:43" + "time": "2016-05-12 04:41:00" } ], "aliases": [], "minimum-stability": "dev", "stability-flags": { - "islandora/resource-service": 20, - "islandora/collection-service": 20, "squizlabs/php_codesniffer": 20 }, "prefer-stable": false, From 84c6a085395e0d1491b829d6e30fbafde0467ad7 Mon Sep 17 00:00:00 2001 From: nruest Date: Thu, 12 May 2016 16:42:32 -0400 Subject: [PATCH 2/5] bad copypasta --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 31b55b1d..01076c8a 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "require": { "islandora/chullo": "^0.0", "islandora/resource-service" : "master", - "islandora/transaction-service" : "master", + "islandora/collection-service" : "master", "silex/silex": "^1.3", "symfony/config": "^3.0", "twig/twig": "^1.23", From 2b5f0971eecd00abe5a87a0b867457d22616f8ab Mon Sep 17 00:00:00 2001 From: nruest Date: Fri, 13 May 2016 13:22:22 -0400 Subject: [PATCH 3/5] composer update --- composer.lock | 84 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 69 insertions(+), 15 deletions(-) diff --git a/composer.lock b/composer.lock index 8f4f8e14..568b5f18 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "75f9f24598d3aa984992bb2f5958611f", - "content-hash": "094f3a28fa486c0c261599d2d0e326cf", + "hash": "9f02e35a4e7bd2e26140db43eff232c7", + "content-hash": "0905e173dc93c5b7247bae5718a367a2", "packages": [ { "name": "easyrdf/easyrdf", @@ -295,6 +295,57 @@ "homepage": "https://github.com/islandora-claw/chullo", "time": "2016-04-29 02:25:55" }, + { + "name": "islandora/collection-service", + "version": "dev-master", + "dist": { + "type": "path", + "url": "CollectionService", + "reference": "280f93c58aa5d6ab89d7e608f78f8e3f15aa8a8a", + "shasum": null + }, + "require": { + "easyrdf/easyrdf": "^0.9.1", + "islandora/chullo": "^0.0", + "islandora/resource-service": "master", + "islandora/transaction-service": "master", + "ml/json-ld": "^1.0", + "silex/silex": "^1.3", + "symfony/config": "^3.0", + "symfony/yaml": "^3.0", + "twig/twig": "^1.23" + }, + "require-dev": { + "phpunit/phpunit": "^4.8", + "squizlabs/php_codesniffer": "^2.0@dev" + }, + "type": "library", + "autoload": { + "psr-4": { + "Islandora\\CollectionService\\": "src/" + } + }, + "authors": [ + { + "name": "Islandora Foundation", + "email": "community@islandora.ca", + "role": "Owner" + }, + { + "name": "Diego Pino Navarro", + "email": "dpino@krayon.cl" + }, + { + "name": "Jared Whiklo", + "email": "jwhiklo@gmail.com" + }, + { + "name": "Nick Ruest", + "email": "ruestn@gmail.com" + } + ], + "description": "RESTful service providing PCDM Collections in Fedora 4" + }, { "name": "islandora/resource-service", "version": "dev-master", @@ -1056,12 +1107,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "18b24bc32d2495ae79d76e777368786a6536fe31" + "reference": "bf70183fee96c62cc63bcf0f600ad1fcc23e8cd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/18b24bc32d2495ae79d76e777368786a6536fe31", - "reference": "18b24bc32d2495ae79d76e777368786a6536fe31", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/bf70183fee96c62cc63bcf0f600ad1fcc23e8cd0", + "reference": "bf70183fee96c62cc63bcf0f600ad1fcc23e8cd0", "shasum": "" }, "require": { @@ -1101,7 +1152,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2016-04-12 18:09:53" + "time": "2016-05-11 13:57:40" }, { "name": "symfony/http-kernel", @@ -1109,12 +1160,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "710fdc71161656d48cff0d788c5c3a2886e4ee40" + "reference": "80001c27501d33a46d2fff4f4615358612d87b1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/710fdc71161656d48cff0d788c5c3a2886e4ee40", - "reference": "710fdc71161656d48cff0d788c5c3a2886e4ee40", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/80001c27501d33a46d2fff4f4615358612d87b1c", + "reference": "80001c27501d33a46d2fff4f4615358612d87b1c", "shasum": "" }, "require": { @@ -1183,7 +1234,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2016-05-09 22:35:04" + "time": "2016-05-11 13:57:40" }, { "name": "symfony/polyfill-mbstring", @@ -1748,21 +1799,24 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.7", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", - "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", + "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "require-dev": { + "phpunit/phpunit": "~4|~5" + }, "type": "library", "autoload": { "classmap": [ @@ -1785,7 +1839,7 @@ "keywords": [ "timer" ], - "time": "2015-06-21 08:01:12" + "time": "2016-05-12 18:03:57" }, { "name": "phpunit/php-token-stream", From 0b0bf7ba88585b86426a722b6ef7cb0401642fcc Mon Sep 17 00:00:00 2001 From: nruest Date: Fri, 13 May 2016 13:57:24 -0400 Subject: [PATCH 4/5] Prepare for 0.0.1 release. --- CollectionService/composer.json | 4 ++-- TransactionService/composer.json | 2 +- composer.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CollectionService/composer.json b/CollectionService/composer.json index d0282210..cda6f1c8 100644 --- a/CollectionService/composer.json +++ b/CollectionService/composer.json @@ -11,8 +11,8 @@ }], "require": { "islandora/chullo": "^0.0", - "islandora/resource-service" : "master", - "islandora/transaction-service" : "master", + "islandora/resource-service" : "^0.0", + "islandora/transaction-service" : "^0.0", "silex/silex": "^1.3", "symfony/config": "^3.0", "twig/twig": "^1.23", diff --git a/TransactionService/composer.json b/TransactionService/composer.json index 2bef2844..360572b1 100644 --- a/TransactionService/composer.json +++ b/TransactionService/composer.json @@ -9,7 +9,7 @@ ], "require": { "islandora/chullo": "^0.0", - "islandora/resource-service": "master", + "islandora/resource-service": "^0.0", "silex/silex": "^1.3" }, "autoload": { diff --git a/composer.json b/composer.json index 01076c8a..41bc764b 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,8 @@ ], "require": { "islandora/chullo": "^0.0", - "islandora/resource-service" : "master", - "islandora/collection-service" : "master", + "islandora/resource-service" : "^0.0", + "islandora/collection-service" : "^0.0", "silex/silex": "^1.3", "symfony/config": "^3.0", "twig/twig": "^1.23", From c21db7c97a14eb45f8d9ef1525090d2713e15aba Mon Sep 17 00:00:00 2001 From: nruest Date: Fri, 13 May 2016 14:04:45 -0400 Subject: [PATCH 5/5] Add license info to composer.json --- CollectionService/composer.json | 1 + ResourceService/composer.json | 1 + TransactionService/composer.json | 1 + 3 files changed, 3 insertions(+) diff --git a/CollectionService/composer.json b/CollectionService/composer.json index cda6f1c8..9d5fbd70 100644 --- a/CollectionService/composer.json +++ b/CollectionService/composer.json @@ -27,6 +27,7 @@ "autoload": { "psr-4": {"Islandora\\CollectionService\\": "src/"} }, + "license": "MIT", "authors": [ { "name": "Islandora Foundation", diff --git a/ResourceService/composer.json b/ResourceService/composer.json index f8ad34a1..b4142bee 100644 --- a/ResourceService/composer.json +++ b/ResourceService/composer.json @@ -16,6 +16,7 @@ "autoload": { "psr-4": {"Islandora\\ResourceService\\": "src/"} }, + "license": "MIT", "authors": [ { "name": "Islandora Foundation", diff --git a/TransactionService/composer.json b/TransactionService/composer.json index 360572b1..dd94aa28 100644 --- a/TransactionService/composer.json +++ b/TransactionService/composer.json @@ -19,6 +19,7 @@ "phpunit/phpunit": "^4.8", "squizlabs/php_codesniffer": "^2.0@dev" }, + "license": "MIT", "authors": [ { "name": "Islandora Foundation",