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

Issue #7012 Replace geronimo spec jars with jakarta equivalents #7013

Merged
merged 5 commits into from
Nov 1, 2021

Conversation

janbartel
Copy link
Contributor

Closes #7012

Replace all geronimo spec jars by their jakarta equivalents (using the javax namespace for jetty-10)

Copy link
Contributor

@joakime joakime left a comment

Choose a reason for hiding this comment

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

The older jspDependencies() made it easier to understand what was being done and why in the various places it was being used.

The new boolean technique is awkward.
Please either restore jspDependencies() or make the parameter something else.

enum JettyFeatureEnum {
  JSP, CDI
}

public static List<Option> coreJettyDependencies(JettyFeatureEnum ... feature) {

and then used like ...

options.addAll(TestOSGiUtil.coreJettyDependencies(JSP));

public static Option optionalRemoteDebug()
{
return CoreOptions.when(Boolean.getBoolean("pax.exam.debug.remote"))
.useOptions(CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"));
}

public static List<Option> coreJettyDependencies()
public static List<Option> coreJettyDependencies(boolean withJsp)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we just have a coreJspDependencies() instead of this boolean?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, I've implemented it a different way. The problem is that the jakarta.transaction-api jar wants to use the javax.el* package, so we must deploy the jakarta.el-api jar to satisfy it, even though it won't be used. However, if we then subsequently configure the JSP bundles, we want to use the org.mortbay.jasper.apache-el jar instead because it provides both the api and impl. So in the latest solution I've removed the prior configuration of the jakarta.el-api jar.

pom.xml Outdated Show resolved Hide resolved
@janbartel janbartel requested review from olamy and joakime October 20, 2021 00:12
@joakime joakime added the dependencies Pull requests that update a dependency file label Oct 20, 2021
@janbartel
Copy link
Contributor Author

@joakime nudge

1 similar comment
@janbartel
Copy link
Contributor Author

@joakime nudge

@janbartel janbartel merged commit e0d465e into jetty-10.0.x Nov 1, 2021
@janbartel janbartel deleted the jetty-10.0.x-7012-use-jakarta-jars branch November 1, 2021 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove all old geronimo spec jars from jetty-10
3 participants