Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,070 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

1191 Commits

Author SHA1 Message Date
Olivier Lamy 213ac63d2c
Enable gcloud testing in docker (#5651) 
* Enable "gcloud" profile for gcloud session testing.

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

* use docker image as google datastore

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix project id

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* all tests pass here

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* do not trim stack trace

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* Try distinguishing between localhost and non-localhost

Signed-off-by: Jan Bartel <janb@webtide.com>

* add some debug

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* remove non needed pom content

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Co-authored-by: Jan Bartel <janb@webtide.com>
 2020-11-17 11:13:22 +10:00
Joakim Erdfelt e59b7c2750
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-04 13:24:50 -06:00
Joakim Erdfelt 2fd895a6dc
Merge pull request #5570 from eclipse/dependency/jetty-9.4.x/org.infinispan.protostream-protostream-4.3.4.Final 
Bump protostream from 4.2.2.Final to 4.3.4.Final
 2020-11-04 13:19:52 -06:00
Joakim Erdfelt 71ad5447a4
Merge remote-tracking branch 'origin/release-9.4.34' into jetty-9.4.x 2020-11-04 10:24:21 -06:00
Joakim Erdfelt 4f8707390e
Adding required gson dependency to test-infinispan-sessions 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-04 10:09:15 -06:00
Joakim Erdfelt 2c43fbf37b
Bump protostream from 4.2.2.Final to 4.3.4.Final 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-03 14:08:58 -06:00
Joakim Erdfelt 167eded4cf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-03 08:33:33 -06:00
Joakim Erdfelt edaadff55b Updating to version 9.4.35-SNAPSHOT 2020-11-02 09:04:51 -06:00
Joakim Erdfelt e46af88704 Updating to version 9.4.34.v20201102 2020-11-02 08:03:51 -06:00
dependabot[bot] 2f295c126f
Bump mariadb-java-client from 2.6.0 to 2.7.0 
Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.6.0...2.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-30 18:18:43 +00:00
Joakim Erdfelt e726eefb0b Updating to version 9.4.34-SNAPSHOT 2020-10-20 18:55:39 -05:00
Joakim Erdfelt 1be6875565 Updating to version 9.4.33.v20201020 2020-10-20 18:28:51 -05:00
Joakim Erdfelt e12c3ce50b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 08:11:42 -05:00
Joakim Erdfelt 369940c8b6
Issue #5451 - Proper use of WorkDir 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-16 06:43:12 -05:00
Lachlan Roberts 5800f4605f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 15:37:24 +11:00
olivier lamy 6f98b136cf fix tests 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-10-16 13:46:08 +10:00
Joakim Erdfelt fdd880b66b
Issue #5451 - Cleanup of temp file cleanup. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-15 18:10:38 -05:00
Joakim Erdfelt 9ad6beb805
Merge pull request from GHSA-g3wg-6mcf-8jj6 2020-10-16 01:06:08 +02:00
Joakim Erdfelt fc45286bab
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-09 13:36:42 -05:00
Joakim Erdfelt 72c5ed0ff7
Bumping gcloud from 1.0.0 to 1.105.0 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-08 14:59:34 -05:00
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Joakim Erdfelt ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-29 11:24:28 -05:00
Joakim Erdfelt 3423375a97
Issue #5357 - Updating to https://eclipse.org/ (#5358) 
* Issue #5357 - Updating to https://eclipse.org/

 - Removing redundant <url> refs in pom.xml
 - Correcting bad indenting from merge
 - Correcting mailing list references
 - Correcting bugs.eclipse.org references
 - Correcting text file references
 - Correcting html references
 - Correcting further references
 - Correcting download.eclipse.org reference
 - Adding test for demo-base /proxy/current/
 - Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-29 11:02:32 -05:00
Joakim Erdfelt 3c7cd43148
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-28 17:55:41 -05:00
Joakim Erdfelt 8a524a6bf9
Cleaning up junit dep issues in session tests. 
+ Enforcer mandates common version of junit-jupiter,
  but the org.testcontainers:testcontainers brings in
  an older version.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 13:48:46 -05:00
Joakim Erdfelt e879c1fcea
Cleaning up junit dep issues in session tests. 
+ Enforcer mandated

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 12:44:32 -05:00
Joakim Erdfelt be07e84cd7
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-22 09:15:59 -05:00
Joakim Erdfelt a99a832206
Issue #5137 - Cleanup of WebAppContextTest 
+ Cleanup of test-servlet-spec webapp
+ Removing unused methods
+ Commented System.err.println moved to java.util.logging
+ General checkstyle cleanup (empty lines, spacing, etc)
+ Eliminate bogus WebApp LIB ordering tests.
+ No ClassLoader has a order guarantee.
+ Moving HttpSessionListenerTest contents to existing SessionListenerTest
+ Cleanup of SessionListenerTest with eye to resource cleanup
+ Removing ServletContextListenerTest as it duplicates tests
+ Restoring WebAppClassLoaderTest test method
+ `ordering()` is now `testClashingResource()` and properly
  tests assumptions when dealing with a ClassLoader.
  The old test assumed guaranteed order from a ClassLoader,
  which is not a feature of any Java ClassLoader.
  Especially so for URLClassLoader.
+ Restoring clashing resource test

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-22 08:46:11 -05:00
dependabot[bot] 3dae15dc5a
Bump mariadb-java-client from 2.6.0 to 2.6.2 (#5302) 
Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.0 to 2.6.2.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.6.0...2.6.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 13:23:20 +02:00
Olivier Lamy eaf07dd4cc
fix get sessionId from fileName (#5288) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-09-17 18:03:52 +10:00
gregw 3bb419842d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-09-15 12:04:02 +02:00
Jan Bartel e23eaa26b9 Fix FileSessionDataStoreTest.testCleanOrphans 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-15 11:02:01 +02:00
Jan Bartel 7d0e344083 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-02 12:22:18 +02:00
Jan Bartel e2d0e1fa34 Remove println 2020-09-02 12:21:30 +02:00
Jan Bartel 9ab95ed824 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-02 12:09:23 +02:00
Jan Bartel ef0c752476
Issue #4888 Ensure HttpSessionListener can access session via (#5220) 
Issue #4888 Ensure HttpSessionListener can call Request.getSession

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-02 11:53:23 +02:00
Jan Bartel ad9d702adb
Issue #2609 - Uniform Find Expired Sessions (#5097) 
* Issue #2609 Make all session stores use same algorithm to find expired sessions

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-08-31 12:39:30 +02:00
olivier lamy 495a1cb109 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-08-12 09:49:06 +08:00
Olivier Lamy 12667497e1
Jetty 9.4.x surefire 3.0.0 m5 (#5136) 
* test surefire 3.0.0-M5

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* simplify code to avoid some timeout

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-08-12 10:27:12 +10:00
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
olivier lamy eefe3d202b revert fail release 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 15:04:22 +10:00
olivier lamy 9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy 23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +10:00
olivier lamy 4cd6a71134 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-07-09 07:54:59 +10:00
olivier lamy 7bcbc21ca9 no need of system property for this 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-09 07:52:47 +10:00
Joakim Erdfelt 02bd1e5956
Followup changes from merge 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-06-25 12:52:49 -05:00
Joakim Erdfelt e1c8a0e8b8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-25 12:52:29 -05:00
Joakim Erdfelt 3adec35cf5
Fixing CustomImportOrder checkstyle violations 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-06-25 09:25:05 -05:00
Simone Bordet 0b854a1f5f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-06-18 15:37:09 +02:00
olivier lamy f745d5d5df remove unused imports and upgrade testcontainers.version 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-06-15 17:40:15 +10:00
Joakim Erdfelt 6795f3915f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-12 12:04:50 -05:00
Joakim Erdfelt 4abd8b1b39
Merge remote-tracking branch 'origin/release-9.4.30' into jetty-9.4.x 2020-06-12 11:31:42 -05:00
Jan Bartel 004bbe4e9f Add deletion test for memcached session data cache. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-06-12 18:20:14 +10:00
olivier lamy 7f0c725fd4 upgrade testcontainers to 1.14.2 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-06-12 18:20:14 +10:00
olivier lamy a78d2f475d use testcontainers to start memcached via docker for testing real remote memcached server 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-06-12 18:20:14 +10:00
Joakim Erdfelt 6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00
Joakim Erdfelt 271836e4c1 Updating to version 9.4.30.v20200611 2020-06-11 07:21:18 -05:00
Jan Bartel cb09abe873
Issue #4920 Restore ability to invalidate sessions on shutdown (#4933) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-06-10 18:40:19 +02:00
olivier lamy 593d3e9aa6 remove duplicate dependency 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-06-07 09:31:44 +10:00
Joakim Erdfelt 426795660f
Cleaning up double-merge final issues. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-06-03 16:14:32 -05:00
Joakim Erdfelt 0cce039e7c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-03 16:10:41 -05:00
Jan Bartel 5d328ba928 Suppress debug stacktrace for TestFileSessions.testSweep 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-06-03 10:26:13 +02:00
Greg Wilkins b8c7a9509a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-05-27 10:11:51 +02:00
olivier lamy 2b1fa80b63 always run the test except if Docker not available 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 16:00:23 +10:00
olivier lamy 7cc3573ceb remove derby system property 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 16:00:23 +10:00
olivier lamy 389f46c826 bye bye Derby tests, only use mariadb via container 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 16:00:23 +10:00
olivier lamy 1249763aad remove changes to DatabaseAdaptor with new fields username/password, use our own username/password in maria_db tests 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 16:00:23 +10:00
olivier lamy c05bd6c26d use testcontainers/docker to run jdbc sessions tests with Mariadb remote 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 16:00:23 +10:00
Joakim Erdfelt 5d6f3e2ddc Updating to version 9.4.30-SNAPSHOT 2020-05-21 13:42:25 -05:00
Joakim Erdfelt 77c232aed8 Updating to version 9.4.29.v20200521 2020-05-21 12:04:14 -05:00
Jan Bartel 42e46aee49 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-05-20 23:06:27 +02:00
Jan Bartel 52e7dd4873
Issue #4895 SessionCache flushOnResponseCommit with invalid session (#4896) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-05-20 23:05:53 +02:00
olivier lamy 9c7d36fd51 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-16 20:03:09 +10:00
olivier lamy 9b16f2deee do not create on start 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-16 19:38:33 +10:00
olivier lamy bb26241a37 add RemoteQueryManagerTest to use infinispan via testcontainer, simplify how we start infinispan 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-16 19:38:33 +10:00
olivier lamy ebbe2c5843 use new junit api to test exception 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-16 19:38:33 +10:00
olivier lamy 90527065c0 no need to ignore those tests 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-16 19:38:33 +10:00
olivier lamy 6b0b5c13e5 finally use the file from Jan :) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-16 19:38:33 +10:00
olivier lamy e2edd6f38f more testing with Jan configuration file 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-16 19:38:33 +10:00
olivier lamy abec84596f Activate infinispan remote testing using docker image 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-16 19:38:33 +10:00
olivier lamy a0b9cb3fa4 use docker image to test infinispan remote access 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-16 19:38:33 +10:00
Simone Bordet 0018c298dc
Merge pull request #4845 from eclipse/jetty-10.0.x-4808-review_httpclient_header_api 
Fixes #4808 - Review HttpClient Request header APIs.
 2020-05-08 17:52:51 +02:00
olivier lamy 972cd95ec0 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-08 10:21:41 +10:00
Olivier Lamy 78992a126c
Start a mongo instance for testing using docker via java code (#4840) 
* remove slow mongo maven plugin which was forking an external process and now run mongodb in a container so we can even now test with different version using -Dmongo.docker.version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-08 07:06:03 +10:00
Simone Bordet cf9df70935 Fixes #4808 - Review HttpClient Request header APIs. 
Introduced:
* Request Request.headers(Consumer<HttpFields.Mutable>).
This allows applications to modify the headers, and chain calls.
It also delegates the precise semantic of put/add/remove/clear to HttpFields, so there is no API duplication.
* HttpRequest.header(HttpField) to efficiently add fields while normalizing the request (only used in implementation).

* HttpResponse.header(HttpField) to efficiently add fields while parsing the response (only used in implementation).
This pairs with HttpResponse.trailer(HttpField).
* HttpResponse.headers(Consumer<HttpFields.Mutable>) to modify the fields after they have been populated (only used in tests).

Removed:
* Request.[set,add,put,remove], replaced by headers(Consumer<HttpFields.Mutable>).

Deprecated:
* Request.header(String, String)
* Request.header(HttpHeader, String)
Both replaced by headers(Consumer<HttpFields.Mutable>) with clearer semantic for add/put/remove.

All the rest is code cleanup to remove the usage of the deprecated header() methods.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-05-04 23:16:59 +02:00
Greg Wilkins 2addb6a655
Jetty 10.0.x use HandlerList instead of HandlerCollection (#4757) 
* Use HandlerList instead of HandlerCollection

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Use HandlerList instead of HandlerCollection

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-04-15 18:42:28 +02:00
Joakim Erdfelt 5699b9ff3d Updating to version 9.4.29-SNAPSHOT 2020-04-08 13:15:04 -05:00
Joakim Erdfelt ab228fde9e Updating to version 9.4.28.v20200408 2020-04-08 12:33:56 -05:00
Simone Bordet 414a1dd396 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-31 14:50:48 +02:00
Jan Bartel 524e690140
Issue #4682 Session with no attributes unreadable from jdbc (#4688) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-03-31 14:25:52 +02:00
Simone Bordet e215d071c8 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4400-review_httpclient_content'. 2020-03-23 16:24:04 +01:00
Jan Bartel ea1418ac6d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-03-23 11:43:09 +01:00
Andrej Krota d445d7eb5d
Fixed InfinispanSessionData serialization issues when using infinispan (#4600) 
* Fixed InfinispanSessionData serialization issues when using infinispan
embedded
* Added version to InfinispanSessionDataSerializer
* Refactored InfinispanSessionDataSerializer to make use of
SessionDataMarshaller
* Tests with and without storeAsBinary enabled
* Merged InfinispanSessionDataSerializer and SessionDataMarshaller
* Wrapped Object Input/Output to Input/Output Streams
* Fixed an issue when reading the session data from a file.
* Modified tests to force read from file if available.
* static lazy init serializationContext
* synchronized initSerializationContext

Signed-off-by: Andrej Krota <andrej.krota@gmail.com>
 2020-03-23 11:14:01 +01:00
Joakim Erdfelt 43419802b7
Issue #4685 - Declare <scope> for jetty-slf4j-impl everywhere 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-03-20 11:12:08 -05:00
Joakim Erdfelt 44d2171986
Issue #4685 - jetty-http-spi logging for both jetty and jul 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-03-20 10:05:32 -05:00