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

tomcat5: Enable usage of javac release and remove internal class use (fix JDK8 and JDK17+) #5160

Merged
merged 2 commits into from
Dec 30, 2022

Conversation

matthiasblaesing
Copy link
Contributor

The tomcat5 module used the internal classes:

com.sun.org.apache.xml.internal.serialize.OutputFormat
com.sun.org.apache.xml.internal.serialize.XMLSerializer

to modify the tomcat configuration. For this to work the usage of the
javac release option had to be disabled as only exported classes are
then accessible. This is done by specifying bootclasspath.prepend.

Having this masked a different issue which rendered the tomcat module
JDK 9+. The method:

URLEncoder#encode(String s, Charset enc)

was used, which was introduced with JDK9. The alternative

URLEncoder#encode(String s, String enc)

can be used as a drop-in replacement.

Closes: #5134
Closes: #5154

@apache apache locked and limited conversation to collaborators Dec 29, 2022
@matthiasblaesing matthiasblaesing added ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) DO NOT squash labels Dec 29, 2022
@apache apache unlocked this conversation Dec 29, 2022
@matthiasblaesing
Copy link
Contributor Author

Copy link
Member

@mbien mbien left a comment

Choose a reason for hiding this comment

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

looks good. Good to see more tests getting enabled.

I started working on making the enterprise job testable on JDK 11 but got stuck and ran out of time. Going to open a draft later which partially fixes a few things.

@mbien mbien added this to the NB17 milestone Dec 29, 2022
@mbien mbien added the enterprise [ci] enable enterprise job label Dec 29, 2022
…(fix JDK8 and JDK17+)

The tomcat5 module used the internal classes:

com.sun.org.apache.xml.internal.serialize.OutputFormat
com.sun.org.apache.xml.internal.serialize.XMLSerializer

to modify the tomcat configuration. For this to work the usage of the
javac release option had to be disabled as only exported classes are
then accessible. This is done by specifying bootclasspath.prepend.

Having this masked a different issue which rendered the tomcat module
JDK 9+. The method:

URLEncoder#encode(String s, Charset enc)

was used, which was introduced with JDK9. The alternative

URLEncoder#encode(String s, String enc)

can be used as a drop-in replacement.

Closes: apache#5134
Closes: apache#5154
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) DO NOT squash enterprise [ci] enable enterprise job
Projects
None yet
2 participants