From d54f97995b57aa795ec88b1a05cd7dba0995bb22 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 20 Jun 2023 21:05:25 +0100 Subject: [PATCH] use latest ADF (#3292) * use latest ADF * exclude failing test --- e2e/protractor/protractor.excludes.json | 3 +- package-lock.json | 81 +++++++++++-------------- package.json | 14 ++--- projects/aca-content/package.json | 8 +-- projects/aca-shared/package.json | 8 +-- 5 files changed, 52 insertions(+), 62 deletions(-) diff --git a/e2e/protractor/protractor.excludes.json b/e2e/protractor/protractor.excludes.json index 6dfb46e67..8f26192e3 100644 --- a/e2e/protractor/protractor.excludes.json +++ b/e2e/protractor/protractor.excludes.json @@ -18,5 +18,6 @@ "C279219": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985", "C279221": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985", "C279220": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985", - "C325006": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985" + "C325006": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985", + "C213097": "https://alfresco.atlassian.net/browse/ACS-5479" } diff --git a/package-lock.json b/package-lock.json index bca193bed..61c90c0a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,11 @@ "hasInstallScript": true, "license": "LGPL-3.0", "dependencies": { - "@alfresco/adf-content-services": "6.2.0-5321672533", - "@alfresco/adf-core": "6.2.0-5321672533", - "@alfresco/adf-extensions": "6.2.0-5321672533", - "@alfresco/eslint-plugin-eslint-angular": "6.2.0-5321672533", - "@alfresco/js-api": "^6.1.0", + "@alfresco/adf-content-services": "6.2.0-5325389849", + "@alfresco/adf-core": "6.2.0-5325389849", + "@alfresco/adf-extensions": "6.2.0-5325389849", + "@alfresco/eslint-plugin-eslint-angular": "6.2.0-5325389849", + "@alfresco/js-api": "^6.2.0-982", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -45,8 +45,8 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.2.0-5321672533", - "@alfresco/adf-testing": "6.2.0-5321672533", + "@alfresco/adf-cli": "6.2.0-5325389849", + "@alfresco/adf-testing": "6.2.0-5325389849", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", @@ -121,12 +121,12 @@ "dev": true }, "node_modules/@alfresco/adf-cli": { - "version": "6.2.0-5321672533", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.2.0-5321672533.tgz", - "integrity": "sha512-IKUO2tojy+/kCKmzwE7rA6y/SeArCZabbUOLRsIWrfUeg5rOswNoLC4866AGvpUb8ORBeXR0kno7nWh3WLSTKw==", + "version": "6.2.0-5325389849", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.2.0-5325389849.tgz", + "integrity": "sha512-2QfGpNtqaPa/PV+7tNMhmAqUXnes9vBkFqCcJHARt+/xJtEcRydHrJuZMg5eYTcv2BtnuP8WwY3ZJxY9QcsVrg==", "dev": true, "dependencies": { - "@alfresco/js-api": "^6.2.0-982", + "@alfresco/js-api": ">=6.2.0-982", "commander": "^6.2.1", "ejs": "^3.1.9", "license-checker": "^25.0.1", @@ -140,27 +140,16 @@ "adf-cli": "bin/adf-cli" } }, - "node_modules/@alfresco/adf-cli/node_modules/@alfresco/js-api": { - "version": "6.2.0-1002", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.2.0-1002.tgz", - "integrity": "sha512-7oUe2JS3ILOxe/SEh+AzMT9I+1pEIg+cSEUIjB7yfZGpqlNPm8QNzIpxGDwyAgd4hKfFygmCOBvxLDKFfr/Xlg==", - "dev": true, - "dependencies": { - "event-emitter": "^0.3.5", - "superagent": "^6.0.0", - "tslib": "^2.0.0" - } - }, "node_modules/@alfresco/adf-content-services": { - "version": "6.2.0-5321672533", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.2.0-5321672533.tgz", - "integrity": "sha512-WiE87GuDWAB6C9PCRDIQxMOACHdorbYH702DOTXayxe0iC4flc7s8Qlc0ovp5c8pEqx9iXIzw6kvXUI/j0N2dg==", + "version": "6.2.0-5325389849", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.2.0-5325389849.tgz", + "integrity": "sha512-dVWmt10VXJacSctKjpTjrb5XL34WNn+PbOsp+qgioqlyWv5vkwuS5DzHiGreDP7F/zG4gJSmmd+pgkLsRAoSqg==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-core": ">=6.2.0-5321672533", - "@alfresco/js-api": "^6.1.0", + "@alfresco/adf-core": ">=6.2.0-5325389849", + "@alfresco/js-api": ">=6.2.0-982", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -176,9 +165,9 @@ } }, "node_modules/@alfresco/adf-core": { - "version": "6.2.0-5321672533", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.2.0-5321672533.tgz", - "integrity": "sha512-QQifgwxZDQ9Z5klKtQ/NdJU844mOep0r4sJqIL3uRmzdFDVlwf6C1dGMgLxKu+wjslzD0qrUtscEI6PMhMaYZA==", + "version": "6.2.0-5325389849", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.2.0-5325389849.tgz", + "integrity": "sha512-dnWyeid6qjsRCTX5uOFqCRMTYHV0mBf0DimEWWYYNhAUHNEOW5k5JW2ffcCrh1wBCFpSnX2K0kDHVGU9a6LHWQ==", "dependencies": { "angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc-jwks": "^13.0.1", @@ -186,8 +175,8 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-extensions": ">=6.2.0-5321672533", - "@alfresco/js-api": "^6.1.0", + "@alfresco/adf-extensions": ">=6.2.0-5325389849", + "@alfresco/js-api": ">=6.2.0-982", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -205,22 +194,22 @@ } }, "node_modules/@alfresco/adf-extensions": { - "version": "6.2.0-5321672533", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.2.0-5321672533.tgz", - "integrity": "sha512-xlZPqoJ/K/zk++f9TinJSgq522qJyNZlAUS8cc9O22b/NiN6g6JT2ag0nT19fKKh/JmtynlffoIhAHKinoHfVQ==", + "version": "6.2.0-5325389849", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.2.0-5325389849.tgz", + "integrity": "sha512-oUaenrIDaSaHBTKWnUIZgxvq63MNDyRCZmuyFE3JJ9O/Ytc2RyzmuCG8r/ZrlORbQvnnDDcjyuLuIX+e5rhVIQ==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/js-api": "^6.1.0", + "@alfresco/js-api": ">=6.2.0-982", "@angular/common": ">=14.1.3", "@angular/core": ">=14.1.3" } }, "node_modules/@alfresco/adf-testing": { - "version": "6.2.0-5321672533", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.2.0-5321672533.tgz", - "integrity": "sha512-bzFse215oAyuLJOOs53dcueL2+x+0sVHsxpisFlTxwi5fGYCVO1PNTUSV94/PnBHHSyYKk9RFOIf6oXGri30eg==", + "version": "6.2.0-5325389849", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-6.2.0-5325389849.tgz", + "integrity": "sha512-vgja5pouI6Q0qPHRFh5u0yfD7ys8lDHsroqZ8U0sWHFZCOvqtd8OyEtnUTtomp1ZUjadniMwXPsv9Za6IUg6oA==", "dev": true, "dependencies": { "@alfresco/js-api": "6.2.0-982", @@ -231,7 +220,7 @@ "zone.js": "~0.11.4" }, "peerDependencies": { - "@alfresco/js-api": "^6.1.0" + "@alfresco/js-api": ">=6.2.0-982" } }, "node_modules/@alfresco/adf-testing/node_modules/@alfresco/js-api": { @@ -246,14 +235,14 @@ } }, "node_modules/@alfresco/eslint-plugin-eslint-angular": { - "version": "6.2.0-5321672533", - "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.2.0-5321672533.tgz", - "integrity": "sha512-Ey60BxuLdrWob85+euVWBKSD+eQuN0OF83KMGhkgrqDWkeXaTABYKC8XFqPRbPwzDv5fxNtdS/4Ht91lpHwFhw==" + "version": "6.2.0-5325389849", + "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.2.0-5325389849.tgz", + "integrity": "sha512-l1ZABCbMx1Iuj1kaYfuUyw/m5B1fE7ncBA2plLq+hSgNm/5l1ooxORKfgdXQiyV5pTXMvbKNkNH23YFVx1aaeg==" }, "node_modules/@alfresco/js-api": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.1.0.tgz", - "integrity": "sha512-bCPp/Yq/uMg9eJEKASGz2KCqZ6CDG09Pgdlit5GAGKNOpN3RuHtr6s7U1/TPCnXEOMjMUdM9suNfM/8WnC/gWA==", + "version": "6.2.0-1002", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.2.0-1002.tgz", + "integrity": "sha512-7oUe2JS3ILOxe/SEh+AzMT9I+1pEIg+cSEUIjB7yfZGpqlNPm8QNzIpxGDwyAgd4hKfFygmCOBvxLDKFfr/Xlg==", "dependencies": { "event-emitter": "^0.3.5", "superagent": "^6.0.0", diff --git a/package.json b/package.json index a7f6ca0f3..ff3e61e38 100644 --- a/package.json +++ b/package.json @@ -38,11 +38,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "6.2.0-5321672533", - "@alfresco/adf-core": "6.2.0-5321672533", - "@alfresco/adf-extensions": "6.2.0-5321672533", - "@alfresco/eslint-plugin-eslint-angular": "6.2.0-5321672533", - "@alfresco/js-api": "^6.1.0", + "@alfresco/adf-content-services": "6.2.0-5325389849", + "@alfresco/adf-core": "6.2.0-5325389849", + "@alfresco/adf-extensions": "6.2.0-5325389849", + "@alfresco/eslint-plugin-eslint-angular": "6.2.0-5325389849", + "@alfresco/js-api": "^6.2.0-982", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -73,8 +73,8 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.2.0-5321672533", - "@alfresco/adf-testing": "6.2.0-5321672533", + "@alfresco/adf-cli": "6.2.0-5325389849", + "@alfresco/adf-testing": "6.2.0-5325389849", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", diff --git a/projects/aca-content/package.json b/projects/aca-content/package.json index 989d48169..0f9d188df 100644 --- a/projects/aca-content/package.json +++ b/projects/aca-content/package.json @@ -5,10 +5,10 @@ "peerDependencies": { "@angular/common": "^14.1.0", "@angular/core": "^14.1.0", - "@alfresco/adf-core": "^6.1.0-0", - "@alfresco/adf-content-services": "^6.1.0-0", - "@alfresco/adf-extensions": "^6.1.0-0", - "@alfresco/js-api": "^6.1.0-0", + "@alfresco/adf-core": ">=6.2.0-5325389849", + "@alfresco/adf-content-services": ">=6.2.0-5325389849", + "@alfresco/adf-extensions": ">=6.2.0-5325389849", + "@alfresco/js-api": ">=6.2.0-982", "@angular/animations": "^14.1.3", "@angular/cdk": "^14.1.3", "@angular/forms": "^14.1.3", diff --git a/projects/aca-shared/package.json b/projects/aca-shared/package.json index 324b311a4..f08eeac08 100644 --- a/projects/aca-shared/package.json +++ b/projects/aca-shared/package.json @@ -5,10 +5,10 @@ "license": "LGPL-3.0", "scripts": {}, "peerDependencies": { - "@alfresco/adf-content-services": "^6.1.0-0", - "@alfresco/adf-core": "^6.1.0-0", - "@alfresco/adf-extensions": "^6.1.0-0", - "@alfresco/js-api": "^6.1.0-0", + "@alfresco/adf-content-services": ">=6.2.0-5325389849", + "@alfresco/adf-core": ">=6.2.0-5325389849", + "@alfresco/adf-extensions": ">=6.2.0-5325389849", + "@alfresco/js-api": ">=6.2.0-982", "@angular/animations": "^14.1.3", "@angular/common": "^14.1.3", "@angular/compiler": "^14.1.3",