Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,123 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

1179 Commits

Author SHA1 Message Date
Simone Bordet 1c55e2bf79 Issue #3303 - Update to jakarta ee javax artifacts for jetty-10. 
Updated javax.annotation -> jakarta.annotation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-12 18:56:16 +01:00
Simone Bordet b786a2c826 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-11 10:27:45 +01:00
Simone Bordet 875af5c692 Restored Automatic-Module-Name that was removed in 471dab752. 
Cleaned up pom.xml files that required a correct JPMS module name.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-11 10:16:07 +01:00
Simone Bordet e2506d4811
Merge pull request #3168 from eclipse/jetty-10.0.x-3162_jetty_servlet_api 
Issue #3162 - Use Jetty specific Servlet API jar.
 2019-02-07 17:33:14 +01:00
Jan Bartel fb90666931 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-02-06 17:24:06 +11:00
Joakim Erdfelt 72ad74866c Issue #3162 - Reverting not-relevant OSGi changes 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-02-04 18:51:51 +01:00
Joakim Erdfelt e135197066 Issue #3162 - Introducing more convenience Options for PaxExam 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-02-04 18:51:51 +01:00
Joakim Erdfelt 95bc15f521 Issue #3162 - Correcting websocket issues in OSGi 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-02-04 18:51:51 +01:00
Simone Bordet 66f8259df3 Issue #3162 - Use Jetty specific Servlet API jar. 
Removed references to jetty-osgi-servlet-api.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-04 18:51:26 +01:00
Simone Bordet 13cee0bc4d Issue #3049 - Warn on common SslContextFactory problematic configurations. 
Updating SslContextFactory configuration for tests, take 2.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-31 16:51:20 +01:00
Joakim Erdfelt 26fa79a050 Issue #3162 - Reverting not-relevant OSGi changes 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-30 12:43:36 -06:00
Joakim Erdfelt c30c8d4339 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
 2019-01-30 11:56:58 -06:00
Jan Bartel ce976b5aa3
Issue #3249 Update to apache jsp 9.0.14 (#3299) 
* Issue #3249 Update to apache jsp 9.0.14

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-01-30 14:31:58 +11:00
Olivier Lamy 4d191d8a31
fix groupId (#3294) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-25 16:04:33 +10:00
Joakim Erdfelt 5095c8a7b2 Issue #3288 - Correcting Jetty WebSocket API artifactIds 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-23 15:58:11 -06:00
Joakim Erdfelt 0b3262e16c
Merge pull request #3275 from eclipse/jetty-10.0.x-issue-3274-exclude-osgi-foundation-conflicting-classes 
Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes
 2019-01-23 10:50:56 -06:00
Jan Bartel c2224e3118 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-01-22 12:42:55 +11:00
Jan Bartel 60158edd2b
Issue #3280 Remove unused build.properties from osgi (#3281) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-01-22 12:41:28 +11:00
Joakim Erdfelt 5bed6a4fd8 Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-18 11:17:49 -06:00
Jan Bartel 0e97d9b68d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-01-15 14:57:21 +11:00
Jan Bartel 9f3f3b78ae
Issue #3250 Ease osgi debugging (#3251) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-01-15 14:38:16 +11:00
olivier lamy 63f2023e05 happy new year!! 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-01 12:17:53 +10:00
Olivier Lamy 9b7afd8a03
Happy new year!! (#3232) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-01 11:52:16 +10:00
olivier lamy bd4933b33c Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-12-21 21:48:36 +10:00
Olivier Lamy 63820e5405
activate Maven enforcer Upper bound dependencies check (#3116) 
* add requireUpperBoundDeps rule

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-21 21:35:31 +10:00
Greg Wilkins f2f6598ddc Fixed param name after review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-18 08:46:52 +11:00
Greg Wilkins 6590dfe832 fixed javax websocket OSGi test 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-13 16:19:16 +11:00
Greg Wilkins 1176b267b5 removed -impl from websocket name and fixed SCI 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-13 10:05:10 +11:00
Greg Wilkins 52d0d62594 Configure default EndpointIdentificationAlgorithm for WebSocketCoreClient 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-13 09:36:13 +11:00
Greg Wilkins 9a67114c43 work in progress to fix websocket OSGi 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-12 17:35:46 +11:00
Jan Bartel 61686843db Issue #3162 Partial fix for javaxwebsocket in osgi, wip. 2018-12-12 14:44:04 +11:00
Joakim Erdfelt ff0aa965c4 Issue #3162 - Attempting to address ServiceLoader with javax.websocket (client) on OSGi 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-12 14:43:58 +11:00
Jan Bartel 1167adf713 Issue #3162 Partial fix for javaxwebsocket in osgi, wip. 2018-12-12 10:15:43 +11:00
Greg Wilkins 13ee892921 Merge remote-tracking branch 'remotes/lachlan/jetty-10.0.x-3129-websocketModuleRefactor' into jetty-10.0.x-3129-websocket 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-05 09:55:22 +01:00
Jan Bartel f4cf671b27 Issue #3129 Fix websocket in osgi; javax websocket test still broken. 2018-12-05 09:38:13 +01:00
Joakim Erdfelt 435dd200bd Issue #3162 - Attempting to address ServiceLoader with javax.websocket (client) on OSGi 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-04 11:31:02 -06:00
Joakim Erdfelt 7262bfd584 Issue #3162 - Fixing testcase assertions 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-04 08:50:19 -06:00
Joakim Erdfelt 97bba2eb6f Issue #3162 - Fail test early if `conscrypt-version` is undefined (like on Windows, or within an IDE) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-04 08:48:15 -06:00
Joakim Erdfelt 24e680e272 Issue #3162 - Introducing more convenience Options for PaxExam 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:35:08 -06:00
Joakim Erdfelt 01e1f01933 Issue #3162 - Correcting package name exposure (missing 's') 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:33:51 -06:00
Joakim Erdfelt db11be087a Issue #3162 - Updating XML (removing references that seem to be getting in the way) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:33:20 -06:00
Joakim Erdfelt 7f6add586e Issue #3162 - Adding missing Configuration reference 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:32:53 -06:00
Joakim Erdfelt e16e3f1358 Issue #3162 - correcting logger name 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:32:27 -06:00
Joakim Erdfelt c3348a0a03 Issue #3162 - Correcting websocket issues in OSGi 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-11-30 15:03:44 -06:00
Lachlan Roberts e8ba030904 Issue #3129 - refactor of javax websocket package names 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-29 17:43:51 +01:00
Simone Bordet 8ff82423f9 Issue #3162 - Use Jetty specific Servlet API jar. 
Removed references to jetty-osgi-servlet-api.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-29 17:36:09 +01:00
Simone Bordet bfa2dbf68c 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>
 2018-11-29 16:51:29 +01:00
Jan Bartel 1baa3c3147 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-28 15:01:50 +01:00
Raymond Augé 7ef8f882bd fixes #3141 Upgrade jetty osgi tests to use spifly 1.2 (#3142) 
Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
 2018-11-28 15:00:31 +01:00
Greg Wilkins 00e2026594 Fix conscrypt version for osgi jdk8 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-24 21:16:19 +01:00