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

22813 Commits

Author SHA1 Message Date
Jan Bartel 1fb9e27560 Issue #5772 Fix jndi mail class duplication 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-08 13:05:53 +01:00
olivier lamy 61aac5abb5 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-07 21:15:26 +10:00
olivier lamy aabe5ceee2 remove duplicate dependencies 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-07 21:14:59 +10:00
olivier lamy 99151b9c16 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-07 12:31:17 +10:00
olivier lamy 833339a8e1 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-07 12:30:45 +10:00
dependabot[bot] 0a6ea8ddbd
Bump flatten-maven-plugin from 1.0.1 to 1.2.5 (#5664) 
Bumps [flatten-maven-plugin](https://github.com/mojohaus/flatten-maven-plugin) from 1.0.1 to 1.2.5.
- [Release notes](https://github.com/mojohaus/flatten-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/flatten-maven-plugin/compare/flatten-maven-plugin-1.0.1...flatten-maven-plugin-1.2.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-07 12:28:16 +10:00
olivier lamy 30ddd725d7 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-07 12:19:54 +10:00
Olivier Lamy 22ca841e37
get rid of this logback dependency (#5747) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-07 12:19:08 +10:00
olivier lamy f160a39a91 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-03 20:57:30 +10:00
olivier lamy 9b2250c05d javadoc:jar must be run after clean install: 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-03 19:02:50 +10:00
olivier lamy 251fc4c159 remove javadoc:jar as it is failing now... 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-03 18:54:13 +10:00
olivier lamy 62b54cd3d6 remove this local repo 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-03 18:48:04 +10:00
olivier lamy 5a302b6be8 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-03 17:51:06 +10:00
olivier lamy e49d011db8 remove comment 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-03 17:48:09 +10:00
olivier lamy 4542393e0c use a temporary mount 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-03 16:37:59 +10:00
Joakim Erdfelt cc9b41cf17
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-02 14:53:52 -06:00
Joakim Erdfelt 0a034dbd50
Merge pull request #5740 from eclipse/jetty-10.0.x-5739-Remove-distribution-from-doco 
Fix #5739 Remove distribution from doco
 2020-12-02 14:53:31 -06:00
Joakim Erdfelt 41c2e9cb6d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5739-Remove-distribution-from-doco 2020-12-02 14:52:53 -06:00
Simone Bordet 0eccddecec
Merge pull request #5744 from eclipse/jetty-10.0.x-5086-review-scanner 
Issue #5086 Review and rework o.e.j.util.Scanner
 2020-12-02 19:25:37 +01:00
Simone Bordet 9c882ee796 Improved KeyStoreScanner.scan(). 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-02 19:24:19 +01:00
Jan Bartel a3c116f8a0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-02 18:48:05 +01:00
Jan Bartel 37882236a6 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-12-02 18:35:49 +01:00
Jan Bartel f0a2ab4fed
Issue #5675 Update some osgi test dependencies (#5676) 
* Issue #5675 Update some osgi test dependencies

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-02 18:21:18 +01:00
Joakim Erdfelt c90690abf6
Updating example output 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-12-02 10:54:30 -06:00
Joakim Erdfelt ddef266fe7
Fixing comment 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-12-02 10:54:13 -06:00
Simone Bordet fe0e076055 Using capital case for static final field. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-02 17:47:56 +01:00
Simone Bordet 97b3f262ab Fixed scan(Callback) bug, returning early in case of failures. 
More cleanups in code adding more privateness, getting rid of unnecessary exceptions, making fields final, etc.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-02 12:53:23 +01:00
Jan Bartel 8fe8cb8c27 Issue #5086 Add blocking method for immediate scan. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-02 10:27:08 +01:00
gregw f00a2c2917 WIP 2020-12-02 09:33:37 +01:00
gregw 1768bd898f Fix #5739 Remove distribution from doco 
Mostly mechanical fixes
 2020-12-02 09:16:29 +01:00
Jan Bartel c776eeb838 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5086-review-scanner 2020-12-02 09:03:46 +01:00
Jan Bartel e39ec6cab4 Issue #5086 Fix error on addFile 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-02 08:02:09 +01:00
Lachlan Roberts cf9a807d67 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-02 12:04:23 +11:00
Lachlan 121d898517
Move websocket-util classes into websocket-core (#5705) 
- Merge websocket-util classes into websocket-core
- rename websocket-util-server to websocket-servlet
- remove websocket-util

* merge websocket-util into websocket-core-common
* move websocket-util-server implementation to websocket-core-server
* rename websocket-util-server to websocket-servlet
* Negotiator should not need the WebSocketComponents, give this to handshaker instead
* fix tests and WebSocketConfigurations
* move exception classes in websocket-core-common
* move MessageSinks and util to internal package
* create internal package for websocket-core-client
* fix JPMS warnings for websocket common modules
* Fixed exports declarations to make MethodHandles.publicLookup() working properly.
* fix broken tests with wrong WebSocketUpgradeFilter package name
* remove -T3 option to not have parallel build
* no need of jacoco here
* do no reuse forks
* remove logback dependency and disable debug log level
* make this test dynamic instead of hardcoded version...
* use -fae
* change websocket-servlet bundle symbolic name
* cleanup changes
* restore bugs....
* Updates after review.

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-02 11:10:15 +11:00
Jan Bartel 31cc298987 Issue #5086 Changes after review 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-01 22:05:33 +01:00
Jan Bartel 90e48ba0b5 Issue #5086 Fix javadoc 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-01 17:44:33 +01:00
Jan Bartel 115a72da65 Issue #5086 Fix checkstyle in test 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-01 17:19:46 +01:00
Jan Bartel 4304c7861c Issue #5086 Improve ScannerTest 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-01 15:55:45 +01:00
Ludovic Orban bd269f72e4 merge jetty-10.0.x into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2020-12-01 15:32:01 +01:00
Ludovic Orban 845c6b457a merge jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2020-12-01 15:26:25 +01:00
Ludovic Orban a26731c5ea merge jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2020-12-01 15:25:25 +01:00
Joakim Erdfelt 4020f9e4ec
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-01 08:21:08 -06:00
Ludovic Orban 6199c975d2
Merge pull request #5743 from eclipse/jetty-9.4.x-5741-PoolMaxUsageOverflow 
max usage count fixes
 2020-12-01 15:19:24 +01:00
Joakim Erdfelt a4e35b87c0
Merge pull request #5730 from eclipse/jetty-10.0.x-fix-runner-manifest 
Correct META-INF/LICENSE handling
 2020-12-01 08:19:02 -06:00
Ludovic Orban 44e6f4aeb8 sweep the entries list when the max usage count is changed 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2020-12-01 15:18:06 +01:00
Jan Bartel 4883332593 Issue #5086 Review and rework o.e.j.util.Scanner 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-01 14:58:18 +01:00
Lachlan Roberts b4fc70430c do not used fixed port in core WebSocketProxyTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-02 00:12:16 +11:00
Simone Bordet bdc33aba3b Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-01 13:25:10 +01:00
Simone Bordet 38aec0b081 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-01 13:24:26 +01:00
Simone Bordet 51d96eced8 Removed hardcoded port. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-01 13:23:13 +01:00