-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Dspace 6 ds 3545 mirage2: custom sitemap.xmap is ignored #1690
Conversation
I'm not sure why Travis-CI testing of this PR has stalled, I can't find it anywhere in the Travis-CI logs for pull requests. I think our only option is to temporarily close then re-open this PR, which I'm willing to do, but I figured I'd mention it here before I try. Another option is to rebase this PR on upstream dspace-6_x, which isn't required, but would force Travis-CI to re-run tests. @samuelcambien it's up to you, would you prefer to rebase this pull request, or close & reopen it? Either alternative will force Travis-CI to rebuild, and if Travis-CI gives this PR a green light, that ought to be enough of a test to approve this. |
This PR looks good, though, and should be easy to test, since it's just a change to the build. |
fa963ad
to
71c68f2
Compare
Hi hardyoyo, thanks for the advice! |
Dspace 6 ds 3545 mirage2: custom sitemap.xmap is ignored
DSC-1531 Updated modules version to reflect the correct one Approved-by: Vincenzo Mecca Approved-by: Stefano Maffei
Fixes #6895
There are two resources plugins:
The first one is ran first, afterwards the other one runs.
The property 'overwrite=false' should avoid that local customizations would be overwritten by dspace source files.
But the property 'filtering=true' causes maven to ignore the overwrite property.
So the sitemap (the only file that will be filtered) will always be overwritten by the dspace original!
To fix this, I also moved the local customizations resources-plugin to inside the maven-iterator-plugin.
This is necessary anyway, because to filter a sitemap, the name of the theme directory is needed for the ${theme-path} and ${theme-name} variables.
I put it after the resources-plugin for the dspace source, and gave it 'overwrite=true'.
So the order is now reversed: first the source files are processed, and then overwritten by any local customizations.
I also made the split between files to filter and files not to filter consistent accross the two resources plugins: only filter the sitemap.
(instead of filtering everything, except a list of image extensions)