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

Deprecate <extraDirectory> config in Maven #1626

Merged
merged 35 commits into from
Apr 24, 2019

Conversation

chanseokoh
Copy link
Member

@chanseokoh chanseokoh commented Apr 12, 2019

For #1020.

Note <extraDirectories> is a genuine list like <args>, so below will no longer be allowed.

<extraDirectories>path</extraDirectories>

Also fixes #1625.

@chanseokoh chanseokoh closed this Apr 16, 2019
@chanseokoh chanseokoh reopened this Apr 16, 2019
@chanseokoh chanseokoh changed the base branch from i1020-extra-directories-1 to master April 16, 2019 21:44
@chanseokoh
Copy link
Member Author

Ready for review. Being a Maven list, the new syntax requires always having <paths> and <path>.

<extraDirectories>
  <paths>
    <path>/awesome/directory</path>
  </paths>
</extraDirectories>

People can continue to use the old syntax. They will see warnings.

I should put up another PR for Gradle.

Copy link
Member

@loosebazooka loosebazooka left a comment

Choose a reason for hiding this comment

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

Some minor things.

loosebazooka
loosebazooka previously approved these changes Apr 22, 2019

String property = newProperty != null ? newProperty : deprecatedProperty;
if (property != null) {
return Collections.singletonList(Paths.get(property));
Copy link
Member Author

Choose a reason for hiding this comment

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

Hmm... looks like I missed this part. The new property can be a list.

Copy link
Member Author

Choose a reason for hiding this comment

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

So I missed handling this as list in the previous PR at this location: https://github.com/GoogleContainerTools/jib/pull/1602/files#diff-1aee6421b98ba15074ed3f0da4755bc5R175

Fixed with the latest commit.

@chanseokoh
Copy link
Member Author

I noticed that FilesMojo and FileMojoV2 may not be handling relative paths correctly (#1660), which is independent of this PR. Ready for review again.

@chanseokoh chanseokoh merged commit 758b571 into master Apr 24, 2019
@chanseokoh chanseokoh deleted the i1020-extra-directories-rename branch April 24, 2019 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FilesMojo.resolveExtraDirectory() doesn't read EXTRA_DIRECTORY_PATH property
4 participants