Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Revert "Reject conflicting updates"#2612

Merged
schmidt-sebastian merged 1 commit into
mastergoogleapis/google-cloud-java:masterfrom
revert-2582-mrschmidt-rejectconflictsgoogleapis/google-cloud-java:revert-2582-mrschmidt-rejectconflictsCopy head branch name to clipboard
Nov 10, 2017
Merged

Revert "Reject conflicting updates"#2612
schmidt-sebastian merged 1 commit into
mastergoogleapis/google-cloud-java:masterfrom
revert-2582-mrschmidt-rejectconflictsgoogleapis/google-cloud-java:revert-2582-mrschmidt-rejectconflictsCopy head branch name to clipboard

Conversation

@schmidt-sebastian

@schmidt-sebastian schmidt-sebastian commented Nov 10, 2017

Copy link
Copy Markdown
Contributor

Reverts #2582 to address build failure:

[ERROR] /home/travis/build/GoogleCloudPlatform/google-cloud-java/google-cloud-firestore/src/main/java/com/google/cloud/firestore/BasePath.java:[100,11] name clash: isPrefixOf(com.google.cloud.firestore.BasePath<B>) and isPrefixOf(B) have the same erasure
[ERROR] /home/travis/build/GoogleCloudPlatform/google-cloud-java/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldPath.java:[59,16] cannot find symbol
  symbol:   class AutoValue_FieldPath
  location: class com.google.cloud.firestore.FieldPath

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Nov 10, 2017
@garrettjonesgoogle

garrettjonesgoogle commented Nov 10, 2017

Copy link
Copy Markdown
Contributor

LGTM - wait for at least one build to pass

@schmidt-sebastian schmidt-sebastian merged commit 7104fe9 into master Nov 10, 2017
@schmidt-sebastian schmidt-sebastian deleted the revert-2582-mrschmidt-rejectconflicts branch February 3, 2018 00:32
chingor13 pushed a commit that referenced this pull request Feb 20, 2026
@renovate-bot
build(deps): update dependency org.apache.maven.plugins:maven-deploy-…
f1407bb 
…plugin to v3.1.3 (#2612)
chingor13 pushed a commit that referenced this pull request Mar 24, 2026
@lqiu96 @JoeWang1127
feat: Add ChannelPoolSettings Getter for gRPC's ChannelProvider (#2612)
c8dae8f 
Fixes #2610 ☕️

---------

Co-authored-by: Joe Wang <106995533+JoeWang1127@users.noreply.github.com>
chingor13 pushed a commit that referenced this pull request Mar 24, 2026
@release-please
chore(main): release 2.39.0 (#2594)
3ff4744 
🤖 I have created a release *beep* *boop*
---


<details><summary>2.39.0</summary>

##
[2.39.0](googleapis/sdk-platform-java@v2.38.1...v2.39.0)
(2024-04-18)


### Features

* add `libraries_bom_version` to generation configuration
([#2639](googleapis/sdk-platform-java#2639))
([76eb62b](googleapis/sdk-platform-java@76eb62b))
* Add ChannelPoolSettings Getter for gRPC's ChannelProvider
([#2612](googleapis/sdk-platform-java#2612))
([c8dae8f](googleapis/sdk-platform-java@c8dae8f))
* add config change
([#2604](googleapis/sdk-platform-java#2604))
([a8c93b5](googleapis/sdk-platform-java@a8c93b5))
* add entry point
([#2616](googleapis/sdk-platform-java#2616))
([f5492bb](googleapis/sdk-platform-java@f5492bb))
* add generation config comparator
([#2587](googleapis/sdk-platform-java#2587))
([3461166](googleapis/sdk-platform-java@3461166))
* Add JavadocJar Task to build.gradle for self service libraries
([#2593](googleapis/sdk-platform-java#2593))
([a66df18](googleapis/sdk-platform-java@a66df18))
* Client/StubSettings' getEndpoint() returns the resolved endpoint
([#2440](googleapis/sdk-platform-java#2440))
([7cf0d8f](googleapis/sdk-platform-java@7cf0d8f))
* generate selected libraries
([#2598](googleapis/sdk-platform-java#2598))
([e4572d1](googleapis/sdk-platform-java@e4572d1))
* Validate the Universe Domain inside Java-Core
([#2592](googleapis/sdk-platform-java#2592))
([a5e1141](googleapis/sdk-platform-java@a5e1141))


### Bug Fixes

* add main to `generate_repo.py`
([#2607](googleapis/sdk-platform-java#2607))
([df39521](googleapis/sdk-platform-java@df39521))
* correct deep-remove and deep-preserve regexes
([#2572](googleapis/sdk-platform-java#2572))
([7d59fa1](googleapis/sdk-platform-java@7d59fa1))
* first attempt should use the min of RPC timeout and total timeout
([#2641](googleapis/sdk-platform-java#2641))
([806a52e](googleapis/sdk-platform-java@806a52e))
* remove duplicated calls to AutoValue builders
([#2636](googleapis/sdk-platform-java#2636))
([c883b8f](googleapis/sdk-platform-java@c883b8f))
* remove unnecessary slf4j and AbstractGoogleClientRequest native image
configs
([9cb7c09](googleapis/sdk-platform-java@9cb7c09))
* remove unnecessary slf4j and AbstractGoogleClientRequest native image
configs
([#2628](googleapis/sdk-platform-java#2628))
([9cb7c09](googleapis/sdk-platform-java@9cb7c09))


### Dependencies

* update arrow.version to v15.0.2
([#2589](googleapis/sdk-platform-java#2589))
([0947407](googleapis/sdk-platform-java@0947407))
* update dependency
com.google.cloud.opentelemetry:detector-resources-support to v0.28.0
([#2649](googleapis/sdk-platform-java#2649))
([079bcff](googleapis/sdk-platform-java@079bcff))
* update dependency gitpython to v3.1.41 [security]
([#2625](googleapis/sdk-platform-java#2625))
([018e9a9](googleapis/sdk-platform-java@018e9a9))
* update dependency net.bytebuddy:byte-buddy to v1.14.13
([#2646](googleapis/sdk-platform-java#2646))
([5a79cd2](googleapis/sdk-platform-java@5a79cd2))
* update dependency org.threeten:threeten-extra to v1.8.0
([#2650](googleapis/sdk-platform-java#2650))
([5666adb](googleapis/sdk-platform-java@5666adb))
* update dependency org.threeten:threetenbp to v1.6.9
([#2602](googleapis/sdk-platform-java#2602))
([767eec1](googleapis/sdk-platform-java@767eec1))
* update dependency org.threeten:threetenbp to v1.6.9
([#2665](googleapis/sdk-platform-java#2665))
([563d8ae](googleapis/sdk-platform-java@563d8ae))
* update google api dependencies
([#2584](googleapis/sdk-platform-java#2584))
([22733b1](googleapis/sdk-platform-java@22733b1))
* update googleapis/java-cloud-bom digest to 7071341
([#2608](googleapis/sdk-platform-java#2608))
([8f34fe7](googleapis/sdk-platform-java@8f34fe7))
* update netty dependencies to v4.1.109.final
([#2597](googleapis/sdk-platform-java#2597))
([6b6939e](googleapis/sdk-platform-java@6b6939e))
* update opentelemetry-java monorepo to v1.37.0
([#2652](googleapis/sdk-platform-java#2652))
([708cf7f](googleapis/sdk-platform-java@708cf7f))
* update protobuf dependencies to v3.25.3
([#2491](googleapis/sdk-platform-java#2491))
([e2235a8](googleapis/sdk-platform-java@e2235a8))
* update slf4j monorepo to v2.0.13
([#2647](googleapis/sdk-platform-java#2647))
([2e3d813](googleapis/sdk-platform-java@2e3d813))
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
meltsufin pushed a commit that referenced this pull request Apr 29, 2026
@renovate-bot @michaelpri10
deps: update dependency com.google.protobuf:protobuf-java-util to v4.…
e92debc 
…33.1 (#2612)

Co-authored-by: Mike Prieto <michaelpri10@gmail.com>
meltsufin pushed a commit that referenced this pull request May 1, 2026
@renovate-bot @michaelpri10
deps: update dependency com.google.protobuf:protobuf-java-util to v4.…
ea8bb11 
…33.1 (#2612)

Co-authored-by: Mike Prieto <michaelpri10@gmail.com>
rahul2393 pushed a commit to akash329d/google-cloud-java that referenced this pull request May 21, 2026
@suztomo
ci: add name elements for the POM.xml files (googleapis#2612)
e9f3138 
This should resolve the dry-run error:

```
{
  "pkg:maven/com.google.cloud/google-cloud-bigtable-emulator-core@0.198.0": [
    "Project name is missing"
  ],
  "pkg:maven/com.google.cloud/google-cloud-bigtable-deps-bom@2.61.0": [
    "Project name is missing"
  ]
}
```

b/427182301
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@garrettjonesgoogle garrettjonesgoogle Awaiting requested review from garrettjonesgoogle

Assignees

No one assigned

Labels

cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@schmidt-sebastian @garrettjonesgoogle @googlebot
Morty Proxy This is a proxified and sanitized view of the page, visit original site.