Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove --openssl-legacy-provider flag #1287

Merged
merged 1 commit into from
Jan 30, 2025
Merged

remove --openssl-legacy-provider flag #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@
"license": "Apache-2.0",
"scripts": {
"dev": "concurrently \"yarn start\" \"gulp watch\" \"yarn cdap-dev-build-w\" \"yarn build-dev-common-w\"",
"start": "NODE_OPTIONS=\"--openssl-legacy-provider\" yarn run build-server && NODE_ENV=development node ./packaged/server_dist/index.js",
"cdap-prod-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=production parallel-webpack",
"cdap-dev-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.js -d",
"cdap-dev-build-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --watch -d ",
"reload-dev-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=reload node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js",
"hmr-dev-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=hmr node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js",
"cdap-full-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" run-p cdap-prod-build distribute",
"cdap-full-build-more-memory": "NODE_OPTIONS=\"--openssl-legacy-provider --max_old_space_size=8192\" run-p cdap-prod-build distribute",
"cdap-non-optimized-full-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=non-optimized-production webpack --config=webpack.config.js",
"start": "yarn run build-server && NODE_ENV=development node ./packaged/server_dist/index.js",
"cdap-prod-build": "NODE_ENV=production parallel-webpack",
"cdap-dev-build": "NODE_ENV=development parallel-webpack --config=webpack.config.js -d",
"cdap-dev-build-w": "NODE_ENV=development parallel-webpack --watch -d ",
"reload-dev-w": "NODE_ENV=reload node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js",
"hmr-dev-w": "NODE_ENV=hmr node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js",
"cdap-full-build": "run-p cdap-prod-build distribute",
"cdap-full-build-more-memory": "NODE_OPTIONS=\"--max_old_space_size=8192\" run-p cdap-prod-build distribute",
"cdap-non-optimized-full-build": "NODE_ENV=non-optimized-production webpack --config=webpack.config.js",
"clean-node-modules": "modclean -P -r --patterns=\"default:safe\" --additional-patterns=\"*.xls?x,*.ppt?x,*.rtf,*.png,*.jpg,*.jpeg,*.txt\" --ignore=\"validate-npm-license,readme*\"",
"distribute": "node ./node_modules/gulp/bin/gulp.js distribute",
"build": "node ./node_modules/gulp/bin/gulp.js build",
"build-w": "node ./node_modules/gulp/bin/gulp.js watch",
"build-prod-common": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=production parallel-webpack --config=webpack.config.common.js",
"build-dev-common": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.common.js",
"build-dev-common-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.common.js -d --watch",
"build-prod-dlls": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=production parallel-webpack --config=webpack.config.dlls.js",
"build-dev-dlls": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.dlls.js",
"build-server": "NODE_OPTIONS=\"--openssl-legacy-provider\" webpack --config=webpack.config.server.js",
"build-prod-common": "NODE_ENV=production parallel-webpack --config=webpack.config.common.js",
"build-dev-common": "NODE_ENV=development parallel-webpack --config=webpack.config.common.js",
"build-dev-common-w": "NODE_ENV=development parallel-webpack --config=webpack.config.common.js -d --watch",
"build-prod-dlls": "NODE_ENV=production parallel-webpack --config=webpack.config.dlls.js",
"build-dev-dlls": "NODE_ENV=development parallel-webpack --config=webpack.config.dlls.js",
"build-server": "webpack --config=webpack.config.server.js",
"jest": "jest --coverage",
"jest-w": "jest --watch",
"karma-test": "node ./node_modules/karma/bin/karma start test/karma-conf.js",
Expand Down Expand Up @@ -145,14 +145,14 @@
"stylelint": "12.0.1",
"stylelint-webpack-plugin": "1.1.2",
"svg-sprite-loader": "4.1.6",
"terser-webpack-plugin": "2.3.1",
"terser-webpack-plugin": "4.2.3",
"ts-jest": "26.4.3",
"ts-loader": "8.0.7",
"tslint": "5.20.1",
"tslint-config-prettier": "1.18.0",
"tslint-plugin-prettier": "2.1.0",
"url-loader": "3.0.0",
"webpack": "4.41.2",
"webpack": "4.47.0",
"webpack-cli": "3.3.10",
"webpack-livereload-plugin": "2.2.0",
"yaml-jest": "^1.2.0"
Expand Down
18 changes: 14 additions & 4 deletions src/e2e-test/java/io/cdap/cdap/ui/stepsdesign/CommonSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.openqa.selenium.Alert;
import org.openqa.selenium.By;
import org.openqa.selenium.NoAlertPresentException;
import org.openqa.selenium.StaleElementReferenceException;
import org.openqa.selenium.UnhandledAlertException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.WindowType;
Expand Down Expand Up @@ -219,12 +220,21 @@ public void pipelineBannerIsShownWithMessage(String message) {
}

@Then("Error classification banner is shown")
public void errorClassificationBannerIsShown() {
WaitHelper.waitForElementToBeDisplayed(
Helper.locateElementByTestId("features-pipelineDetails-errorDetails-errorCountMessage"));
public void errorClassificationBannerIsShown() throws InterruptedException {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the test failure related to the current change-set?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it's unrelated. But this test step was flaky and it failed while I was working on this branch.

String bannerTestid = "features-pipelineDetails-errorDetails-errorCountMessage";
for (int retries = 0; retries < 3; retries += 1) {
try {
WaitHelper.waitForElementToBeDisplayed(Helper.locateElementByTestId(bannerTestid));
break;
} catch (StaleElementReferenceException e) {
// do nothing, if this exception was thrown in all 3 retries,
// then the next assertion will fail anyway
}
}
Thread.sleep(1000);
Assert.assertTrue(
ElementHelper.isElementDisplayed(
Helper.locateElementByTestId("features-pipelineDetails-errorDetails-errorCountMessage")));
Helper.locateElementByTestId(bannerTestid)));
}

@Then("Cleanup pipeline {string}")
Expand Down
1 change: 1 addition & 0 deletions webpack.config.cdap.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ var webpackConfig = {
path: __dirname + '/packaged/public/cdap_dist/cdap_assets/',
publicPath: '/cdap_assets/',
pathinfo: false, // added. reduces 0.2~0.3 seconds
hashFunction: 'sha512',
},
stats: {
assets: false,
Expand Down
1 change: 1 addition & 0 deletions webpack.config.cdap.dll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const getWebpackOutputObj = (mode) => {
filename: 'dll.cdap.[name].js',
library: 'cdap_[name]',
globalObject: 'window',
hashFunction: 'sha512',
};
if (mode === 'development') {
output.filename = 'dll.cdap.[name].development.js';
Expand Down
1 change: 1 addition & 0 deletions webpack.config.cdap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ var webpackConfig = {
chunkFilename: '[name].[chunkhash].js',
path: __dirname + '/packaged/public/cdap_dist/cdap_assets/',
publicPath: '/cdap_assets/',
hashFunction: 'sha512',
},
stats: {
assets: false,
Expand Down
1 change: 1 addition & 0 deletions webpack.config.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ var webpackConfig = {
libraryTarget: 'umd',
publicPath: '/common_assets/',
globalObject: 'window',
hashFunction: 'sha512',
},
externals: {
react: {
Expand Down
1 change: 1 addition & 0 deletions webpack.config.login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ var webpackConfig = {
filename: '[name].js',
path: __dirname + '/packaged/public/login_dist/login_assets',
publicPath: '/login_assets/',
hashFunction: 'sha512',
},
plugins: plugins,
resolve: {
Expand Down
1 change: 1 addition & 0 deletions webpack.config.server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ var webpackConfig = {
filename: 'index.js',
path: __dirname + '/packaged/server_dist/',
publicPath: '/packaged/server_dist/',
hashFunction: 'sha512',
},
plugins: [
new CleanWebpackPlugin(cleanOptions),
Expand Down
1 change: 1 addition & 0 deletions webpack.config.shared.dll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const getWebpackOutputObj = (mode) => {
filename: 'dll.shared.[name].js',
library: 'shared_[name]',
globalObject: 'window',
hashFunction: 'sha512',
};
if (mode === 'development') {
output.filename = 'dll.shared.[name].development.js';
Expand Down
Loading