Skip to content

Fix apache-jsp jar, webapp loading, and .classpath files - #212

Merged
tonygermano merged 3 commits into
OpenIntegrationEngine:mainfrom
tonygermano:fix/dot-classpath-files
Dec 2, 2025
Merged

Fix apache-jsp jar, webapp loading, and .classpath files#212
tonygermano merged 3 commits into
OpenIntegrationEngine:mainfrom
tonygermano:fix/dot-classpath-files

Conversation

@tonygermano

@tonygermanotonygermano commented Nov 29, 2025

Copy link
Copy Markdown
Member

When the version of apache-jsp was updated from 9.4.53 to 9.4.57 in #146 it was accidentally replaced with the jar containing the source files rather than the compiled class files. The file in this PR was downloaded from https://repo1.maven.org/maven2/org/eclipse/jetty/apache-jsp/9.4.57.v20241219/apache-jsp-9.4.57.v20241219.jar. Additionally, this PR updates the .classpath files with the new dependencies from this PR and 146.

Edit: Third commit added, which was cherry-picked from Innovar-Healthcare/BridgeLink#67. This fixes a regression bug related to the updated jetty version not being able to load web apps. Our project does not currently build or ship any webapps, but to test I uncommented this block so the old webadmin would build and deploy. The BL PR also adds back the correct apache-jsp jar, which was already part of this PR.

<!--
<ant antfile="${webadmin}/build.xml" dir="${webadmin}" target="dist"/>
<copy file="${webadmin}/dist/webadmin.war" todir="${server.build}/webapps" />
<copy file="${webadmin}/dist/webadmin.war" todir="${server.setup}/webapps" />
-->

When the version of apache-jsp was updated from 9.4.53 to 9.4.57 in
57bc9e7 it was accidentally replaced
with the jar containing the source files rather than the compiled class
files.
Signed-off-by: Tony Germano <tony@germano.name>
Required to make some IDEs happy following the library upgrades
introduced in 45c3e93
Signed-off-by: Tony Germano <tony@germano.name>
@tonygermano
tonygermano requested review from a team, jonbartels, kayyagari, mgaffigan and ssrowe and removed request for a teamNovember 29, 2025 07:11
@NicoPiel

Copy link
Copy Markdown
Contributor

Looks absolutely fine to my eyes. This hopefully fixes the issues in VSCode.

mgaffigan
mgaffigan previously approved these changes Nov 29, 2025
@tonygermano
tonygermano requested review from a team, gibson9583 and pacmano1 and removed request for a teamNovember 30, 2025 03:32
updated setWar method to use full context path to support new Jetty version
Cherry-picked-from: Innovar-Healthcare/BridgeLink@388cd0b
Issue: Innovar-Healthcare/BridgeLink#65
Signed-off-by: Tony Germano <tony@germano.name>
@tonygermanotonygermano changed the title Fix apache-jsp jar and .classpath filesFix apache-jsp jar, webapp loading, and .classpath filesDec 1, 2025

@kayyagarikayyagari left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This is looking good, thank you for updating the .classpath file.

@tonygermano
tonygermano merged commit a27c7a1 into OpenIntegrationEngine:mainDec 2, 2025
2 checks passed
@tonygermanotonygermano added this to the Next Release milestone Dec 2, 2025
@tonygermano
tonygermano deleted the fix/dot-classpath-files branch December 2, 2025 15:42
Sign up for freeto 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.

6 participants

@tonygermano@NicoPiel@kayyagari@ssrowe@mgaffigan@joshmc82