Skip to content

Get the master updates into the saxon10 branch #3

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

Open
wants to merge 26 commits into
base: saxon10
Choose a base branch
from
Open

Conversation

gimsieke
Copy link
Contributor

The ultimate goal is to eliminate vulnerabilities detected by trivy, in particular to update commons-fileupload-1.3.jar to commons-fileupload-1.3.3.jar

Once we’ve merged the master changes, we can create a saxon11 branch using the most recent Calabash release.

@pmarkwart
Copy link
Contributor

@gimsieke @mkraetke I'm not sure if I did the right thing. Could you check the merge commit?

@gimsieke
Copy link
Contributor Author

Will check later today. (I also discovered when you approved it that my merge request was the other way round than I expected. But we need to mutually merge the changes of both branches anyway.)

Copy link
Contributor Author

@gimsieke gimsieke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don’t you push into the Saxon12 branch?

@mkraetke
Copy link
Member

@pglatza and me are currently writing a script to automate the Calabash/Saxon deployment into this repository. I will revert this commit and add that the script creates a separate branch for each Calabash/Saxon version.

@mkraetke
Copy link
Member

for reference 6251651

@mkraetke
Copy link
Member

@gimsieke the script creates now new branches for calabash-frontend and distro. Please see for example https://github.com/transpect/calabash-frontend/tree/calabash-1.5.7-120_saxon-12-5. The script was added here: 8d8889c

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants