0412bdc3d9
Fixes #6938 - module-info.java file do not use the canonical order for the elements
...
Changed order of entries in module-info.java to be canonical
(cherry picked from commit 02691171d5
2021-10-01 09:25:55 +02:00
e81c847998
Happy New Year 2021 (Jetty 10 edition)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 16:04:50 -06:00
04cecaaaef
Issue #4340 - Change usages to more closely follow previous behaviours
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-20 17:02:49 +11:00
30d36ed68c
Merge branch jetty-10.0.x into jetty-10.0.x-4340-ServiceLoader
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-17 15:00:30 +11:00
57604d0955
Issue #4572 - Mechanical Change to use org.slf4j
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 15:48:25 -05:00
8b7e64915f
Issue #4572 - Replace Jetty Logging with SLF4J
...
* Introducing jetty-slf4j-impl
* Make Jetty use org.slf4j
* Removed most of org.eclipse.jetty.util.log classes
* Left org.eclipse.jetty.util.log.Log and
org.eclipse.jetty.util.log.Logger but as
simple bridge classes that are deprecated
* Migrated code using org.eclipse.jetty.util.log.StacklessLogging
to org.eclipse.jetty.logging.StacklessLogging found in
the jetty-slf4j-impl
* Moved logging start modules from jetty-util to jetty-home
* Simplified logging start modules
* Updated code that was using StdErrLog directly
* Updating module-info.java for org.slf4j
* removing org.eclipse.jetty.util.log.class references
* jetty-start supports manually declared default provider
+ and we use it to default "logging" to the "logging-jetty" provider
* Cleaning up jetty-maven-plugin and IT testing for Logging
* Using old slf4j for it testing
* Updating compiler config to show Xlint:exports warnings
* Updating console-capture and logging-noop
* Adding slf4j bridge (capture) jetty modules
* Updates to jetty logging module locations
* Changing reference to slf4j dependent mod
* Process requested enabled modules in topological order
* Limiting inclusions in shaded jetty-start
+ Also adding note to jetty-util classes that are used by
jetty-start
* Default logging level on baseline logging config is INFO (not DEBUG)
* Changing from system to server classes in logging
* Updating other modules to use new logging names
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 11:21:54 -05:00
7af220dade
Issue #4340 - shortcut method for the serviceStream
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-16 09:42:32 +11:00
edd671146d
Issue #4340 - ServiceLoader stream which doesn't break if hasNext throws
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-13 16:59:33 +11:00
97c55e27cc
Issue #4340 - remove TypeUtil.load and use flatMap() on streams instead
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-29 11:06:32 +11:00
6832912d49
Issue #4340 - Implement TypeUtil.load(ServiceLoader) with Streams
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-28 12:15:27 +11:00
a277c30b81
Issue #4340 - Move ServiceLoaderUtil.load method to TypeUtil.loadAll
...
- increase MAX_ERRORS to 1000
- introduce a loadFirst method
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-26 10:26:29 +11:00
a7f4d2606b
Issue #4340 - always pass in ServiceLoader to ServiceLoaderUtil
...
this prevents errors where jetty-util must declare it uses the provider
class in module.info
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-25 19:49:23 +11:00
81424f1f44
Issue #4340 - Continuing after ServiceLoader ServiceConfigurationError
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-25 19:49:22 +11:00
5f82e17d2f
Issue #3578 - Adopt EPL-2.0 for Jetty-10.
...
WIP: updated copyright headers for Java files.
TODO: doc files and META-INF files inside jars.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-09 20:10:19 +01:00
a5c99207fc
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-01-07 17:02:40 +01:00
923ec38adf
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2020-01-07 16:51:25 +01:00
e3c8546667
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2020-01-07 16:35:05 +01:00
de890bb1b7
Happy New Year 2020.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
ff48fba585
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:59:21 +01:00
e1371a1c13
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
e3bb5a7515
Issue #4225 - Fix JPMS transitivity.
...
Reworked all module-info.java files to take into
account JPMS transitivity.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-19 18:17:35 +01:00
b7a7a53a18
Jetty 10.0.x reformat ( #3812 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"
# Conflicts:
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml
* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:42:39 +02:00
9706d70484
Jetty 9.4.x reformat ( #3811 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
internal default values.
We want to keep those values as a hedge against future default
value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:40:30 +02:00
b9f89af847
Fixes #3320 - Review Jetty 10 module-info.java.
...
Reviewed module-info.java files.
For those that have a "requires static" added a comment about
why the dependency is optional.
Rearranged directives in alphabetical order.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-08 17:30:27 +01:00
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
5f972b451c
Jetty 10.0.x 2978 add module info ( #3120 )
...
Fixes #2978 - Add module-info to relevant Jetty modules.
Added module-info.java for Jetty modules that are not test modules.
Moved jetty-http test utility classes to new module "jetty-http-tools".
Removed generation of test-jar from websocket-core.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:37:35 +01:00
253c637742
Fixes #2663 - Guard Throwable.addSuppressed() calls. ( #2665 )
...
* Fixes #2663 - Guard Throwable.addSuppressed() calls.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-14 15:21:44 +02:00
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
6ac4e770a6
Issue #1983 Warn on connection failures
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-11-22 11:08:20 +01:00
687561e1c9
Issue#215 fixed tests dependencies
2017-09-21 09:02:24 +10:00
31a9b6f2e8
Issue #215 Conscrypt module for SSL and ALPN
...
Squash of the following commits:
commit 53e503b48d290e2ff83b214fd81572bf4cacd9ab
Merge: cc4ed73 d77ba82#215 Conscrypt module debug
commit f640693f7ef61f8012d1454b2ed364740b330a6e
Author: Simone Bordet <simone.bordet@gmail.com>
Date: Wed Sep 20 18:23:51 2017 +0200
Issue #215 - Consider native ALPN/SSL provider.
Fixed server-side ALPN negotiation for Conscrypt.
commit 669e992624a0f8f23103c70ba895b877dcec2404
Author: Simone Bordet <simone.bordet@gmail.com>
Date: Wed Sep 20 16:56:20 2017 +0200
Issue #215 - Consider native ALPN/SSL provider.
Fixed client-side ALPN negotiation for Conscrypt.
commit aa873263d73c19461890bd1f9a417c796412b3d2
Author: Simone Bordet <simone.bordet@gmail.com>
Date: Wed Sep 20 15:26:45 2017 +0200
Issue #215 - Consider native ALPN/SSL provider.
Code cleanups.
Changed ALPNProcessor.init(boolean) to init().
Removed unnecessary try/catches and simplified exception handling.
commit db9b169c35da956bcc42013f9bb8acddd7238d14
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Sep 20 18:07:30 2017 +1000
Issue #215 Conscrypt SSL pom cleanups
commit 096572e029352428275e86a964fa92dbeee19a65
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Sep 20 15:57:20 2017 +1000
Issue #215 Conscrypt SSL ALPN cleanups
commit b3c1bcb1fa9a7e15517a348270738e24c7b0a820
Merge: c836708 effec06d9ecd5eFix #1823 MimeTypes for ResourceHandler mp4
commit ff1e08434415cd6d909715547c2a54dbd0fc5dee
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Sep 19 14:21:39 2017 +1000
Issue #215
commit 3bb63147ebf4967698f51a65f009d80010038b20
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Sep 19 14:08:05 2017 +1000
Issue #215
Use conscrypt 1.0.0.RC10 uber jar
commit 8b18099fde67f12d0e98d0b414568c9b76835459
Merge: 06f6530 eee4117#215 Conscrypt ALPN provider
First attempt at client support
commit 32d77461935263da86fb363233af0aa5a159d1fc
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 14 09:48:43 2017 +1000
Issue #215 Conscrypt ALPN provider
commit bc051dca5e3ea7fed6ddb3a25ba5cecbd1c5b18b
Merge: 573c9f0 6c471263399fd3187f37da0cb424#215 Conscrypt ALPN provider
commit a37aec327274042e1007f4146a3c3ec06fb424d9
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 7 21:19:28 2017 +1000
Issue #215 Conscrypt ALPN provider
commit 6d7f39b2b0e53570afa61be5abfef2a352f80cf3
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 7 18:22:19 2017 +1000
Issue #215 Conscrypt ALPN provider
commit a7d0f46b57091550724242693559d786180896ff
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 7 18:16:35 2017 +1000
Issue #215 Conscrypt ALPN provider
2017-09-21 07:34:25 +10:00
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd4565c186d7
2017-01-19 18:26:43 +01:00
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
beb8f3270a
Issue #486 - JDK 9 ALPN implementation.
...
Implemented the case where the client does not send ALPN.
2017-01-13 18:44:18 +01:00
11d669092a
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
bfda3fb5e3
Improved logging.
2015-03-02 13:17:26 +01:00
961a90d16c
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-29 14:11:21 +01:00
f02da0cc33
458354 - ALPNServerConnection.select negotiation.
...
Prefer the server protocols rather than the client protocols.
2015-01-29 11:21:08 +01:00
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Simone Bordet
Joakim Erdfelt
Lachlan Roberts
olivier lamy
Greg Wilkins
Olivier Lamy
Jesse McConnell
Greg Wilkins