Skip to content
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

Fix Tomcat start with Eclipse broken, local-config ignored #6000

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

matthias-ronge
Copy link
Collaborator

@matthias-ronge matthias-ronge commented Mar 8, 2024

Fixes #5999. Does undo commit 8062b8c which was merged in PR #5851 and was intended as a fix for #5850. As a consequence, issue #5850 must be reopened.

@henning-gerhardt
Copy link
Collaborator

Can you try to elaborate which of the changes is responsible for your issue? I think that is related to the updated maven plugins but as I have no access to a Windows based development system I can't test or elaborate which one is responsible.

@matthias-ronge
Copy link
Collaborator Author

Can you try to elaborate which of the changes is responsible for your issue?

Basically yes, but if those updates are not critical to security, I'd like to do that later. I currently have a whole series of projects in the line.

@henning-gerhardt
Copy link
Collaborator

This changes contains security fixes too. Not necessary in the used components itself but in the dependencies of the used components.

I looked into the change logs of the changed components and there is not a clear hint of changed functionality.

@matthias-ronge
Copy link
Collaborator Author

I found that the error was introduced by the maven-resources-plugin when changing from version 3.2.0 to 3.3.0. However, when I compared the code between the two versions, there is no obvious change that would account for the new behavior. However, the plugin itself includes various dependencies that were increased in that version. Most likely the change originates from one of these.

Copy link
Collaborator

@henning-gerhardt henning-gerhardt left a comment

Choose a reason for hiding this comment

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

Even with old version 3.2.0 the configuration files are copied or not copied depending on used development profile or not and if config-local directory is existing or not the right configuration files was inside the created war file. But this should be confirmed on an other Unix-based system (MacOS/iOS and or an other Linux system maybe?).

pom.xml Outdated Show resolved Hide resolved
@solth
Copy link
Member

solth commented Apr 9, 2024

But this should be confirmed on an other Unix-based system (MacOS/iOS and or an other Linux system maybe?).

I can confirm that Kitodo compiles and runs on MacOS with the the changes in this pull request and the correct local configuration is used. Therefor I am fine with merging this PR when the question with the apparent typo in the comment (see above) has been resolved (@matthias-ronge when you fix the comment, plase seize the opportunity and rebase your branch against the current master!).

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.

Tomcat start with Eclipse on Windows broken, local-config ignored
3 participants