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

Move java_features.proto to java/core/srce/main/resources #16309

Merged
merged 3 commits into from Mar 26, 2024
Merged

Conversation

zhangskz
Copy link
Member

This also fixes maven to package this correctly as google/protobuf/java_features.proto (same dir as WKT/descriptor.proto) instead of com/google/protobuf/java_features.proto.

Fixes #16155

PiperOrigin-RevId: 617307475

@zhangskz zhangskz requested review from a team as code owners March 26, 2024 00:12
@zhangskz zhangskz requested review from haberman and googleberg and removed request for a team, haberman and googleberg March 26, 2024 00:12
This also fixes maven to package this correctly as google/protobuf/java_features.proto (same dir as WKT/descriptor.proto) instead of com/google/protobuf/java_features.proto.

Fixes #16155

PiperOrigin-RevId: 617307475
@zhangskz zhangskz merged commit f7d2326 into 26.x Mar 26, 2024
161 checks passed
@zhangskz zhangskz deleted the cp-26x-4 branch March 26, 2024 14:31
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.

None yet

2 participants