-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Adding module-info.java to non-tests Jetty modules #3120
Conversation
Added module-info to jetty-util. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-util-ajax. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-io. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-jmx. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-http. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-server. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-xml. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-alpn-client. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-alpn-server. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-alpn-conscrypt-client. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-alpn-conscrypt-server. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-alpn-java-client. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-alpn-java-server. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-client. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to http2-hpack. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-common. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to http2-server. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-servlets. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to http2-client. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to http2-http-client-transport. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-security. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-servlet. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-webapp. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-jndi. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Added module-info to jetty-plus. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Looks like this branch could use a rebase against |
Reformatted module-info.java files (braces on new line). Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty-server/pom.xml
Outdated
<properties> | ||
<bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name> | ||
<jetty-http-tests-jar>${settings.localRepository}/org/eclipse/jetty/jetty-http/${project.version}/jetty-http-${project.version}-tests.jar</jetty-http-tests-jar> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems awkward.
@olamy got any ideas on how to do this more clearly? and not via the local repository?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sadly no...... I would prefer using the directory within reactor (--patch-module
can accept directories as well as file but I don't any to say use project.build.outputDirectory of those modules...) well you need to install first to get this working with ide... (not ideal...) Definitely something to add in maven-compiler-plugin
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would even prefer using <goal>copy-dependencies</goal>
to copy the jar in the target directory. So at least IDE can deal with that. Otherwise before running test with your IDE you need to first install the jars
Moved jetty-http test utility classes to new module "jetty-http-test". This simplifies the dependencies and the configuration for JPMS. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah. and first part of #3080
<build> | ||
<plugins> | ||
<!--TODO: do we need this test-jar?--> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think so. But maybe leave it temporary until we finish fixing #3080 . Well this will change the jars we publish to Maven central. But is there anyone using http://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-server/9.4.14.v20181114/jetty-server-9.4.14.v20181114-tests.jar ?
Removed test-jar generation from jetty-http. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Removed generation of test-jar from websocket-core. Reorganized code to not depend on a tests jar to simplify dependencies and configuration of JPMS. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Removed usage of test-jar. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
@joakime @olamy I have removed the usages of The only other place I reference I need to patch Any better idea on how can this be done? |
Perhaps it's time to bring back the custom servlet-api Jar. We could start with https://github.com/eclipse/jetty.toolchain/blob/master/jetty-osgi-servlet-api/pom.xml |
@gregw is filing an issue to the Servlet Spec to have the standard jar include the schemas. @janbartel also says that using the toolchain "jetty-osgi-servlet-api" jar may be the way to go: drop "osgi" from the jar name and just call the toolchain jar "jetty-servlet-api". |
@sbordet yup, can do. |
Do we need to update our schemas from the https://github.com/javaee/schemas ? |
Removed generation of test-jar from websocket-core. Reorganized code to not depend on a tests jar to simplify dependencies and configuration of JPMS. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
@joakime regarding the Jetty loads the XML schemas resources using the context classloader; the JVM finds that no JMPS module defines However, the same resources are loaded also by Tomcat does not get warnings (about not being able to find schema resources) because they have their own Servlet API jar that includes the schema resources. Jetty has the warning because it uses |
Removed leftover references to jetty-http test-jar. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Removed generation of test-jar from websocket-core. Reorganized code to not depend on a tests jar to simplify dependencies and configuration of JPMS. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
apache-jsp/pom.xml
Outdated
<groupId>org.eclipse.jetty</groupId> | ||
<artifactId>jetty-http</artifactId> | ||
<groupId>org.eclipse.jetty.tests</groupId> | ||
<artifactId>jetty-http-test</artifactId> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think jetty-http-tools
is a better name
Something called jetty-http-test
should test jetty-http
Something called jetty-http-tools
contains tools built from jetty-http
Renamed module jetty-http-test to jetty-http-tools. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Fixes #2978, adding
module-info.java
to non-tests Jetty modules.