-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Conversation
7e60c76
to
d02f668
Compare
Ready for review. Being a Maven list, the new syntax requires always having <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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some minor things.
jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/JibPluginConfiguration.java
Show resolved
Hide resolved
jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/JibPluginConfiguration.java
Show resolved
Hide resolved
jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/JibPluginConfiguration.java
Show resolved
Hide resolved
jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/skaffold/FilesMojo.java
Outdated
Show resolved
Hide resolved
jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/JibPluginConfiguration.java
Outdated
Show resolved
Hide resolved
|
||
String property = newProperty != null ? newProperty : deprecatedProperty; | ||
if (property != null) { | ||
return Collections.singletonList(Paths.get(property)); |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
I noticed that |
For #1020.
Note
<extraDirectories>
is a genuine list like<args>
, so below will no longer be allowed.Also fixes #1625.