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.

Sign up for GitHub

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

Jump to bottom

Issue #3162 - Use Jetty specific Servlet API jar. #3168

Merged
merged 38 commits into from
Feb 7, 2019
Merged

Issue #3162 - Use Jetty specific Servlet API jar. #3168

merged 38 commits into from
Feb 7, 2019

Commits on Nov 29, 2018

  1. Issue #3162 - Use Jetty specific Servlet API jar. 

    * Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
  to match the new Jetty Servlet API jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    bfa2dbf View commit details
    Browse the repository at this point in the history

  2. Issue #3162 - Use Jetty specific Servlet API jar. 

    Future proof reference of the jetty-servlet-api.jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    707c9ec View commit details
    Browse the repository at this point in the history

  3. Issue #3162 - Use Jetty specific Servlet API jar. 

    Removed references to jetty-osgi-servlet-api.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    8ff8242 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2018

  1. Issue #3162 - Correcting websocket issues in OSGi 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Nov 30, 2018
    Configuration menu
    Copy the full SHA
    c3348a0 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2018

  1. Issue #3162 - Fixing OSGi manifest for websocket 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Dec 3, 2018
    Configuration menu
    Copy the full SHA
    85f74f1 View commit details
    Browse the repository at this point in the history

  2. Issue #3162 - correcting typo 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Dec 3, 2018
    Configuration menu
    Copy the full SHA
    e0f4e5a View commit details
    Browse the repository at this point in the history

  3. Issue #3162 - correcting logger name 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Dec 3, 2018
    Configuration menu
    Copy the full SHA
    e16e3f1 View commit details
    Browse the repository at this point in the history

  4. Issue #3162 - Adding missing Configuration reference 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Dec 3, 2018
    Configuration menu
    Copy the full SHA
    7f6add5 View commit details
    Browse the repository at this point in the history

  5. Issue #3162 - Updating XML (removing references that seem to be getti… 

    …ng in the way)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Dec 3, 2018
    Configuration menu
    Copy the full SHA
    db11be0 View commit details
    Browse the repository at this point in the history

  6. Issue #3162 - Correcting package name exposure (missing 's') 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Dec 3, 2018
    Configuration menu
    Copy the full SHA
    01e1f01 View commit details
    Browse the repository at this point in the history

  7. Issue #3162 - Making dependents OSGi aware 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Dec 3, 2018
    Configuration menu
    Copy the full SHA
    231892e View commit details
    Browse the repository at this point in the history

  8. Issue #3162 - Introducing more convenience Options for PaxExam 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Dec 3, 2018
    Configuration menu
    Copy the full SHA
    24e680e View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2018

  1. Issue #3162 - Fail test early if conscrypt-version is undefined (li… 

    …ke on Windows, or within an IDE)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Dec 4, 2018
    Configuration menu
    Copy the full SHA
    97bba2e View commit details
    Browse the repository at this point in the history

  2. Issue #3162 - Fixing testcase assertions 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Dec 4, 2018
    Configuration menu
    Copy the full SHA
    7262bfd View commit details
    Browse the repository at this point in the history

  3. Issue #3162 - Attempting to address ServiceLoader with javax.websocke… 

    …t (client) on OSGi

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Dec 4, 2018
    Configuration menu
    Copy the full SHA
    435dd20 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2018

  1. Issue #3162 Partial fix for javaxwebsocket in osgi, wip.

    @janbartel
    janbartel committed Dec 11, 2018
    Configuration menu
    Copy the full SHA
    1167adf View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2019

  1. Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-… 

    …3162_jetty_servlet_api

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-client/pom.xml
#	jetty-http/pom.xml
#	jetty-http2/http2-client/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-http2/http2-server/pom.xml
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
#	jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
#	jetty-quickstart/pom.xml
#	jetty-servlets/pom.xml
#	jetty-util/pom.xml
#	jetty-websocket/javax-websocket-client/pom.xml
#	jetty-websocket/javax-websocket-server/pom.xml
#	jetty-websocket/jetty-websocket-server/pom.xml
#	pom.xml
    @joakime
    joakime committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    c30c8d4 View commit details
    Browse the repository at this point in the history

  2. Issue #3162 - Using snapshot repositories on CI (temporary) 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    755d572 View commit details
    Browse the repository at this point in the history

  3. Issue #3162 - Reverting not-relevant OSGi changes 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    26fa79a View commit details
    Browse the repository at this point in the history

  4. Issue #3162 - Reverting not-relevant JspConfig change. 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    c25cbf3 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2019

  1. Issue #132 - ClientConnector abstraction. 

    Introduced ClientConnector and refactored HttpClient transports,
removing duplicated code that was connect() to a remote host.

Refactored also HTTP2Client to reference ClientConnector.

Refactored tests accordingly to the changes introduced in the
implementations.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    3c9c78c View commit details
    Browse the repository at this point in the history

  2. Issue #132 - ClientConnector abstraction. 

    Added name to default executor and scheduler after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    64a2bc3 View commit details
    Browse the repository at this point in the history

  3. Issue #132 - ClientConnector abstraction. 

    Rewrote HttpClientTransportOverUnixSockets in light of ClientConnector.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    51730a7 View commit details
    Browse the repository at this point in the history

  4. Issue #132 - ClientConnector abstraction. 

    Reverted refactoring of newConnection() to avoid
to bind the class to a too specific abstract method.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    514c6df View commit details
    Browse the repository at this point in the history

  5. use snapshot of maven-invoker-plugin because of NPE https://issues.ap… 

    …ache.org/jira/browse/MINVOKER-247

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
    @olamy @sbordet
    olamy authored and sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    d8d1ecf View commit details
    Browse the repository at this point in the history

  6. fix merge 

    Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
    @olamy @sbordet
    olamy authored and sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    b9281e3 View commit details
    Browse the repository at this point in the history

  7. Issue #3162 - Use Jetty specific Servlet API jar. 

    * Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
  to match the new Jetty Servlet API jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    0d89f29 View commit details
    Browse the repository at this point in the history

  8. Issue #3162 - Use Jetty specific Servlet API jar. 

    Removed references to jetty-osgi-servlet-api.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    66f8259 View commit details
    Browse the repository at this point in the history

  9. Issue #3162 - Correcting websocket issues in OSGi 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime @sbordet
    joakime authored and sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    95bc15f View commit details
    Browse the repository at this point in the history

  10. Issue #3162 - Introducing more convenience Options for PaxExam 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime @sbordet
    joakime authored and sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    e135197 View commit details
    Browse the repository at this point in the history

  11. Issue #3162 - Reverting not-relevant OSGi changes 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime @sbordet
    joakime authored and sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    72ad748 View commit details
    Browse the repository at this point in the history

  12. Issue #3162 - Use Jetty specific Servlet API jar. 

    Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    33f314e View commit details
    Browse the repository at this point in the history

  13. Issue #3162 - Use Jetty specific Servlet API jar. 

    Updated to jetty-servlet-api:4.0.2, based on jakarta.servlet 4.0.2.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    107170a View commit details
    Browse the repository at this point in the history

  14. Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3162_jetty_servlet_api'. 

    Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    cd488c2 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2019

  1. Issue #3162 - Fixing compilation issues

    @joakime
    joakime committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    b09f1de View commit details
    Browse the repository at this point in the history

  2. Issue #3162 - Correcting javadoc

    @joakime
    joakime committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    e4df1fe View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-… 

    …3162_jetty_servlet_api
    @joakime
    joakime committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    0817928 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2019

  1. Issue #3162 - Use Jetty specific Servlet API jar. 

    Updated references to Servlet jar to "jetty-servlet-api".

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    9286cdc View commit details
    Browse the repository at this point in the history