Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…d=578221

This bug happens because the embedded eclipse java compiler in the
org.apache.jasper.glassfish package is way too old (from 2015) and
cannot handle the java.lang.System class file coming from the class path
of the JDK17 JRE. Adding the org.eclipse.jdt.core pacjage provides
an up to date java compiler (for JSP files) that is picket up automatically
by the org.apache.jasper.glassfish package.

Once the internal jasper compile is updated, we can remove this dependency.
  • Loading branch information
rhornig committed Mar 29, 2022
1 parent e06793f commit 8affcd4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion releng/docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ OMNETPP_ROOT=$(pwd)
docker run --network none -v "$OMNETPP_ROOT":/root/omnetpp-repo -e what -e GIT_VERSION -e BUILD_DOC \
-e BUILD_CORE_DISTRO -e BUILD_LINUX_X86_64_DISTRO -e BUILD_LINUX_AARCH64_DISTRO \
-e BUILD_WIN32_X86_64_DISTRO -e BUILD_MACOS_X86_64_DISTRO -e BUILD_MACOS_AARCH64_DISTRO \
omnetpp/distrobuild:eclipse4.22-tools211209-211209 && \
omnetpp/distrobuild:eclipse4.22-tools211209-220329 && \
docker cp $(docker ps -lq):/root/omnetpp/out/dist/ releng && \
docker rm $(docker ps -lq)
2 changes: 1 addition & 1 deletion releng/dockerfiles/distrobuild/build
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
rm -rf omnetpp-repo
# copy the current state of the repo to the context dir
git clone -n ../../../.git omnetpp-repo
docker build -t omnetpp/distrobuild:eclipse4.22-tools211209-211209 .
docker build -t omnetpp/distrobuild:eclipse4.22-tools211209-220329 .
rm -rf omnetpp-repo
1 change: 1 addition & 0 deletions ui/org.omnetpp.doc/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.intro,
org.eclipse.ui.intro.universal,
org.eclipse.help,
org.eclipse.jdt.core,
org.omnetpp.common
Automatic-Module-Name: org.omnetpp.doc

0 comments on commit 8affcd4

Please sign in to comment.