-
-
Notifications
You must be signed in to change notification settings - Fork 148
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
Use upstream #644
Open
Adrian-Devries
wants to merge
86
commits into
ZUGFeRD:master
Choose a base branch
from
Adrian-Devries:use-upstream
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Use upstream #644
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
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
….xsl Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Apply use upstream rule and keep tabsize rule
Add some documentation
Correct some typos
Move some internal classes one level up so that both visualizer classes could use them
Add some documentation
…cException.java Typo: "Arithmetric" (cf. https://www.dwds.de/wb/Arithmetik)
Closed
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.
Currently, the project is not using current upstream sources; some resources are outdated, others are orphaned. Find details attached:
Sometimes, resources from upstream have been renamed and/or modified. Find the modifications already made in your original repository attached:
Note that the patches mentioned above do not ignore changes in white space. This way, it becomes obvious that the rule to keep the tab size has been ignored by the maintainers before.
This pull request removes orphaned resources and updates all resources to the most recent upstream. All resources from upstream are now located in folders reflecting the name of the distribution package. This way, it should be easier to maintain them. Documentation has been added to NOTICE.
With regards to visualization the upstream xrechnung-3.0.2-xrechnung-visualization-2024-06-20.zip has been extended as follows:
Note that I have filed a pull request against the upstream project as well (cf. itplr-kosit/xrechnung-visualization#23).
In addition, the Maven infrastructure has been normalized and modernized as in my previous pull request #623. The project is now using the most recent versions of all dependencies and plugins. Version information has been centralized in the top level POM. Two plugins have been added:
The configuration of the plugin com.helger.maven:ph-schematron-maven-plugin has been changed to reflect the changes made in the resources tree. It is now not any longer necessary to rename sources from upstream and to modify them to reflect the renaming.
For the plugin org.codehaus.mojo:xml-maven-plugin a transformation script Normalize.xslt has been provided that not only normalizes white space etc., but also addresses certain issues, e.g., SXWN9009, SXWN9027 (find comments inside the file). This way, my previous pull request #621 is not needed anymore. Note that I have filed pull requests against upstream projects though (cf. #621 (comment)).
Currently, the plugin org.openrewrite.maven:rewrite-maven-plugin has been configured to do a dryRun only. Find an example of the output attached:
Java sources have been changed accordingly where necessary to reflect the changes made in the resources tree. In addition, certain typos (e.g., "Arithmetric") and other quirks have been corrected. Without claiming to be complete:
Of course, the new script result-pdf.xsl has been kept, but typos have been corrected there as well.
All tests succeed. Find log files attached:
By the way, generating the XSLT scripts from Schematron files with the plugin com.helger.maven:ph-schematron-maven-plugin takes approximately 2 minutes, not more (cf. A_06_generate-resources.log).