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

[MNG-6261] - using java File api to compare #192

Merged
merged 1 commit into from
Nov 28, 2018

Conversation

fabcipriano
Copy link
Contributor

@fabcipriano fabcipriano commented Nov 17, 2018

Following this checklist to help us incorporate your
contribution quickly and easily:

  • Make sure there is a JIRA issue filed
    for the change (usually before you start working on it). Trivial changes like typos do not
    require a JIRA issue. Your pull request should address just this issue, without
    pulling in other changes.
  • Each commit in the pull request should have a meaningful subject line and body.
  • Format the pull request title like [MNG-XXX] - Fixes bug in ApproximateQuantiles,
    where you replace MNG-XXX with the appropriate JIRA issue. Best practice
    is to use the JIRA issue title in the pull request title and in the first line of the
    commit message.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Run mvn clean verify to make sure basic checks pass. A more thorough check will
    be performed on your pull request automatically.
  • You have run the Core IT successfully.

If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.

To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.

@rfscholte
Copy link
Contributor

Looks also good according to https://builds.apache.org/job/maven-box/job/maven/job/MNG-6261/
Can you add yourself as contributor to the pom.xml and squash the commits?

@fabcipriano
Copy link
Contributor Author

Looks also good according to https://builds.apache.org/job/maven-box/job/maven/job/MNG-6261/
Can you add yourself as contributor to the pom.xml and squash the commits?

Done.

Copy link
Contributor

@eolivelli eolivelli left a comment

Choose a reason for hiding this comment

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

Nice work.
I left some minor comment

Copy link
Contributor

@eolivelli eolivelli left a comment

Choose a reason for hiding this comment

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

+1 (non binding)

@slachiewicz
Copy link
Member

+1

And one more small testcase - should pass before/after patch
org.apache.maven.model.building.FileModelSource#getRelatedSource - one use of normalize

   @Test
    public void testDiffrentPaths () throws IOException {
        Path tempDirParent = Files.createTempDirectory( "FileModelSource-" );
        Path subdir = Files.createDirectory( tempDirParent.resolve( "test" ) );
        Path pomFile = Files.createTempFile(subdir, "myCustomPom-", ".xml" );

        Path relativeFile = subdir.resolve( "../test/" + pomFile.getFileName() );

        assertNotEquals( pomFile, relativeFile );
        assertEquals( pomFile.normalize(), relativeFile.normalize());

        assertNotEquals( pomFile.toFile(), relativeFile.toFile() );
        assertNotEquals( pomFile.toFile().toURI(), relativeFile.toFile().toURI() );

        assertEquals( pomFile.toFile().getCanonicalFile(), relativeFile.toFile().getCanonicalFile() );
        assertEquals( pomFile.toFile().toURI().normalize(), relativeFile.toFile().toURI().normalize() );

        FileModelSource instance = new FileModelSource( pomFile.toFile() );

        assertNotEquals(instance, new FileModelSource( relativeFile.toFile() ) );
    }
}

Copy link
Member

@olamy olamy left a comment

Choose a reason for hiding this comment

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

LGTM

@rfscholte rfscholte merged commit e4e33f7 into apache:master Nov 28, 2018
pzygielo pushed a commit to pzygielo/maven that referenced this pull request Jan 4, 2023
fix: Add lifecycle mapping metadata for M2E (Eclipse)
gnodet added a commit to gnodet/maven that referenced this pull request Nov 20, 2024
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.

6 participants