Commit graph

287 commits

Author SHA1 Message Date
rgoldfinger6
4b269eb436 Updating version.json and repo version numbers to: 37.0-dev (#28425)
NOTE: This should be reviewed and imported via Copybara per the normal PR review process.

Closes #28425

PiperOrigin-RevId: 945675238
2026-07-10 06:22:59 -07:00
Samuel Benzaquen
e6ee74af87 Updating version.json and repo version numbers to: 36.0-dev (#26991)
NOTE: This should be reviewed and imported via Copybara per the normal PR review process.

Closes #26991

PiperOrigin-RevId: 902788011
2026-04-20 13:14:04 -07:00
Protobuf Team Bot
8227cf1630 Updating version.json and repo version numbers to: 35-dev 2026-01-22 07:25:02 -08:00
honglooker
6d00d87830 Updating version.json and repo version numbers to: 34.0-dev (#23738)
NOTE: This should be reviewed and imported via Copybara per the normal PR review process.

Closes #23738

PiperOrigin-RevId: 814297739
2025-10-02 10:51:16 -07:00
Adam Cozzette
00c3c30cbc Updating version.json and repo version numbers to: 33.0-dev (#22710)
NOTE: This should be reviewed and imported via Copybara per the normal PR review process.

Closes #22710

PiperOrigin-RevId: 785626334
2025-07-21 17:02:17 -07:00
Jason Lunn
452984bf81 Updating version.json and repo version numbers to: 32.0-dev (#21351)
NOTE: This should be reviewed and imported via Copybara per the normal PR review process.

Closes #21351

PiperOrigin-RevId: 751446098
2025-04-25 09:22:00 -07:00
deannagarcia
92db7e2c04 Updating version.json and repo version numbers to: 31.0-dev (#20237)
NOTE: This should be reviewed and imported via Copybara per the normal PR review process.

Closes #20237

PiperOrigin-RevId: 723968086
2025-02-06 09:41:40 -08:00
Mike Kruskal
1fe26cf0c1 Updating version.json and repo version numbers to: 30.0-dev (#18567)
NOTE: This should be reviewed and imported via Copybara per the normal PR review process.

Closes #18567

PiperOrigin-RevId: 680760252
2024-09-30 16:36:48 -07:00
zhangskz
8e60d9f166 Updating version.json and repo version numbers to: 29.0-dev (#17432)
NOTE: This should be reviewed and imported via Copybara per the normal PR review process.

Closes #17432

PiperOrigin-RevId: 652511521
2024-07-15 09:50:38 -07:00
Mike Kruskal
95877d8569 Updating version.json and repo version numbers to: 28-dev (#16555)
Closes #16555

PiperOrigin-RevId: 626081638
2024-04-18 10:47:14 -07:00
Sandy Zhang
274bc7f26f Move java_features.proto to java/core/srce/main/resources
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 https://github.com/protocolbuffers/protobuf/issues/16155

PiperOrigin-RevId: 619015714
2024-03-25 18:01:21 -07:00
Sandy Zhang
9252b64ef3 Automated rollback of commit 0ee34d35de.
PiperOrigin-RevId: 603802046
2024-02-02 15:28:26 -08:00
Dennis Shao
9146ce6ddb Updating version.json and repo version numbers to: 27-dev (#15590)
Closes #15590

PiperOrigin-RevId: 601468713
2024-01-25 09:18:51 -08:00
Sandy Zhang
303239d74d Drop Protobuf support for Android KitKat per EOL and add existing minimum Java 1.8 in Maven pom.xmls
See https://android-developers.googleblog.com/2023/07/google-play-services-discontinuing-updates-for-kitkat.html for more details on Android KitKat EOL.

PiperOrigin-RevId: 600609333
2024-01-22 17:02:36 -08:00
Sandy Zhang
65c65c2d04 Breaking Change: Use Editions features in Java full runtimes.
This change breaks compatibility with old generated code from previous major versions per the Cross Version Runtime policy: https://protobuf.dev/support/cross-version-runtime-guarantee. This includes old gencode from <4.26.x, which does not resolve features.

See https://protobuf.dev/news/2023-12-05/

PiperOrigin-RevId: 600487923
2024-01-22 09:57:26 -08:00
Jie Luo
1231af10c7 merge 25.x to main (#14617)
Closes #14617

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14617 from anandolee:25.x ac86c5ef32
PiperOrigin-RevId: 578996979
2023-11-02 15:29:36 -07:00
Protobuf Team Bot
3ea774370a Internal change
PiperOrigin-RevId: 578944754
2023-11-02 13:34:12 -07:00
Protobuf Team Bot
6b5d8db01f Updating version.json and repo version numbers to: 25.0 2023-11-01 13:03:44 -07:00
Protobuf Team Bot
ba1aab2baf Updating version.json and repo version numbers to: 25.0-rc2 2023-10-18 09:57:30 -07:00
Protobuf Team Bot
896f3d8ced Updating version.json and repo version numbers to: 25.0-rc1 2023-10-16 12:36:52 -07:00
ericsalo
843b74e601 Main 202308091812 (#13489)
Closes #13489

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/13489 from protocolbuffers:main-202308091812 e729f0bf5a
PiperOrigin-RevId: 555301642
2023-08-09 16:02:04 -07:00
Protobuf Team Bot
aba9a7f1a3 Internal change
PiperOrigin-RevId: 555251853
2023-08-09 13:09:58 -07:00
Protobuf Team Bot
093e258a71 Updating version.json and repo version numbers to: 24.0 2023-08-08 10:26:14 -07:00
Protobuf Team Bot
3487ae0c01 Updating version.json and repo version numbers to: 24.0-rc3 2023-08-01 10:27:01 -07:00
Protobuf Team Bot
034ec9d9f6 Updating version.json and repo version numbers to: 24.0-rc2 2023-07-18 11:50:33 -07:00
Protobuf Team Bot
05835e374d Updating version.json and repo version numbers to: 24.0-rc1 2023-07-11 14:54:12 -07:00
Chad Wilson
c95ebb7bd8 deps: Update Guava to 32.0.1 (#13099)
Follow-up from #12953 to update to `32.0.1` to fix an issue on windows:

https://github.com/google/guava/releases/tag/v32.0.1

The underlying issue likely does not affect protobuf as it does not appear to (directly) use the affected `Files.createTempDir` or `FileBackedOutputStream` code which was apparently broken on Windows in `32.0.0`.

Seems best to update anyway.

Closes #13099

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/13099 from chadlwilson:bump-guava-3201 30bd3f7563
PiperOrigin-RevId: 541960623
2023-06-20 09:59:40 -07:00
Chad Wilson
cd615a8c65 deps: Update Guava to 32.0.0 (#12953)
Updates Guava to [32.0.0](https://github.com/google/guava/releases/tag/v32.0.0) to include fixes for CVE-2020-8908 and CVE-2023-2976 (https://github.com/google/guava/issues/2575) which affects certain builds with shaded usage, e.g ruby via jruby/java platform such as https://rubygems.org/gems/google-protobuf/versions/3.23.2-java

- Protobuf does not appear to (directly) use the affected `Files.createTempDir` or `FileBackedOutputStream` code which might behave differently on Windows.
- Referred to #9707 and #9757 for reference
- Updated transitive dependency versions match https://mvnrepository.com/artifact/com.google.guava/guava/32.0.0-jre (note major version change for `j2objc-annotations` from `1.3` --> `2.8`)

May need backporting to `23.x` branch if sufficiently compatible.

Closes #12953

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12953 from chadlwilson:update-guava-32 9c396b6759
PiperOrigin-RevId: 538666552
2023-06-07 20:32:31 -07:00
deannagarcia
0e23f18865 Merge to main after 23.0 release (#12721)
Closes #12721

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12721 from protocolbuffers:main-202305082101 36482b4c68
PiperOrigin-RevId: 530664393
2023-05-09 11:28:29 -07:00
Protobuf Team Bot
67d9ea87f3 Internal change
PiperOrigin-RevId: 530619366
2023-05-09 09:27:53 -07:00
Protobuf Team Bot
6e511679de Updating version.json and repo version numbers to: 23.0 2023-05-08 09:48:50 -07:00
Protobuf Team Bot
d8f44cc2fb Updating version.json and repo version numbers to: 23.0-rc3 2023-05-05 09:17:00 -07:00
Protobuf Team Bot
51f51ac4ef Updating version.json and repo version numbers to: 23.0-rc2 2023-04-28 10:25:19 -07:00
Protobuf Team Bot
b21d6be78b Updating version.json and repo version numbers to: 23.0-rc1 2023-04-25 13:47:12 -07:00
Protobuf Team Bot
482156c0f9 Updating version.json and repo version numbers to: 22.3 2023-04-12 15:43:07 -07:00
Protobuf Team Bot
81f89d509d Updating version.json and repo version numbers to: 22.2 2023-03-10 07:57:16 -08:00
Protobuf Team Bot
839e8d25ea Updating version.json and repo version numbers to: 22.1 2023-03-07 12:51:16 -08:00
Protobuf Team Bot
a847a8dc4b Updating version.json and repo version numbers to: 22.0 2023-02-16 09:13:25 -08:00
Protobuf Team Bot
4dd7a1e380 Updating version.json and repo version numbers to: 22.0-rc3 2023-02-10 11:01:55 -08:00
Sandy Zhang
f25de39886 Merge remote-tracking branch 'upstream/main' into merge-main-to-22.x 2023-02-09 21:08:52 +00:00
Deanna Garcia
5137f693d2 Update java pom files with new developer and website.
PiperOrigin-RevId: 507851798
2023-02-07 12:19:15 -08:00
Protobuf Team Bot
fa7a079c11 Updating version.json and repo version numbers to: 22.0-rc2 2023-02-02 11:44:51 -08:00
Protobuf Team Bot
2b406251e4 Updating version.json and repo version numbers to: 22.0-rc1 2023-01-26 21:37:43 -08:00
Matt Fowles Kulukundis
1697e4558b Main 202212161220 (#11340)
Closes #11340

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/11340 from protocolbuffers:main-202212161220 c39ccb73fb
PiperOrigin-RevId: 496029356
2022-12-16 21:47:18 -08:00
Protobuf Team Bot
9238c4843a Add debug_redact field option to protobuf.
PiperOrigin-RevId: 496016877
2022-12-16 20:03:33 -08:00
Matt Kulukundis
31a21cff3a Merge release branch 21.x into main 2022-12-16 13:30:10 -05:00
Protobuf Team Bot
f0dc78d7e6 Updating version.json and repo version numbers to: 21.12 2022-12-12 16:03:12 -08:00
Mike Kruskal
032c9c8ada Internal changes
PiperOrigin-RevId: 493986824
2022-12-08 13:54:37 -08:00
Protobuf Team Bot
99eb7fa891 Updating version.json and repo version numbers to: 21.11 2022-12-08 12:43:26 -08:00
Protobuf Team Bot
a474c5b9ff Updating version.json and repo version numbers to: 21.11 2022-12-07 18:41:29 -08:00