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

Jump to bottom

Remove jackson-databind and jackson-annotations #587

Merged
merged 3 commits into from
Dec 15, 2022
Merged

Remove jackson-databind and jackson-annotations #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bad6d3b
Remove jackson-databind and jackson-annotations dependencies
rupal-bq Dec 15, 2022
482362f
resolve dompurify conflicting dependencies
rupal-bq Dec 15, 2022
0fe61f5
fix build
rupal-bq Dec 15, 2022
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
2 changes: 1 addition & 1 deletion dashboards-reports/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"async-mutex": "^0.2.6",
"babel-polyfill": "^6.26.0",
"cron-validator": "^1.1.1",
"dompurify": "^2.3.8",
"dompurify": "^2.4.1",
Copy link
Member

Choose a reason for hiding this comment

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

Is this change intentional? don't find mention of this in PR description

Copy link
Member Author

@rupal-bq rupal-bq Dec 15, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Yes it is intentional. Build was failing with error

ERROR [single_version_dependencies] Multiple version ranges for the same dependency
      were found declared across different package.json files. Please consolidate
      those to match across all package.json files. Different versions for the
      same dependency is not supported.

      If you have questions about this please reach out to the operations team.

      The conflicting dependencies are:

        dompurify
          ^2.4.1 => opensearch-dashboards
          ^2.3.8 => reports-dashboards
error Command failed with exit code 1.

Ref: https://github.com/opensearch-project/dashboards-reporting/actions/runs/3701723685/jobs/6271294102

Copy link
Member Author

Choose a reason for hiding this comment

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

added in PR description

"elastic-builder": "^2.7.1",
"enzyme-adapter-react-16": "^1.15.5",
"jest-fetch-mock": "^3.0.3",
Expand Down
8 changes: 4 additions & 4 deletions dashboards-reports/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2508,10 +2508,10 @@ domhandler@^3.0, domhandler@^3.0.0:
dependencies:
domelementtype "^2.0.1"

dompurify@^2.3.8:
version "2.3.8"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f"
integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw==
dompurify@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.1.tgz#f9cb1a275fde9af6f2d0a2644ef648dd6847b631"
integrity sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==

domutils@^2.0.0:
version "2.2.0"
Expand Down
5 changes: 1 addition & 4 deletions reports-scheduler/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ buildscript {
common_utils_version = System.getProperty("common_utils.version", opensearch_build)
job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)
kotlin_version = System.getProperty("kotlin.version", "1.6.0")
jackson_version = "2.14.1"
}

repositories {
Expand Down Expand Up @@ -166,10 +165,8 @@ dependencies {
implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
implementation "org.json:json:20180813"
implementation group: 'com.github.wnameless.json', name: 'json-flattener', version: '0.15.1'
// json-base, jackson-databind, jackson-annotations are transitive dependencies by json-flattener
// json-base is transitive dependencies by json-flattener
implementation group: 'com.github.wnameless.json', name: 'json-base', version: '2.2.1'
implementation "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
implementation "com.fasterxml.jackson.core:jackson-annotations:${jackson_version}"
implementation 'org.jsoup:jsoup:1.15.3'
implementation 'com.google.code.gson:gson:2.8.9'
implementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
Expand Down