From c30be2e346bf13f7aecc7fb8a1ef96c9c764ee78 Mon Sep 17 00:00:00 2001 From: Johnathan Aspinwall Date: Tue, 13 Feb 2024 09:17:57 -0700 Subject: [PATCH 1/8] Upgrade mdCodes mdCodes -> 2.9.0 --- adiwg-json_schemas.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adiwg-json_schemas.gemspec b/adiwg-json_schemas.gemspec index b8eacf5..2b8fc90 100644 --- a/adiwg-json_schemas.gemspec +++ b/adiwg-json_schemas.gemspec @@ -22,5 +22,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rake", ">= 0" spec.add_development_dependency "json-schema", "~> 2.8.1" spec.add_development_dependency "minitest", "~>5" - spec.add_development_dependency "adiwg-mdcodes", "~> 2.7.5" + spec.add_development_dependency "adiwg-mdcodes", "~> 2.9.0" end From 1399e7d6abebe36496e329efbe3166375e2ed030 Mon Sep 17 00:00:00 2001 From: Johnathan Aspinwall Date: Tue, 13 Feb 2024 09:21:30 -0700 Subject: [PATCH 2/8] Increment Ruby Version v2.8.4 --- lib/adiwg/mdjson_schemas/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/adiwg/mdjson_schemas/version.rb b/lib/adiwg/mdjson_schemas/version.rb index dc2542c..4797a86 100644 --- a/lib/adiwg/mdjson_schemas/version.rb +++ b/lib/adiwg/mdjson_schemas/version.rb @@ -1,6 +1,6 @@ module ADIWG module MdjsonSchemas # Current schema version number - VERSION = "2.8.2" + VERSION = "2.8.4" end end From 360c371ff8edcf91d435e0c28aaf8ae335d401e3 Mon Sep 17 00:00:00 2001 From: Johnathan Aspinwall Date: Tue, 13 Feb 2024 09:23:00 -0700 Subject: [PATCH 3/8] Increment package.json Version v2.8.4 Update package-lock.json --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index d9ca0fa..7fa51d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,12 @@ { "name": "mdjson-schemas", - "version": "2.8.3", + "version": "2.8.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mdjson-schemas", + "version": "2.8.4", "license": "GPL-3.0", "devDependencies": { "ajv": "^6.5.0", @@ -14,8 +15,7 @@ "mkdirp": "^0.5.1", "mocha": "^10.2.0", "rimraf": "^2.6.1" - }, - "version": "2.8.3" + } }, "node_modules/ajv": { "version": "6.12.6", diff --git a/package.json b/package.json index 699d11b..14098fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mdjson-schemas", - "version": "2.8.3", + "version": "2.8.4", "description": "JSON schemas, examples, and templates for ADIwg metadata standards", "main": "index.js", "directories": { From d90708caffbdb844a9134330bb38d4e25a7c6b96 Mon Sep 17 00:00:00 2001 From: Johnathan Aspinwall Date: Tue, 13 Feb 2024 10:43:30 -0700 Subject: [PATCH 4/8] Increment Patch Version v2.8.4 --- schema/schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/schema.json b/schema/schema.json index 4dd051c..b195f04 100644 --- a/schema/schema.json +++ b/schema/schema.json @@ -1,7 +1,7 @@ { "id": "schema.json#", "$schema": "http://json-schema.org/draft-04/schema#", - "version": "2.8.3", + "version": "2.8.4", "description": "schema for ADIwg mdJSON metadata", "example": "../examples/mdJson.json", "type": "object", From 66fcc709bbe4a0a2257b883b7fc3a6a3daafb952 Mon Sep 17 00:00:00 2001 From: Johnathan Aspinwall Date: Tue, 13 Feb 2024 12:31:59 -0700 Subject: [PATCH 5/8] Update package-lock.json --- package-lock.json | 97 +++++++++++++++++------------------------------ 1 file changed, 35 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7fa51d0..26377ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -336,9 +336,9 @@ "dev": true }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "dev": true, "engines": { "node": ">=6" @@ -412,9 +412,9 @@ "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -640,10 +640,13 @@ } }, "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/mkdirp": { "version": "0.5.6", @@ -658,9 +661,9 @@ } }, "node_modules/mocha": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", - "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz", + "integrity": "sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg==", "dev": true, "dependencies": { "ansi-colors": "4.1.1", @@ -670,13 +673,12 @@ "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", - "glob": "7.2.0", + "glob": "8.1.0", "he": "1.2.0", "js-yaml": "4.1.0", "log-symbols": "4.1.0", "minimatch": "5.0.1", "ms": "2.1.3", - "nanoid": "3.3.3", "serialize-javascript": "6.0.0", "strip-json-comments": "3.1.1", "supports-color": "8.1.1", @@ -691,44 +693,36 @@ }, "engines": { "node": ">= 14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" + } + }, + "node_modules/mocha/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" } }, "node_modules/mocha/node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "minimatch": "^5.0.1", + "once": "^1.3.0" }, "engines": { - "node": "*" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/mocha/node_modules/glob/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/mocha/node_modules/minimatch": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", @@ -741,33 +735,12 @@ "node": ">=10" } }, - "node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "node_modules/nanoid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", - "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", - "dev": true, - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -856,9 +829,9 @@ } }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, "engines": { "node": ">=6" From ac660f602de901d13384b51d6b1b92791391db2a Mon Sep 17 00:00:00 2001 From: Johnathan Aspinwall Date: Tue, 13 Feb 2024 12:54:32 -0700 Subject: [PATCH 6/8] Replace bower.json --- bower.json | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 bower.json diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..392d4f8 --- /dev/null +++ b/bower.json @@ -0,0 +1,22 @@ +{ + "name": "mdjson-schemas", + "homepage": "https://github.com/adiwg/mdJson-schemas", + "authors": ["Josh Bradley "], + "description": "JSON schemas, examples, and templates for ADIwg metadata standards", + "main": "schema/schema.json", + "keywords": ["json", "json-schema", "metadata", "ADIwg"], + "license": "Unlicense", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests", + "lib", + "*.gemspec", + "Gemfile", + "Gemfile.lock", + "pkg", + "Rakefile" + ] +} From d3aa8ff04aed06125a79ac728dccefb5b2185650 Mon Sep 17 00:00:00 2001 From: Johnathan Aspinwall Date: Tue, 13 Feb 2024 13:28:26 -0700 Subject: [PATCH 7/8] Re-remove bower.json --- bower.json | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 bower.json diff --git a/bower.json b/bower.json deleted file mode 100644 index 392d4f8..0000000 --- a/bower.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "mdjson-schemas", - "homepage": "https://github.com/adiwg/mdJson-schemas", - "authors": ["Josh Bradley "], - "description": "JSON schemas, examples, and templates for ADIwg metadata standards", - "main": "schema/schema.json", - "keywords": ["json", "json-schema", "metadata", "ADIwg"], - "license": "Unlicense", - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests", - "lib", - "*.gemspec", - "Gemfile", - "Gemfile.lock", - "pkg", - "Rakefile" - ] -} From da8d366e8045633a3b50271480e8b17f52f20d4f Mon Sep 17 00:00:00 2001 From: Johnathan Aspinwall Date: Tue, 13 Feb 2024 14:49:59 -0700 Subject: [PATCH 8/8] Increment Minor Version --- lib/adiwg/mdjson_schemas/version.rb | 2 +- package-lock.json | 4 ++-- package.json | 6 +++--- schema/schema.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/adiwg/mdjson_schemas/version.rb b/lib/adiwg/mdjson_schemas/version.rb index 4797a86..47e712e 100644 --- a/lib/adiwg/mdjson_schemas/version.rb +++ b/lib/adiwg/mdjson_schemas/version.rb @@ -1,6 +1,6 @@ module ADIWG module MdjsonSchemas # Current schema version number - VERSION = "2.8.4" + VERSION = "2.9.0" end end diff --git a/package-lock.json b/package-lock.json index 26377ba..2aa74ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mdjson-schemas", - "version": "2.8.4", + "version": "2.9.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mdjson-schemas", - "version": "2.8.4", + "version": "2.9.0", "license": "GPL-3.0", "devDependencies": { "ajv": "^6.5.0", diff --git a/package.json b/package.json index 14098fa..bb7a2de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mdjson-schemas", - "version": "2.8.4", + "version": "2.9.0", "description": "JSON schemas, examples, and templates for ADIwg metadata standards", "main": "index.js", "directories": { @@ -10,8 +10,8 @@ }, "scripts": { "test": "mocha", - "prepublishOnly": "scripts/prepublish.js", - "pretest": "scripts/prepublish.js" + "prepublish": "node scripts/prepublish.js", + "release": "npm run prepublish && npm publish" }, "files": [ "examples", diff --git a/schema/schema.json b/schema/schema.json index b195f04..69e5623 100644 --- a/schema/schema.json +++ b/schema/schema.json @@ -1,7 +1,7 @@ { "id": "schema.json#", "$schema": "http://json-schema.org/draft-04/schema#", - "version": "2.8.4", + "version": "2.9.0", "description": "schema for ADIwg mdJSON metadata", "example": "../examples/mdJson.json", "type": "object",