Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #2877: removed mockito-inline as subproject and actual subproject #2945

Merged
merged 1 commit into from Mar 18, 2023

Conversation

krzyk
Copy link
Contributor

@krzyk krzyk commented Mar 16, 2023

Fixes #2877 as suggested in #2877 removed inline from settings.gradle.kts and also the inline subproject itself.
Also removed groovyInlineTest which was testing this subproject.

Checklist

  • Read the contributing guide
  • PR should be motivated, i.e. what does it fix, why, and if relevant how
  • If possible / relevant include an example in the description, that could help all readers
    including project members to get a better picture of the change
  • Avoid other runtime dependencies
  • Meaningful commit history ; intention is important please rebase your commit history so that each
    commit is meaningful and help the people that will explore a change in 2 years
  • The pull request follows coding style
  • Mention Fixes #<issue number> in the description if relevant
  • At least one commit should mention Fixes #<issue number> if relevant

@krzyk krzyk force-pushed the 2877-inline-subproject-removal branch from 6bc8607 to 1f8b387 Compare March 17, 2023 09:12
@krzyk
Copy link
Contributor Author

krzyk commented Mar 17, 2023

Sorry I was a bit surprised that ANDROID_HOME needs to be set to run part of android tests.

@codecov-commenter
Copy link

codecov-commenter commented Mar 17, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (b6861e3) 85.65% compared to head (c2e7800) 85.65%.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #2945   +/-   ##
=========================================
  Coverage     85.65%   85.65%           
  Complexity     2860     2860           
=========================================
  Files           325      325           
  Lines          8682     8682           
  Branches       1071     1071           
=========================================
  Hits           7437     7437           
  Misses          967      967           
  Partials        278      278           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@TimvdLippe
Copy link
Contributor

Seems like this would reduce our test coverage by quite a lot. Can we keep the inline test suite and rather it depending on mockito-inline, it depends on mockito-core instead which already uses the inline mockmaker by default.

@krzyk krzyk force-pushed the 2877-inline-subproject-removal branch from 1f8b387 to daecb70 Compare March 17, 2023 10:19
@krzyk
Copy link
Contributor Author

krzyk commented Mar 17, 2023

@TimvdLippe Sure, I replaced the dependency in groovyInline tests

@TimvdLippe
Copy link
Contributor

It seems like that didn't make an impact on the code coverage and the PR appears to delete tests still. Can you add back these tests?

@krzyk krzyk force-pushed the 2877-inline-subproject-removal branch from daecb70 to 108c0be Compare March 17, 2023 17:08
@krzyk
Copy link
Contributor Author

krzyk commented Mar 17, 2023

@TimvdLippe Yes, I misunderstood your previous comment. Now all the tests are back.

@krzyk krzyk force-pushed the 2877-inline-subproject-removal branch from 108c0be to 19965ff Compare March 17, 2023 20:58
@krzyk krzyk force-pushed the 2877-inline-subproject-removal branch from 19965ff to c2e7800 Compare March 18, 2023 12:22
Copy link
Contributor

@TimvdLippe TimvdLippe left a comment

Choose a reason for hiding this comment

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

Yup, that looks good to me! Thanks for the PR and the updates 😄

@TimvdLippe TimvdLippe merged commit 568c829 into mockito:main Mar 18, 2023
13 checks passed
MarkEWaite added a commit to MarkEWaite/git-plugin that referenced this pull request Apr 17, 2023
MarkEWaite added a commit to MarkEWaite/gitlab-plugin that referenced this pull request Apr 17, 2023
jenkinsci/embeddable-build-status-plugin#191
notes that mockito-inline was removed in mockito/mockito#2945,
replaced with mockito-core. Consumers of mockito-inline should replace
their dependency on mockito-inline with a dependency on mockito-core.

This change prepares for the bump of the parent pom from 4.59 to 4.60.
MarkEWaite added a commit to MarkEWaite/git-plugin that referenced this pull request Apr 17, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/gitlab-plugin that referenced this pull request Apr 17, 2023
jenkinsci/embeddable-build-status-plugin#191
notes that mockito-inline was removed in mockito/mockito#2945,
replaced with mockito-core. Consumers of mockito-inline should replace
their dependency on mockito-inline with a dependency on mockito-core.

This change prepares for the bump of the parent pom from 4.59 to 4.60.
MarkEWaite added a commit to jenkinsci/apache-httpcomponents-client-4-api-plugin that referenced this pull request Apr 17, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/git-plugin that referenced this pull request Apr 17, 2023
MarkEWaite added a commit to jenkinsci/authorize-project-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/cloud-stats-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/git-client-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/implied-labels-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/markdown-formatter-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/nodelabelparameter-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/platformlabeler-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/pre-scm-buildstep-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/priority-sorter-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/schedule-build-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/testng-plugin-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/versioncolumn-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
MarkEWaite added a commit to jenkinsci/xshell-plugin that referenced this pull request Apr 18, 2023
mockito-inline was removed in mockito/mockito#2945, replaced with
mockito-core. Consumers of mockito-inline should replace their dependency
on mockito-inline with a dependency on mockito-core.
ddellspe added a commit to ddellspe/music-bot that referenced this pull request Apr 26, 2023
bessonm added a commit to chutney-testing/chutney-legacy that referenced this pull request Jul 28, 2023
Project has been removed and integrated into core
cf. mockito/mockito#2945
bessonm added a commit to chutney-testing/chutney-legacy that referenced this pull request Aug 4, 2023
Project has been removed and integrated into core
cf. mockito/mockito#2945
nbrouand pushed a commit to chutney-testing/chutney-legacy that referenced this pull request Aug 16, 2023
Project has been removed and integrated into core
cf. mockito/mockito#2945
boddissattva pushed a commit to chutney-testing/chutney-legacy that referenced this pull request Sep 8, 2023
Project has been removed and integrated into core
cf. mockito/mockito#2945
shakuzen added a commit to micrometer-metrics/micrometer that referenced this pull request Oct 4, 2023
Changes specific to 1.10.x as part of TOML conversion:
* Mockito-inline removed; this is included in mockito-core and no longer released[1]
* Jackson upgraded from RC release to latest patch in minor (2.14.2).
* Mongo 4.8.0-beta0 to 4.8.2
* Hazelcast 5.2-BETA-1 to 5.2.4
* [otlp] uk.org.webcompere:system-stubs-jupiter 2.0.2 to 2.1.3 to get rid of old mockito-inline dependency
* Jakarta servlet-api consistently is 5.0.0 now instead of a mix of 4.0.4 and 5.0.0
* Remove unused test dependencies from micrometer-commons

I compared the lockfiles that would be generated with this to the previous lockfiles. Only the above mentioned changes (and spotless plugin related scope differences) were found as different between the two.

[1] mockito/mockito#2945
jonatan-ivanov added a commit to micrometer-metrics/micrometer that referenced this pull request Oct 5, 2023
* Add com.netflix.nebula:gradle-info-plugin (we force its version on main)
* Add jakarta.jms:jakarta.jms-api
* Add com.squareup.retrofit2:retrofit
* Add org.apache.activemq:artemis-junit-5
* Add org.apache.activemq:artemis-jakarta-client:latest.release
* Add io.grpc:grpc-inprocess (was part of grpc-core)
* Remove mockito-inline; included in mockito-core and no longer released[1]
* Downgrade org.apache.httpcomponents.client5:httpclient5 from 5.3-alpha1 to 5.2.1
* Consistently use jakarta.servlet-api:5.0.0 instead of a mix of 4.0.4 and 5.0.0
* Upgrade versions coming from 1.11.x

[1] mockito/mockito#2945

See: gh-4095
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mockito-inline dependency after upgrade 5.0.0
3 participants