-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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.
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
fix(vulnerabilities)/vulnerabilities_fixes_datahub #8075
fix(vulnerabilities)/vulnerabilities_fixes_datahub #8075
Conversation
build.gradle
Outdated
@@ -89,7 +89,7 @@ project.ext.externalDependency = [ | |||
'elasticSearchRest': 'org.elasticsearch.client:elasticsearch-rest-high-level-client:' + elasticsearchVersion, | |||
'elasticSearchTransport': 'org.elasticsearch.client:transport:' + elasticsearchVersion, | |||
'findbugsAnnotations': 'com.google.code.findbugs:annotations:3.0.1', | |||
'graphqlJava': 'com.graphql-java:graphql-java:' + graphQLJavaVersion, | |||
'graphqlJava': 'com.graphql-java:graphql-java:19.4', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The version here should be incremented above from ext.graphQLJavaVersion = '19.0'
to the 19.4 version.
build.gradle
Outdated
'zookeeper': 'org.apache.zookeeper:zookeeper:3.4.14', | ||
'wire': 'com.squareup.wire:wire-compiler:3.7.1', | ||
'charle': 'com.charleskorn.kaml:kaml:0.53.0', | ||
'jsonv': 'org.json:json:20230227', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this is duplicated above 'json': 'org.json:json:20230227',
is the same as this one. Please consolidate to one.
datahub-upgrade/build.gradle
Outdated
@@ -23,6 +25,9 @@ dependencies { | |||
exclude group: "org.apache.htrace", module: "htrace-core4" | |||
exclude group: "org.eclipse.jetty", module: "jetty-util" | |||
exclude group: "org.apache.hadoop.thirdparty", module: "hadoop-shaded-protobuf_3_7" | |||
exclude group: "com.charleskorn.kaml",module:"kaml" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Couple of linting issues here, please add a space after the ,
to match the others. Thanks!
|
||
configurations.all{ | ||
exclude group: "commons-io",module:"commons-io" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Similar to above linting command, please add a space after the comma.
} | ||
|
||
configurations.all{ | ||
exclude group: "com.charleskorn.kaml",module:"kaml" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
linting
metadata-service/war/build.gradle
Outdated
implementation externalDependency.charle | ||
} | ||
configurations.all{ | ||
exclude group: "com.charleskorn.kaml",module:"kaml" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
linting
Overall this looks good, just a few minor updates. If you enable us to modify the branch I can fix up the minor issues, otherwise look forward to a slight revision. Thank you for this! |
Hey David-leifker
Changes are made according to the reviews.
Thankyou
Sejal Jain
Nucleus Teq
…On Fri, May 19, 2023 at 3:12 AM david-leifker ***@***.***> wrote:
Overall this looks good, just a few minor updates. If you enable us to
modify the branch I can fix up the minor issues, otherwise look forward to
a slight revision. Thank you for this!
—
Reply to this email directly, view it on GitHub
<#8075 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/A2DQ3SYOJVKC4SRKFDRKM7DXG2JUFANCNFSM6AAAAAAYGC6EU4>
.
You are receiving this because you modified the open/close state.Message
ID: ***@***.***>
|
Some of these fixes may have already been introduced to master, I suspect this is the branch conflicts. If possible please review the conflicts so that if there are remaining changes, we can merge them. Thank you! |
okey sure
…On Tue, May 23, 2023 at 1:14 AM david-leifker ***@***.***> wrote:
Some of these fixes may have already been introduced to master, I suspect
this is the branch conflicts. If possible please review the conflicts so
that if there are remaining changes, we can merge them. Thank you!
—
Reply to this email directly, view it on GitHub
<#8075 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/A2DQ3S7YD5U4KEMGRSTLIHTXHO6ZBANCNFSM6AAAAAAYGC6EU4>
.
You are receiving this because you modified the open/close state.Message
ID: ***@***.***>
|
Hello David-leifker |
6ca2653
into
datahub-project:nt-nuodata-vulnerabilites_fixes_datahub
Merged to alternative branch so I can make sure all the tests are passing for before merging. Plan is to merge from that branch. #8189 |
Okay |
Checklist