f55fbdb7eb
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-11-06 16:09:02 +11:00
aefbdfca58
Issue #2266 Rework Scanner and use it for Jetty Maven Plugin ( #4239 )
...
* Issue #2266 Rework Scanner and use it for Jetty Maven Plugin
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-06 15:55:20 +11:00
9f0cb2e30b
Issue #1743 Refactor to avoid always calling configureUnassembledWebApp
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-06 15:40:03 +11:00
335f07f71e
Issue #1743 Refactor to make unassembled webapp params clearer.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-06 12:23:00 +11:00
ee7f860a2e
Issue #1743 Field and method names; remove scanTargets
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-06 11:30:47 +11:00
43d95cd984
Updating to version 9.3.29-SNAPSHOT
2019-11-05 13:02:10 -06:00
d7dd68d6e9
Updating to version 9.3.28.v20191105
2019-11-05 11:46:40 -06:00
b17439c731
Updating to version 9.2.30-SNAPSHOT
2019-11-05 11:23:21 -06:00
36c95fdd43
Updating to version 9.2.29.v20191105
2019-11-05 10:43:15 -06:00
d3153f3277
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-10-29 13:51:05 +11:00
7cb238db25
Issue #1743 Extra tests and code cleanups
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-10-24 08:41:57 +11:00
1ed13b6b30
Updating to version 9.4.23-SNAPSHOT
2019-10-22 09:19:41 -05:00
b1e6b55512
Updating to version 9.4.22.v20191022
2019-10-22 08:20:50 -05:00
e9847f6a1a
Issue #1743 javadoc fixes
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-10-16 11:56:52 +11:00
d7a189fa18
Updating to version 10.0.0-SNAPSHOT
2019-10-03 12:05:26 -05:00
fd6a2cb9f6
Updating to version 10.0.0.alpha1
2019-10-03 11:25:06 -05:00
c040614849
Issue #1743 add another unit test
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-10-02 18:05:23 +10:00
262759f899
Issue #1743 More refactoring and code tidying
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-10-02 17:16:18 +10:00
91631fd44b
Issue #1743 Refactor some methods and classes
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-10-02 11:45:12 +10:00
2ef7160418
Issue #1743 Ensure tests stop jetty
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-10-01 11:29:00 +10:00
655fa24bfc
Issue #1743 add tests; checkstyle
2019-09-30 18:33:37 +10:00
c50c70ac02
Issue #1743 Support both unit and integration tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-30 11:52:44 +10:00
7807eafad9
Updating to version 9.4.22-SNAPSHOT
2019-09-26 10:46:28 -05:00
72970db61a
Updating to version 9.4.21.v20190926
2019-09-26 09:59:15 -05:00
747315d3dc
Issue #1743 WIP add unit test; stopOnShutdown
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-25 12:43:51 +10:00
557cd83713
Issue #1743 Rename mojos.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-24 17:07:03 +10:00
e865cc3fd8
Issue #1743 WIP system properties; remove old code
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-24 16:37:48 +10:00
08790a45a4
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-24 14:21:36 +10:00
ba74af34c9
Issue #1743 WIP tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-19 16:30:19 +10:00
a600a58f1c
Issue #1743 WIP tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-19 10:31:46 +10:00
456e467bcb
Issue #1743 WIP tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-19 10:30:20 +10:00
881f17c6be
Issue #1743 WIP tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-19 09:00:03 +10:00
d029ae4dab
Issue #1743 WIP tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-19 08:20:57 +10:00
be066959e3
Issue #1743 WIP tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-19 08:14:40 +10:00
733118687c
Issue #1743 WIP tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-19 07:43:33 +10:00
61af550a56
Issue #1743 WIP tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-19 07:35:39 +10:00
9f296e1666
Issue #1743 WIP tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-18 18:29:14 +10:00
946955c00c
Issue #1743 WIP tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-18 18:03:56 +10:00
cf61839c46
Issue #1743 WIP tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-18 16:34:56 +10:00
6a32fb0ca5
Issue #4003 Cleanup quickstart
...
* cleanup from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-18 16:29:19 +10:00
1b3ee6ee17
Configuration cleanup
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-18 10:50:53 +10:00
de3e104d27
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-18 10:50:21 +10:00
ac48d3d32c
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-18 10:21:47 +10:00
995e0b6c59
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-18 08:12:45 +10:00
67343c5e0f
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-17 17:38:27 +10:00
62118cacb1
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-11 17:47:34 +10:00
2cffd48ab6
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-11 15:35:00 +10:00
6f0f9d5dcd
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-10 18:14:00 +10:00
aec8f0a32d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-10 16:35:04 +10:00
85719e2287
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-10 16:14:06 +10:00
b851af0a5b
Issue #4003 Fix quickstart ( #4008 )
...
* Issue #4003 Fix quickstart.
Modes:
AUTO: use quickstart xml if present, start normally otherwise
GENERATE: re/generate quickstart xml
QUICKSTART: use a pregenerated quickstart xml, fail otherwise
Signed-off-by: Jan Bartel <janb@webtide.com>
* Issue #4003 Cleanup quickstart
Removed TerminateException in favour of Server.setDryRun(boolean)
and AbstractLifeCycle.StopException
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-10 16:04:01 +10:00
8f6e028f05
remove duplicate ignores
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-27 08:41:00 +10:00
a36af67abf
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-22 20:45:57 +10:00
fe3d3f7158
fix checkstyle in test sources ( #4013 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-22 19:56:41 +10:00
60ee8ac8ee
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux
2019-08-19 17:03:51 +10:00
f1efc99918
Updating to version 9.4.21-SNAPSHOT
2019-08-13 17:34:20 -05:00
84700530e6
Updating to version 9.4.20.v20190813
2019-08-13 16:13:21 -05:00
e800924068
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-08-13 18:10:21 +10:00
b0da4468da
fix pom
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-10 13:24:33 +10:00
62758122c3
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-08-10 00:39:54 +02:00
dc939d753a
Issue #3804 - Update Decorator integration for various CDI implementations ( #3838 )
...
* Jetty Issue #3804 WELD-2587
Support CDI integration:
+ cdi2 module exposes jetty APIs
+ cdi module uses DecorationListener
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Jetty Issue #3804 WELD-2587
Remove DecoratingListener tests from test-jetty-webapp
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* improve CDI test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Jetty Issue #3804 WELD-2587
Reverted test to use released CDI and cdi2 module for now.
To test new mechanism, you need to build the weld snapshot locally,
rebuild and switch to cdi module
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* remove cdi2 webapp references
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* document attribute
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* improved documentation
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* logging
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* improved javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Fixed version
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Reverted to also provide the DecoratingListener in the decorate module.
Renamed cdi-demo to weld-cdi-demo
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* revert from Weld SNAPSHOT
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* test all 3 weld integrations
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* updated destory implementation to release creationalcontext
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* reverted to released Weld version
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3804 CDI integration
dispose and release context in destroy
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Improved CDI module documentation
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* WIP on OWB
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Updates from review
Parameterised CDITests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* share webapp resources for cdi webapp test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* Initialize OWB with a SCI so that listeners can be decorated
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Added OwbDecorator so that cdi2 module can be tested with OWB
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Lookup attribute name
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Cleanup from Review
Don't do lazy bindings
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Cleanup from Review
Treat partial CDI same as no CDI
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fix maven it test no more need of weld-servlet
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* cleanup it parent pom removing non needed weld servlet
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* upgraded to Weld 3.1.2.Final
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Cleanup from Review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Cleanup from Review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-08-08 04:04:07 +02:00
075040e88e
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-util/src/test/java/org/eclipse/jetty/util/component/ContainerLifeCycleTest.java
2019-08-07 05:31:02 -05:00
3ee665700d
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyListenerEventDriver.java
2019-08-07 05:28:06 -05:00
9950f6b528
yes this one was a really bad idea...
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-06 09:25:10 +10:00
4d2c981718
Can't mirror 'central' to local repo for it tests, it wont download new dependencies then
2019-08-05 12:17:37 -05:00
ae004171e0
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-30 11:21:31 +10:00
1b6bf389d6
Jetty 9.4.x pax exam upgrade for central repo https, pre download all artifacts for maven its ( #3902 )
...
* ensure we use local repository first to avoid download, upgrade pax versions
pre download artifacts to avoid download by maven invoker its
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* force using local repository first see https://issues.apache.org/jira/browse/MINVOKER-249
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use local setttings to use mirrors
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use https
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* install build resources first to avoid checkstyle build issue
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* downgrade pax-swissbox-framework as the pax exam seems to use this one and want to download it...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fix enforcer rule RequireUpperBoundDeps...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* not used anymore
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* force pax url to use provided settings via Jenkins withMvn
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* renove debugging System.out
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* version is defined in the project
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* cleanup after Jan review comments
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-30 11:13:54 +10:00
464f3d3e66
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-13 17:36:15 +02:00
6df9ef3a15
Updating to version 10.0.0-SNAPSHOT
2019-07-12 06:54:56 +10:00
8cbfd51e80
Updating to version 10.0.0-alpha0
2019-07-12 06:54:56 +10:00
60d20c8808
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-11 16:10:20 +02:00
9ef5bb48f5
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-07-11 16:01:10 +02:00
a34e641a27
Updating to version 10.0.0-SNAPSHOT
2019-07-11 17:20:27 +10:00
2e58f2f515
Updating to version 10.0.0-alpha0
2019-07-11 14:19:45 +10:00
d744d097de
Checkstyle cleanup ( #3847 )
...
* Checkstyle cleanup
* fixed bug from reformat
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 17:24:08 +02: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
343cf732b9
Issue #3789 XmlConfiguration Set Property ( #3790 )
...
Issue #3789 XmlConfiguration Set Property
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-21 21:04:53 +02:00
60d8661890
Merge `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
# jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebInfConfiguration.java
# jetty-http/src/test/java/org/eclipse/jetty/http/QuotedCSVTest.java
# jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
# jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java
# jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java
# jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
# jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java
# jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
# jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
# tests/test-integration/src/test/java/org/eclipse/jetty/test/support/XmlBasedJettyServer.java
2019-06-13 14:14:42 -05:00
40e9e053b9
Merge pull request #3768 from eclipse/jetty-9.4.x-3708-stringutil-replace
...
Issue #3708 - use StringUtil alternatives for known slow JVM impls.
2019-06-13 14:01:35 -05:00
877815e195
Issue #3708 - Adding new methods and converting codebase to use them
...
+ StringUtil.replace(String, char, char)
+ StringUtil.strip(String, String)
+ URIUtil.encodeSpecific(String, String)
+ URIUtil.decodeSpecific(String, String)
+ TypeUtil.toClassReference(Class)
+ TypeUtil.toClassReference(String)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 09:56:41 -05:00
ae21126cad
Updating to version 9.4.20-SNAPSHOT
2019-06-10 13:40:17 -05:00
c73f849711
Fixing post-merge test errors
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 12:43:26 -05:00
68a9498092
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 11:51:55 -05:00
afcf563148
Updating to version 9.4.19.v20190610
2019-06-10 11:17:56 -05:00
826d68e80a
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-10 11:41:47 +02:00
a510ed31cb
Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
...
Fixed references to deprecated methods WebAppContext.prependServerClass(),
WebAppContext.addServerClass() and WebAppContext.addSystemClass().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-07 09:22:31 +02:00
97b7be113c
fix maven it
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-31 21:16:28 +10:00
567c5a4f55
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-05-30 12:49:47 +02:00
4c11f245c9
Fixes #3332 jetty-maven-plugin - transitive deps in single war project ( #3349 )
...
* Issue #3332 jetty-maven-plugin - transitive deps in single war project
Signed-off-by: Miron Balcerzak <mironbalcerzak@gmail.com>
* Issue #3332 jetty-maven-plugin - code review fixes
Signed-off-by: Miron Balcerzak <mironbalcerzak@gmail.com>
* Issue #3332 jetty-maven-plugin - code review fixes
Signed-off-by: Miron Balcerzak <mironbalcerzak@gmail.com>
2019-05-30 20:12:47 +10:00
1b7e3017e3
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-05-23 16:09:07 +02:00
a2ec076b03
Issue #1743 Refactor maven plugin. WIP.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-05-15 14:20:03 +02:00
2ba8542ed1
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-05-09 07:12:27 +10:00
45468988ea
Issue #3583 maven plugin do not use testOutputDirectory directory for test dependencies within reactor ( #3606 )
...
* Issue #3583 maven plugin do not use testOutputDirectory directory for test dependencies within reactor
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use same spaces formatting
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-09 07:00:20 +10:00
734be56938
Updating to version 9.4.19-SNAPSHOT
2019-04-29 16:27:23 -05:00
e1bc35120a
Updating to version 9.4.18.v20190429
2019-04-29 15:40:33 -05:00
05bb111580
Updating to version 9.4.18-SNAPSHOT
2019-04-18 15:59:49 -05:00
aa1c656c31
Updating to version 9.4.17.v20190418
2019-04-18 14:44:28 -05:00
5882d63ba7
Updating to version 9.3.28-SNAPSHOT
2019-04-18 13:54:17 -05:00
d3e249f869
Updating to version 9.3.27.v20190418
2019-04-18 13:10:03 -05:00
2c14d93885
Updating to version 9.2.29-SNAPSHOT
2019-04-18 12:17:07 -05:00
1dffa36fe3
Updating to version 9.2.28.v20190418
2019-04-18 11:23:17 -05:00
79537a5f51
Updating to version 9.4.17-SNAPSHOT
2019-04-11 11:00:24 -05:00
e0aa4ae4c0
Updating to version 9.4.16.v20190411
2019-04-11 10:01:26 -05:00
9b19374c5d
Updating to version 9.2.28-SNAPSHOT
2019-04-03 19:38:05 -05:00
84dfe74b97
Updating to version 9.2.27.v20190403
2019-04-03 19:04:45 -05:00
c70034766e
Updating to version 9.3.27-SNAPSHOT
2019-04-03 18:46:31 -05:00
dae476e369
Updating to version 9.3.26.v20190403
2019-04-03 18:16:32 -05:00
2ccde9772b
Undoing bad release-9.3.26
2019-04-03 18:11:16 -05:00
1f046f44fe
Fixing CRLF issues.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 15:24:29 -05:00
edaefdbb3b
Fixing CRLF files
2019-04-03 11:56:07 -05:00
9f4b3542cb
Updating to version 9.3.27-SNAPSHOT
2019-04-03 17:32:08 +11:00
7ec6d2fb32
Updating to version 9.3.26.v20190403
2019-04-03 13:06:51 +11:00
5658bf96f6
Issue #1676 - Removing Deprecated Resource.getURL()
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-01 10:21:42 -05:00
e476cec6d3
Issue #1676 - Removing deprecated methods and classes
...
+ Changing usages of JVM deprecated classes / methods as well
+ Cleaning up test cases and javadoc
+ Removing test methods that rely on deprecated and now removed concepts
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-28 17:54:28 -05:00
cff63f2b6a
Merge of `jetty-9.4.x` to `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-21 09:45:12 -05:00
0e7a2738d5
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2019-02-18 16:53:53 -05:00
8973f01dc4
ensure we use a random for this integration test
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-18 17:28:51 +10:00
412d493f2c
Issue #3247 Generate jetty-maven-plugin website use eclipse-release profile to trigger site generatation and add jetty-jspc plugin site as well
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-16 09:08:49 +10:00
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05:00
eb70b24016
Updating to version 9.4.15.v20190215
2019-02-15 11:53:00 -05:00
9e634feed2
Issue #3247 Generate jetty-maven-plugin website
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-15 07:06:37 +10:00
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
a1e6d5856a
Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
...
Updated javax.transaction -> jakarta.transaction.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 14:41:05 +01:00
9286cdcf09
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>
2019-02-07 13:08:26 +01:00
33f314e9f5
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>
2019-02-04 18:51:51 +01:00
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
02dd7d1887
Merge pull request #3289 from eclipse/jetty-10.0.x-websocket-artifact-ids
...
Issue #3288 - Correcting Jetty WebSocket API artifactIds
2019-01-24 10:47:12 -06:00
3ffdd9427d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-24 14:41:39 +10:00
34b2678e6d
issue #3254 add jsp test need to remove cdi-api and exclude it fron upperBound rule ( #3268 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-24 14:34:41 +10:00
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
826c27a2b2
- move duplicate configuration to parent pom ( #3265 )
...
- upgrade invoker plugin version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-24 07:29:49 +10:00
69dc0059d1
use jackson-databind 2.9.8 ( #3252 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-10 22:12:12 +13: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
6ff23e296d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-12-22 22:00:07 +10:00
72ebcc51af
interpolate version from main pom for maven plugin it test ( #3223 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 21:55:31 +10:00
ab2a8b0fe3
upgrade logback and log4j-slf4j (new artifact log4j-slf4j18-impl) to support slf4j api 1.8 ( #3209 )
...
* upgrade logback and version of log4j-slf4j support slf4j 1.8 (new artifact log4j-slf4j18-impl)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 10:01:48 +10:00
bd4933b33c
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-12-21 21:48:36 +10:00
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
df92c7d5ec
fix it with declaring correct version of slf4j and excluding logback as we are now slf4j api 1.8.0-beta2
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-19 10:15:14 +10:00
4abc4f8dd4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-12-19 10:54:41 +11:00
9ca77a23aa
issue #3186 add it to override javax.annotation provided by maven core ( #3194 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:38:11 +10:00
f26b9f7c15
issue #3186 add it to override javax.annotation provided by maven core ( #3194 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-15 12:35:16 +10:00
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
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
29fd18e046
Updating to version 9.4.15-SNAPSHOT
2018-11-14 16:42:40 -06:00
c4550056e7
Updating to version 9.4.14.v20181114
2018-11-14 15:19:10 -06:00
a903017f5f
Updating to version 9.4.14-SNAPSHOT
2018-11-11 21:06:50 -06:00
49123a3313
Updating to version 9.4.13.v20181111
2018-11-11 20:02:42 -06:00
254dc88743
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-01 20:24:43 +01:00
161f1698cf
Jetty 9.4.x 3018 request logging bad messages ( #3020 )
...
Issue #3018 improve logging and handling of slow data rates.
* Slow data rates now result in aborted channels, but exception is still thrown. Test for 408 in requestLog
* Updated many RequestLog usages to use Server.setRequestLog rather than a RequestLogHandler
* Fixed javadoc
* removed BadRequestLogHandlerTest (tested in RequestLogTest)
* added JMH to show the future of request logging for #113
* copyright header.
* Updates from review
* Revert to throwing BadMessageException
* BME ensures a 408 is logged rather than a 500
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-01 17:06:04 +01:00
31c08f888b
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-10-24 19:04:54 +10:00
8500e806ec
align used algorithm to detect java bin to use ( #3025 )
...
add javaPath for JettyRunDistro mojo to force a java executable to use
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-24 19:02:31 +10:00
925afac48b
align used algorithm to detect java bin to use
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-24 14:30:13 +10:00
f4f3dc679a
fix it test: add new property to be able to configure used java, fix jetty-http.xml with compliance mode changed
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-24 10:57:09 +10:00
b7b84e341b
no need of this profile wrong merge from 9.4.x
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-18 16:21:29 +10:00
2bb8902286
Issue #2985 Configuration replacement algorithm ( #2987 )
...
* Issue #2985 Configuration replacement algorithm
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-10-18 09:21:06 +11:00
fefc3db0ba
Remove unused field _preconfigProcessor; reformat src for
...
o.e.j.maven.plugin.JettyWebAppContext; fix comment header in
o.e.j.quickstart.ExtraXmlDescriptorProcessor.
2018-10-17 15:55:41 +11:00
6a0b9c8da2
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-10-17 11:47:33 +10:00
211f3d928b
upgrade jackson-databind in maven it to 2.9.7 ( #2993 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-17 11:45:42 +10:00
42cda7bc7f
Issue #2191 JPMS Support
...
Renamed ClasspathPattern to ClassMatcher as it also supports JPMS modules etc.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-10-17 10:08:20 +11:00
ff81168b57
Fix quickstart; add MavenMetaInfConfiguration to services for plugin
2018-10-16 11:26:52 +11:00
a8b17cee8d
Issue #2948 - Require JDK 11 for Jetty 10.x.
...
Removed/updated Maven Compiler Plugin source/target to 11.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-12 09:48:01 +02:00
d2f115ddd3
Fix jetty-context.xml file for jetty-maven-plugin it test.
2018-10-11 18:26:15 +11:00
56ce28b49d
maven-plugin-plugin is working now
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-09 12:17:35 +10:00
c165d07492
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-09-26 12:13:31 +10:00
5593e5b479
Jetty 9.4.x 2903 delay listener instantiation ( #2930 )
...
* Issue #2903 Ensure listeners not instantiated for quickstart gen
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-26 11:27:57 +10:00
3682638961
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-25 20:54:14 +10:00
08d0092cbd
add a sys property with the it so we know which one fail otherwise it is always same name in jenkins ( #2928 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-25 20:52:49 +10:00
defa9e42f2
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-18 10:54:36 -04:00
cfe7fa1cb2
Issue #2906 excluded reactor projects with provided scope ( #2914 )
...
* Issue #2906 excluded reactor projects with provided scope
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* avoid test project within reactors to be in the classpath
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-18 21:17:25 +10:00
5aaae07b94
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-11 21:09:14 +10:00
1b330f2efc
inherit plugin versions from main pom ( #2897 )
...
* inherit plugin versions from main pom
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-11 21:05:37 +10:00
a8e9a8a78b
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-11 14:21:49 +10:00
154e5ea1a5
align plugin version ( #2893 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-10 18:38:34 +10:00
32912b922d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-06 17:39:57 +10:00
1504b7da93
Revert "Issue #2431 - Upgrade to Junit 5 ( #2436 )"
...
This reverts commit e24fc48539
2018-09-06 09:27:11 +10:00
ffb11fd98f
Fix junit version in jetty-maven-plugin
2018-09-06 07:36:47 +10:00
e24fc48539
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 21:27:18 +10:00
a3f1592c50
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 10:07:17 +10:00
863a19bccf
Updating to version 9.3.26-SNAPSHOT
2018-09-04 17:23:31 -05:00
3ce520221d
Updating to version 9.3.25.v20180904
2018-09-04 16:08:21 -05:00
dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT
2018-08-30 10:48:22 -05:00
2720868475
Updating to version 9.4.12.v20180830
2018-08-30 08:56:44 -05:00
5afe2e215f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-23 17:17:46 +10:00
460f3fcb9b
Close on graceful #2749 ( #2772 )
...
Cleanup of Graceful shutdown, plus ensure Connection:close if connector is shutdown for #2749
* WIP close connection when shutting down
* WIP use HttpChannel.Listener
* cleanups
* support graceful stop of a context
* only close connections if the connector is shutdown
* minor cleanups
* fixed toString and test
* fixed imports
* Move close logic to HttpConnection
* fixed generator to not override persistent
* Issue #2749 - Close connections on graceful shutdown.
* Small fix after review.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-23 08:08:17 +10:00
f15bd225b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-21 14:47:19 +10:00
96218e8bc4
Fix typos detected by github.com/client9/misspell
...
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
2018-08-10 23:52:16 +09:00
516d93c488
Updating to version 9.2.27-SNAPSHOT
2018-08-06 11:33:22 -05:00
8c637489ae
Updating to version 9.2.26.v20180806
2018-08-06 10:51:25 -05:00
0892ed8983
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-07-18 16:25:39 +02:00
0b69f00665
Updating to version 9.4.12-SNAPSHOT
2018-07-11 17:32:16 -05:00
260596dd10
Updating to version 9.4.12.RC0
2018-07-11 16:30:55 -05:00
e05c11ae30
Changing default Http headerCacheSize from 512 to 4096
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2018-07-10 10:39:45 +10:00
30f6132117
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-07-03 10:55:22 -05:00
127b302999
increase default timeout to prevent failure on slow machines
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-13 12:13:59 +10:00
0cd4dacbac
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-2/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-server/src/main/config/etc/jetty-http.xml
# jetty-server/src/main/config/etc/jetty-ssl.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java
# jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilterTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/FragmentExtensionTest.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/sockets/pong/PongContextListener.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ConfiguratorTest.java
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-http2-webapp/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2018-06-12 11:11:38 -05:00
eed55854e5
#2600 increase wait time as start can be long for some machines
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-11 18:00:42 +10:00
4f1dd352d6
Issue #2468 - Remove SoLinger. ( #2644 )
...
* Issue #2468 - Remove SoLinger.
For non-blocking sockets, StandardSocketOptions#SO_LINGER javadocs
report that the behavior is undefined. In JDK 11 setting SoLinger
for non-blocking sockets will be ignored.
As such, there is no point in allowing SoLinger to be configured
in Jetty that only uses non-blocking sockets.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-09 13:21:24 +02:00
Jan Bartel
Joakim Erdfelt
Greg Wilkins
olivier lamy
Simone Bordet
olivier lamy
Miron Balcerzak
Joakim Erdfelt
WalkerWatch
Jesse McConnell
Kazuhiro Sera
lachan-roberts