-
Notifications
You must be signed in to change notification settings - Fork 194
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Clarify priority of Tycho-mappings #1299
Conversation
tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/PomXMLMapping.java
Outdated
Show resolved
Hide resolved
tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractTychoMapping.java
Outdated
Show resolved
Hide resolved
tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoAggregatorMapping.java
Show resolved
Hide resolved
tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoTargetMapping.java
Outdated
Show resolved
Hide resolved
b00c89a
to
94cb5ca
Compare
tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoFeatureMapping.java
Show resolved
Hide resolved
tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoFeatureMapping.java
Outdated
Show resolved
Hide resolved
tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoBundleMapping.java
Show resolved
Hide resolved
tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/TychoAggregatorMapping.java
Show resolved
Hide resolved
94cb5ca
to
b56f199
Compare
I split the this change into two commits. |
a83f407
to
e5a1aa0
Compare
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.
Just a minor comment before we can merge this, maybe you also want to squash all and use one commit message that covers all changes.
tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractTychoMapping.java
Outdated
Show resolved
Hide resolved
e5a1aa0
to
cb0f1f0
Compare
Unify the method order and simplify Set-creation.
cb0f1f0
to
4ac3d1b
Compare
I would prefer to keep the changes in distinct commits. Especially the last change to NIO Path changes many places and the other changes which would make it harder to find the changes of priorities if one later goes through git. |
As discussed in #1264, this introduces a well defined priority for all of Tycho's polyglot mappings.
The exact order is:
META-INF/MANIFEST.MF
)feature.xml
)category.xml
and*.product
files)*.target
)tycho.pomless.aggregator.names
)Furthermore this updates to polyglot-common 4.9 to use takari/polyglot-maven#242 and introduces a PomXMLMapping. The latter is necessary because the default
org.sonatype.maven.polyglot.mapping.XmlMapping
erroneously claims to handle feature.xml models (because of their ending). Without a dedicated PomXMLMapping we would have to move theXMLMapping
as second last in the list above and would have to check in each other Tycho-mapping if the project also has apom.xml
.