[MCLEAN-110, MCLEAN-124, MCLEAN-126, ] Merge 3.x to 4.x #86
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… reason in case of failure (apache#60) * MCLEAN-124 Leverage Files.delete(Path) API to provide more accurate reason in case of failure * Use Mockito + fix unit tests for Windows * Renamed variable error -> failure * Removed the resetting of permissions in tests, relying on JUnit @tempdir to take care of permissions issues when clearing the temporary directory * Fixed typo a -> an * Simplified the setting of permissions in tests
…align with surrounding tests
(cherry picked from commit f4e99f5)
Bumps [org.apache.maven.plugins:maven-plugins](https://github.com/apache/maven-parent) from 42 to 43. - [Release notes](https://github.com/apache/maven-parent/releases) - [Commits](https://github.com/apache/maven-parent/commits) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-plugins dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 30b89ca)
Bumps [org.codehaus.plexus:plexus-testing](https://github.com/codehaus-plexus/plexus-testing) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/codehaus-plexus/plexus-testing/releases) - [Commits](codehaus-plexus/plexus-testing@plexus-testing-1.3.0...plexus-testing-1.4.0) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-testing dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* Bump mavenVersion from 3.6.3 to 3.9.9 Bumps `mavenVersion` from 3.6.3 to 3.9.9. Updates `org.apache.maven:maven-plugin-api` from 3.6.3 to 3.9.9 - [Release notes](https://github.com/apache/maven/releases) - [Commits](apache/maven@maven-3.6.3...maven-3.9.9) Updates `org.apache.maven:maven-core` from 3.6.3 to 3.9.9 --- updated-dependencies: - dependency-name: org.apache.maven:maven-plugin-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.maven:maven-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Preserve prerequisites as 3.6.3 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Slawomir Jaranowski <s.jaranowski@gmail.com>
Bumps [org.apache.maven.resolver:maven-resolver-api](https://github.com/apache/maven-resolver) from 1.1.1 to 1.9.22. - [Release notes](https://github.com/apache/maven-resolver/releases) - [Commits](apache/maven-resolver@maven-resolver-1.1.1...maven-resolver-1.9.22) --- updated-dependencies: - dependency-name: org.apache.maven.resolver:maven-resolver-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
|
@peterdemaeyer please look at #84 I will try do the similar 😄 |
@slawekjaranowski ha, I see now. I prefer your approach for MCLEAN-124 because it aligns the implementations on 3.x and 4.x by preferring the original 3.x solution. I just didn't realize I was allowed to do that, otherwise I would have done the same. :-) The benefit of this PR is that it is a merge PR for not only MCLEAN-124 but anything else that wasn't merged from 3.x yet, which is just 2 more issues, and I noticed that some parts of the code had already been applied to 4.x via some other way. I think it's best that #84 gets merged first, and then I need to redo this PR. |
|
@peterdemaeyer #84 merged |
|
@peterdemaeyer do you have a time and wish to rebase this ... |
slawekjaranowski
added
the
waiting-for-feedback
~ Conflicts: ~ .github/workflows/release-drafter.yml ~ pom.xml ~ src/it/dangling-symlinks/setup.groovy ~ src/it/symlink-dont-follow/setup.groovy ~ src/main/java/org/apache/maven/plugins/clean/CleanMojo.java ~ src/main/java/org/apache/maven/plugins/clean/Cleaner.java ~ src/test/java/org/apache/maven/plugins/clean/CleanerTest.java
peterdemaeyer
force-pushed
the
master-tmp-merge-3.x
branch
from
ca474c6 to
184f143
Compare
|
@peterdemaeyer thanks |
github-actions
bot
removed
the
waiting-for-feedback
|
Resolve #193 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a PR for a merge of 3.x
maven-clean-plugin-3.xto 4.xmaster. In particular, it includes the changes in the context of MCLEAN-110, MCLEAN-124, MCLEAN-126 and nothing else. There were some conflicts and differences between 3.x and 4.x, but I assumed they were intentional so I kept the 4.x behavior and adapted tests accordingly where needed. To preserve the nature of the merge commit, I strongly recommend merging this PR as a regular merge and not a squash merge.