Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: protocolbuffers/protobuf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.29.0
Choose a base ref
...
head repository: protocolbuffers/protobuf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.29.2
Choose a head ref
  • 13 commits
  • 71 files changed
  • 9 contributors

Commits on Nov 27, 2024

  1. Configuration menu
    Copy the full SHA
    9e78ac7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #19425 from protocolbuffers/29.x-202411271837

    Merge release commits to 29.x
    shaod2 authored Nov 27, 2024
    Configuration menu
    Copy the full SHA
    e0a3978 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5864b50 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2024

  1. Rename maven to protobuf_maven in MODULE.bazel (#18641) (#19477)

    The default name for the rules_jvm_external.maven rule is "maven". When not set, it defaults to "maven". For root modules also using rules_jvm_external, the name clash causes a warning:
    
    ```
    DEBUG: $TMP/external/rules_jvm_external~/private/extensions/maven.bzl:154:14:
    The maven repository 'maven' is used in two different bazel modules,
    originally in '<my_workspace>' and now in 'protobuf'
    ```
    
    Summarizing @shs96c in [1]:
    
    > The common maven repo name allows rulesets to contribute to the user's JARs.
    > However, this implies that maven is for the end user, not for transitive
    > dependencies. If a ruleset needs private dependencies, it should use a custom
    > namespace rather than the maven namespace.
    
    Since protobuf is not contributing to user's JARs, we'll use a custom namespace. There's precedent for using a custom namespace for library modules:
    
    - rules_jvm_external uses `rules_jvm_external_deps` instead of `maven`.
    - rules_kotlin uses `kotlin_rules_maven` instead of `maven`.
    
    [1]: bazel-contrib/rules_jvm_external#916 (comment)
    
    Fixes #16839.
    
    Closes #18641
    
    COPYBARA_INTEGRATE_REVIEW=#18641 from jschaf:joe/protobuf-maven bd2c62f
    PiperOrigin-RevId: 684625084
    
    Co-authored-by: Joe Schafer <joe.schafer@delta46.us>
    zhangskz and jschaf authored Dec 2, 2024
    Configuration menu
    Copy the full SHA
    ba6da44 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2024

  1. Configuration menu
    Copy the full SHA
    796e49f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a3e9db8 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #19506 from protocolbuffers/29.x-202412032207

    Merge release commits to 29.x
    sbenzaquen authored Dec 3, 2024
    Configuration menu
    Copy the full SHA
    d7d3da6 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2024

  1. Remove CMake downgrade workaround from Windows CI tests (#19630)

    This should fix some Windows tests that are failing to install a
    downgraded CMake version.
    
    I also fixed some of the Bazel examples tests. Two of the test runs
    seemed to be omitting a Bazel version and were inadvertently using Bazel
    8.
    Adam Cozzette authored Dec 12, 2024
    Configuration menu
    Copy the full SHA
    3a7bb4a View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2024

  1. Remove unused / invalid C++ lazy repeated field code from OSS. (#19682)

    Fixes #19671
    
    PiperOrigin-RevId: 706729524
    zhangskz authored Dec 16, 2024
    Configuration menu
    Copy the full SHA
    3649f87 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a1c9b6a View commit details
    Browse the repository at this point in the history
  3. Export environment variables so bazelisk picks them up (#19690)

    PiperOrigin-RevId: 705148623
    
    Co-authored-by: Mike Kruskal <mkruskal@google.com>
    zhangskz and mkruskal-google authored Dec 16, 2024
    Configuration menu
    Copy the full SHA
    8b9d76c View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2024

  1. Automated rollback of commit 23aada2. (#19692)

    PiperOrigin-RevId: 706827598
    
    Co-authored-by: Protobuf Team Bot <protobuf-github-bot@google.com>
    zhangskz and protobuf-github-bot authored Dec 17, 2024
    Configuration menu
    Copy the full SHA
    1772657 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2330983 View commit details
    Browse the repository at this point in the history
Loading