~thopiekar/protobuf/+git/protobuf:25.x

Last commit made on 2024-04-05
Get this branch:
git clone -b 25.x https://git.launchpad.net/~thopiekar/protobuf/+git/protobuf

Branch merges

Branch information

Name:
25.x
Repository:
lp:~thopiekar/protobuf/+git/protobuf

Recent commits

a0fb465... by zhangskz <email address hidden>

Merge pull request #16388 from protocolbuffers/cp-manifest-jpms

Cherry-Pick Add Automatic-Module-Name (#14562)

6b1c253... by Joshua Haberman <email address hidden>

Disable MacOS C++ Cmake test for now.

PiperOrigin-RevId: 594102279

220a74b... by Sandy Zhang <email address hidden>

Update setup-php to 2.30.0 and re-enable macOS PHP 8.2 tests.

setup-php 2.30.0 should fix https://github.com/shivammathur/setup-php/issues/823

PiperOrigin-RevId: 612882408

552ad31... by Clayton Walker <email address hidden>

Add Automatic-Module-Name (#14562)

Adds Automatic-Module-Name after it was lost during the maven-bazel migration (and subsequent re-addition of osgi bundle support).

Updates OsgiWrapper to support adding the Automatic-Module-Name header to the list of properties supported by the `osgi_java_library` rule.

Fixes #12639

Closes #14562

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14562 from Sineaggi:add-automatic-module-name a27b3e6695acb4f1f253422fd2d324bb1b3f6669
PiperOrigin-RevId: 579748655

a857c8e... by Mike Kruskal <email address hidden>

Merge pull request #15985 from protocolbuffers/staleness-fix-25

Fix staleness tests

f60c624... by Mike Kruskal <email address hidden>

Add back error message unconditionally

3b72455... by Mike Kruskal <email address hidden>

Pin bazel 6 for 25.x

489aba5... by Mike Kruskal <email address hidden>

Merge pull request #15984 from mkruskal-google/staleness-fix-25

Actually fail if staleness fail

367c7be... by Mike Kruskal <email address hidden>

Regen stale files

8688825... by Mike Kruskal <email address hidden>

Actually fail if staleness fail

PiperOrigin-RevId: 610833812