Skip to content

Conversation

@swamirishi
Copy link
Contributor

@swamirishi swamirishi commented Mar 30, 2023

What changes were proposed in this pull request?

Ranger depends on jackson version 1.9.13. Please check #4497

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/HDDS-8320

How was this patch tested?

Ozone Internal tests

@kerneltime
Copy link
Contributor

kerneltime commented Mar 30, 2023

Looks like the jar file list needs updating now that we are not excluding the ranger transitive dependency

Jar files are added/removed to/from the binary package.
[11](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:12)

[12](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:13)
Please update the hadoop-ozone/dist/src/main/license/bin/LICENSE.txt file with the modification
[13](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:14)
   AND execute hadoop-ozone/dist/src/main/license/update-jar-report.sh when you are ready (after a full build)
[14](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:15)

[15](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:16)
Generated hadoop-ozone/dist/src/main/license/jar-report.txt file should be added to your pull-request. It will be used as the base of future comparison.
[16](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:17)

[17](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:18)
This check may also report positive for PRs if the source is not up-to-date with the base branch (eg. `master`).  In this case please merge the base branch into your source branch.
[18](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:19)

[19](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:20)
Changed jars:
[20](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:21)

[21](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:22)
--- /dev/fd/63	2023-03-30 22:11:54.870987553 +0000
[22](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:23)
+++ /dev/fd/62	2023-03-30 22:11:54.870987553 +0000
[23](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:24)
@@ -93,11 +93,14 @@
[24](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:25)
 share/ozone/lib/istack-commons-runtime.jar
[25](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:26)
 share/ozone/lib/j2objc-annotations.jar
[26](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:27)
 share/ozone/lib/jackson-annotations.jar
[27](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:28)
+share/ozone/lib/jackson-core-asl.jar
[28](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:29)
 share/ozone/lib/jackson-core.jar
[29](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:30)
 share/ozone/lib/jackson-databind.jar
[30](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:31)
 share/ozone/lib/jackson-dataformat-cbor.jar
[31](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:32)
 share/ozone/lib/jackson-dataformat-xml.jar
[32](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:33)
 share/ozone/lib/jackson-datatype-jsr310.jar
[33](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:34)
+share/ozone/lib/jackson-jaxrs.jar
[34](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:35)
+share/ozone/lib/jackson-mapper-asl.jar
[35](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:36)
 share/ozone/lib/jackson-module-jaxb-annotations.jar
[36](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:37)
 share/ozone/lib/jaeger-client.jar
[37](https://github.com/apache/ozone/actions/runs/4569222971/jobs/8065748986?pr=4504#step:5:38)
 share/ozone/lib/jaeger-core.jar```

Comment on lines +162 to +163
<jackson1.version>1.9.13</jackson1.version>
<jackson-jaxr.version>1.9.13</jackson-jaxr.version>
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add a separate version property for jackson-mapper-asl. It tends to have a patch version.

On the other hand, I don't think we need a separate version property for jackson-jaxrs, it can use the generic jackson1-version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Both jackson-mapper-asl & jackson-core-asl have the same patch version. jackson-jaxrs doesn't seem to have a patched version.

@adoroszlai adoroszlai merged commit 612cfd6 into apache:master Mar 31, 2023
<artifactId>jersey-client</artifactId>
</dependency>

<!-- Overrider ranger-intg jackson version -->
Copy link
Contributor

Choose a reason for hiding this comment

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

Uh oh I noticed the typo in the comment too late. Guess we can fix it next time.


<!-- jackson versions -->
<jackson1.version>1.9.13</jackson1.version>
<jackson-jaxr.version>1.9.13</jackson-jaxr.version>
Copy link
Contributor

Choose a reason for hiding this comment

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

Unfortunately there is also a typo in the tag name. Missing an s at the end

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants