diff --git a/.github/workflows/upstream-adf.yml b/.github/workflows/upstream-adf.yml index 120439de48..de8ebbc041 100644 --- a/.github/workflows/upstream-adf.yml +++ b/.github/workflows/upstream-adf.yml @@ -127,7 +127,7 @@ jobs: echo "Migration JS done" } migrateAllDependencies() { - echo "Update ADF dependencies to: ${PACKAGE_VERSION_JS} and JS dependencies to: ${PACKAGE_VERSION_JS}" + echo "Update ADF dependencies to: ${PACKAGE_VERSION_ADF} and JS dependencies to: ${PACKAGE_VERSION_JS}" ./scripts/update-version.sh -v ${PACKAGE_VERSION_ADF} -vj ${PACKAGE_VERSION_JS} echo "Migration done" } diff --git a/package-lock.json b/package-lock.json index 94170dd44c..f2b6e7f6ab 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.6.0-7474313481", - "@alfresco/adf-core": "6.6.0-7474313481", - "@alfresco/adf-extensions": "6.6.0-7474313481", - "@alfresco/eslint-plugin-eslint-angular": "6.6.0-7474313481", - "@alfresco/js-api": "7.5.0-7474313481", + "@alfresco/adf-content-services": "6.7.0-7658974792", + "@alfresco/adf-core": "6.7.0-7658974792", + "@alfresco/adf-extensions": "6.7.0-7658974792", + "@alfresco/eslint-plugin-eslint-angular": "6.7.0-7658974792", + "@alfresco/js-api": "7.6.0-7658974792", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -42,7 +42,7 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.6.0-7474313481", + "@alfresco/adf-cli": "6.7.0-7658974792", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", @@ -123,12 +123,12 @@ "dev": true }, "node_modules/@alfresco/adf-cli": { - "version": "6.6.0-7474313481", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.6.0-7474313481.tgz", - "integrity": "sha512-ipqgfLZXbBpA1VKAxDjFUGbBsMSI38Ee0lzM9D543xRAuuyUf8a9QRMGWlBq1CWecsjR+of9ApZQDucwH2w3hA==", + "version": "6.7.0-7658974792", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-6.7.0-7658974792.tgz", + "integrity": "sha512-q33P/6BoQ5uSUW2oq8i1cj4EE3tnT6Um8/CjIKpil17kNRcZCvOFMcMWXGgl6t1ZnKQ44H21HYqyclw+OoBVyw==", "dev": true, "dependencies": { - "@alfresco/js-api": ">=7.5.0-7474313481", + "@alfresco/js-api": ">=7.6.0-7658974792", "commander": "^6.2.1", "ejs": "^3.1.9", "license-checker": "^25.0.1", @@ -143,15 +143,15 @@ } }, "node_modules/@alfresco/adf-content-services": { - "version": "6.6.0-7474313481", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.6.0-7474313481.tgz", - "integrity": "sha512-WF8z+sSqv5S5G6epmDyf5JiP8ouuBZ2U3cCmmnDJ8VDjxufFHm+EftgokwGLSIDkxDxDC5gv9xIBEjN9Ysf6aQ==", + "version": "6.7.0-7658974792", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-6.7.0-7658974792.tgz", + "integrity": "sha512-94dQX04lEKiE9Kq/EBlfE2bJku0SIr1OkHQOgwEU0az0ea9NpSDCIq7b2zSA9xvApRumhnt5LNbdz25GsGaiaQ==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-core": ">=6.6.0-7474313481", - "@alfresco/js-api": ">=7.5.0-7474313481", + "@alfresco/adf-core": ">=6.7.0-7658974792", + "@alfresco/js-api": ">=7.6.0-7658974792", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -166,9 +166,9 @@ } }, "node_modules/@alfresco/adf-core": { - "version": "6.6.0-7474313481", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.6.0-7474313481.tgz", - "integrity": "sha512-V13pmy1G8YNYglHrftAL8kKgHWcUBozH5x+bahnPBUY0hyWkzhxvah/eauNbXgQdc6hjB1E9EWhXQSTbQgQ9xA==", + "version": "6.7.0-7658974792", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-6.7.0-7658974792.tgz", + "integrity": "sha512-/iWsYBChKigk92GPIqycu3g5CSqqtUYXyo3SyCi0N+LEcq8th4sFawRILbrmS9JwHoVYiyfzrHVztrU4hEMfXA==", "dependencies": { "angular-oauth2-oidc": "^13.0.1", "angular-oauth2-oidc-jwks": "^13.0.1", @@ -176,8 +176,8 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/adf-extensions": ">=6.6.0-7474313481", - "@alfresco/js-api": ">=7.5.0-7474313481", + "@alfresco/adf-extensions": ">=6.7.0-7658974792", + "@alfresco/js-api": ">=7.6.0-7658974792", "@angular/animations": ">=14.1.3", "@angular/cdk": ">=14.1.2", "@angular/common": ">=14.1.3", @@ -192,27 +192,27 @@ } }, "node_modules/@alfresco/adf-extensions": { - "version": "6.6.0-7474313481", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.6.0-7474313481.tgz", - "integrity": "sha512-e8VdQCBFyCmGR6vS6TOqUkYUOP4XU10NSUYeyImQLJxTxtKW/R4GIWocTyYSsk1/B5pL8qify/lN+FnBesTvsA==", + "version": "6.7.0-7658974792", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-6.7.0-7658974792.tgz", + "integrity": "sha512-lyqTLtRaYrS5wqB6qAn+cmjFVpzB/e7bt3if6/SjJekW/5bpYMr8Q/NcFt2nwJpuB9STLh1kwst8zPvUYnK1Fw==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@alfresco/js-api": ">=7.5.0-7474313481", + "@alfresco/js-api": ">=7.6.0-7658974792", "@angular/common": ">=14.1.3", "@angular/core": ">=14.1.3" } }, "node_modules/@alfresco/eslint-plugin-eslint-angular": { - "version": "6.6.0-7474313481", - "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.6.0-7474313481.tgz", - "integrity": "sha512-HXhoiZLZI1B8Fu41h+tZwWaozZfFRVE4sDZzFJ/B18zyiDOxzr8ayFg7XioRzjrw63pPK0Bd/ebKa2Pi+mL8Sg==" + "version": "6.7.0-7658974792", + "resolved": "https://registry.npmjs.org/@alfresco/eslint-plugin-eslint-angular/-/eslint-plugin-eslint-angular-6.7.0-7658974792.tgz", + "integrity": "sha512-sjB04Za9ZEPsluYNz76nyQFjZDI0SH0AA7O79yOVsjwrGuJgyH5OQXxvk6gX6POFvVbyfyxGneE2p+6/whLMoA==" }, "node_modules/@alfresco/js-api": { - "version": "7.5.0-7474313481", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.5.0-7474313481.tgz", - "integrity": "sha512-fw9LKHLXtCW3PjYTM2kTp53BiRaZWtNcnH6c2aIc98qf4SQgxMgay6S8CwrWM1v2afpDWOeUF8qr1KZrbkY8pQ==", + "version": "7.6.0-7658974792", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-7.6.0-7658974792.tgz", + "integrity": "sha512-iwdPTm4lLK77V6Lwf6JHvADrJnNx6Zwv10vu3zMcDCXYHu71JtyNbHCuwXVuAwl30F5VMPzTIRwTjKpmR6FhFQ==", "dependencies": { "event-emitter": "^0.3.5", "superagent": "^8.0.9", diff --git a/package.json b/package.json index 8cdb5497ed..2fc33fd071 100644 --- a/package.json +++ b/package.json @@ -33,11 +33,11 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "6.6.0-7474313481", - "@alfresco/adf-core": "6.6.0-7474313481", - "@alfresco/adf-extensions": "6.6.0-7474313481", - "@alfresco/eslint-plugin-eslint-angular": "6.6.0-7474313481", - "@alfresco/js-api": "7.5.0-7474313481", + "@alfresco/adf-content-services": "6.7.0-7658974792", + "@alfresco/adf-core": "6.7.0-7658974792", + "@alfresco/adf-extensions": "6.7.0-7658974792", + "@alfresco/eslint-plugin-eslint-angular": "6.7.0-7658974792", + "@alfresco/js-api": "7.6.0-7658974792", "@angular/animations": "14.1.3", "@angular/cdk": "14.1.3", "@angular/common": "14.1.3", @@ -65,7 +65,7 @@ "zone.js": "0.11.8" }, "devDependencies": { - "@alfresco/adf-cli": "6.6.0-7474313481", + "@alfresco/adf-cli": "6.7.0-7658974792", "@angular-devkit/build-angular": "14.2.11", "@angular-devkit/core": "14.1.2", "@angular-devkit/schematics": "14.1.2", diff --git a/scripts/update-version.sh b/scripts/update-version.sh index 3462d27966..ccb38d87a7 100755 --- a/scripts/update-version.sh +++ b/scripts/update-version.sh @@ -63,12 +63,11 @@ fi libslength=${#libs[@]} -echo "====== Updating dependencies ======" -update - if [[ "${JS_VERSION}" == "" ]] then JS_VERSION=$VERSION fi +echo "====== Updating dependencies ======" update_js_api +update