Switch from assembly to shade plugin to correct Jena re-packaging #189
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I'll try and take a look at this ASAP. I think our Systems users are currently utilising the previous migration dataset so I'll need to interrupt their service to replace it with a new copy. |
mikejritter
approved these changes
Aug 30, 2022
There was a problem hiding this comment.
@whikloj Looks good, I was able to run a migration with the xml:lang tag and see that it was serialized correctly. All the classes are in the Jena services file as well so we can see it's being shaded.
I just had a minor question about the fedora3.xml resource which shouldn't affect the PR.
pom.xml
Outdated
| </manifestEntries> | ||
| </transformer> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> | ||
| <resource>conf/fedora3.xml</resource> |
There was a problem hiding this comment.
Building from main I don't see this in the artifact, is this something we had missed from before?
There was a problem hiding this comment.
That is a good question, I was looking at the assembly plugin zip.xml file which appears to be including the contents of the conf directory in the packaged result. But if this file is not necessary I can remove that.
Surfrdan
pushed a commit
to Surfrdan/migration-utils
that referenced
this pull request
Jan 19, 2023
whikloj
added a commit
that referenced
this pull request
Feb 16, 2023
* added test for DISABLED digest type * Adding Integration Test and a new exceptin for disabled digests * checkstyle fixes * changing index to match inline-it et al * seperating test index in case of clash * fixing issues with the disabled integration test * removing superflous log message as we throw an exception now * git wasn't adding an empty dir. used .gitkeep and now the test should parse tge datastream dir * .gitkeep broke the indexer. copying a datastream from another test * reverting to logging rather than throwing exception * improved DISABLED fixity Integration Test to use fcrepo-storage-ocfl session object * Switch from assembly to shade plugin to correct Jena re-packaging (#189) Resolves: https://fedora-repository.atlassian.net/browse/FCREPO-3836 * Alter test assertion to allow for ocfl 1.0 and 1.1 (#192) Resolves: https://fedora-repository.atlassian.net/browse/FCREPO-3863 * Bump woodstox-core from 6.2.3 to 6.4.0 (#191) Bumps [woodstox-core](https://github.com/FasterXML/woodstox) from 6.2.3 to 6.4.0. - [Release notes](https://github.com/FasterXML/woodstox/releases) - [Commits](FasterXML/woodstox@woodstox-core-6.2.3...woodstox-core-6.4.0) --- updated-dependencies: - dependency-name: com.fasterxml.woodstox:woodstox-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Increment version to 6.3.1-SNAPSHOT * fixing issues with the disabled integration test * removing superflous log message as we throw an exception now * git wasn't adding an empty dir. used .gitkeep and now the test should parse tge datastream dir * .gitkeep broke the indexer. copying a datastream from another test * reverting to logging rather than throwing exception * improved DISABLED fixity Integration Test to use fcrepo-storage-ocfl session object * fixed test to look for a DISABLED digest --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Dan Field <[email protected]> Co-authored-by: Dan Field <[email protected]> Co-authored-by: Jared Whiklo <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Bernstein <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA Ticket: https://fedora-repository.atlassian.net/browse/FCREPO-3836
What does this Pull Request do?
Uses the maven shade plugin to propertly re-package Jena according to https://jena.apache.org/documentation/notes/jena-repack.html and generate the runnable jar
This PR replaces #188
How should this be tested?
This should have no impact or usage except to fix the issue described below.
Previously if you had a Fedora 3 object with a RELS-EXT that contained an element with a xml:lang tag
it would get serialized with both the language tag and datatypeUri.
i.e.
Now it will only be the language tag.
Additional Notes:
Any additional information that you think would be helpful when reviewing this PR.
Example:
Interested parties
Tag (@ mention) interested parties or, if unsure, @fcrepo/committers