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.

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

HADOOP-17707. Remove jaeger document from site index. #17

Merged
merged 4 commits into from May 19, 2021

Conversation

tasanuma
Copy link
Member

@tasanuma
Copy link
Member Author

@jojochuang Could you review it? We may need it in 1.1.0.

@tasanuma tasanuma requested a review from jojochuang May 18, 2021 03:18
Copy link
Contributor

@jojochuang jojochuang left a comment

Choose a reason for hiding this comment

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

Thank you. I didn't realize we have this doc, since it wasn't generated automatically.
It also looks like the this doc isn't published to the Hadoop website (makes sense since it's intended for internal consumption).

Can we also add the description for the shaded guava?

@smengcl
Copy link
Contributor

smengcl commented May 18, 2021

Thanks @tasanuma @jojochuang for taking care of the doc.

Posting mvn dependency:tree result on latest trunk here just for reference:

[INFO] ------< org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7 >-------
[INFO] Building Apache Hadoop shaded Protobuf 3.7 1.2.0-SNAPSHOT          [2/3]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- maven-dependency-plugin:3.0.2:tree (default-cli) @ hadoop-shaded-protobuf_3_7 ---
[INFO] org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:jar:1.2.0-SNAPSHOT
[INFO] \- com.google.protobuf:protobuf-java:jar:3.7.1:compile
[INFO]
[INFO] ----------< org.apache.hadoop.thirdparty:hadoop-shaded-guava >----------
[INFO] Building Apache Hadoop shaded Guava 1.2.0-SNAPSHOT                 [3/3]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- maven-dependency-plugin:3.0.2:tree (default-cli) @ hadoop-shaded-guava ---
[INFO] org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:1.2.0-SNAPSHOT
[INFO] \- com.google.guava:guava:jar:30.1.1-jre:compile
[INFO]    +- com.google.guava:failureaccess:jar:1.0.1:compile
[INFO]    +- com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile
[INFO]    +- com.google.code.findbugs:jsr305:jar:3.0.2:compile
[INFO]    +- org.checkerframework:checker-qual:jar:3.8.0:compile
[INFO]    \- com.google.j2objc:j2objc-annotations:jar:1.3:compile
[INFO] ------------------------------------------------------------------------

@tasanuma
Copy link
Member Author

@jojochuang @smengcl Thanks for your reviews and your help. I added guava document.

Copy link
Contributor

@jojochuang jojochuang left a comment

Choose a reason for hiding this comment

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

can we also include these transitive dependencies into the list?

[INFO] +- com.google.guava:failureaccess:jar:1.0.1:compile
[INFO] +- com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile
[INFO] +- com.google.code.findbugs:jsr305:jar:3.0.2:compile
[INFO] +- org.checkerframework:checker-qual:jar:3.8.0:compile

j2objc is excluded during shading so no need to include.

@tasanuma
Copy link
Member Author

@jojochuang I added the information about org.checkerframework.

failureaccess and listenablefuture are included in com.google.guava, and both of the relocations are under the org.apache.hadoop.thirdparty.com.google. So I think it is enough to write the path of com.google.guava.

I can't find the relocation of com.google.code.findbugs:jsr305. Since Hadoop is using com.google.code.findbugs:jsr305 directly, we may not need to write it here.

@tasanuma tasanuma merged commit 2991460 into apache:trunk May 19, 2021
@tasanuma
Copy link
Member Author

Thanks for your view, @jojochuang.

@tasanuma tasanuma deleted the HADOOP-17707 branch May 19, 2021 06:44
@tasanuma
Copy link
Member Author

Sorry, I forgot to squash it...

@smengcl
Copy link
Contributor

smengcl commented May 19, 2021

@tasanuma We can probably configure the "Merge button" config in Repo Settings page the same as apache/hadoop to only allow squash merging.

@tasanuma
Copy link
Member Author

I don't have the privilege to see the Repo Settings page. Maybe we need to add .asf.yml like HADOOP-17234?

@tasanuma
Copy link
Member Author

Actually, we asked INFRA to only allow squash merging for apache/hadoop. I will create another jira for hadoop-thirdparty.
https://issues.apache.org/jira/browse/INFRA-18777

@tasanuma
Copy link
Member Author

Now only the "Squash and Merge" is enabled.
https://issues.apache.org/jira/browse/INFRA-21905

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants