Skip to content

Revert "ci: Java 17 profile to run tests with old Mockito (#1343)"#1349

Merged
tom-andersen merged 1 commit intomainfrom
revert-1343-i1342
Jul 5, 2023
Merged

Revert "ci: Java 17 profile to run tests with old Mockito (#1343)"#1349
tom-andersen merged 1 commit intomainfrom
revert-1343-i1342

Conversation

@tom-andersen
Copy link
Copy Markdown
Contributor

@tom-andersen tom-andersen commented Jul 4, 2023 •
edited
Loading

A more permanent fix was done in #1345

So we can revert #1343

@tom-andersen tom-andersen requested a review from a team July 4, 2023 14:03
@tom-andersen tom-andersen requested a review from a team as a code owner July 4, 2023 14:03
@product-auto-label product-auto-label bot added size: s Pull request size is small. api: firestore Issues related to the googleapis/java-firestore API. labels Jul 4, 2023
@tom-andersen tom-andersen added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Jul 4, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Jul 4, 2023
@suztomo
Copy link
Copy Markdown
Member

suztomo commented Jul 5, 2023

I see javadoc failing.

Error:  /home/runner/work/java-firestore/java-firestore/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreBundle.java:136: error: unknown tag: returns
Error:       * @returns This instance.
Error:         ^

Would you fix them? (If you do, focus on "error:" not "warning: ")

@tom-andersen
Copy link
Copy Markdown
Contributor Author

tom-andersen commented Jul 5, 2023

I see javadoc failing.

Error:  /home/runner/work/java-firestore/java-firestore/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreBundle.java:136: error: unknown tag: returns
Error:       * @returns This instance.
Error:         ^

Would you fix them? (If you do, focus on "error:" not "warning: ")

Is this a new check?

I would like to fix this in a separate PR in order to keep this PR a clean revert of previous PR. I think introducing more changes here will muddy the waters.

suztomo
suztomo approved these changes Jul 5, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@suztomo suztomo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.

@tom-andersen tom-andersen merged commit 7ff8e0d into main Jul 5, 2023
@tom-andersen tom-andersen deleted the revert-1343-i1342 branch July 5, 2023 15:43
@suztomo
Copy link
Copy Markdown
Member

suztomo commented Jul 5, 2023

@tom-andersen The release job may fail if javadoc fails. (The release job needs to generate javadoc for Maven Central)

cherylEnkidu pushed a commit that referenced this pull request Dec 11, 2023
@tom-andersen @cherylEnkidu
Revert "ci: Java 17 profile to run tests with old Mockito (#1343)" (#…
ec0193e 
…1349)

This reverts commit 035adde.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@suztomo suztomo suztomo approved these changes

@MarkDuckworth MarkDuckworth Awaiting requested review from MarkDuckworth

Assignees

@suztomo suztomo

@MarkDuckworth MarkDuckworth

Labels

api: firestore Issues related to the googleapis/java-firestore API. size: s Pull request size is small.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tom-andersen @suztomo @MarkDuckworth @yoshi-kokoro