b904abe53a
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-01 09:39:51 +02:00
1a6ceb2fa8
Issue #3805 Trim space on around XmlConfiguration fields ( #3820 )
...
Issue #3805 Trim space on around XmlConfiguration fields (#3820 )
2019-07-01 09:32:00 +02:00
cbc4768cae
Issue #3159 - do not copy RSV bits to auto-fragmented frames ( #3816 )
...
* Issue #3159 - do not copy RSV bits to auto-fragmented frames
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3159 - warn if DeflateFrameExtension detects autoFragment on
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3159 - automatically set auto-fragment false in DeflateFrameExt
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3159 - automatically set auto-fragment false in DeflateFrameExt
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3159 - add todo
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-01 17:06:32 +10:00
ac8910e044
Issue #3809 - ensure abnormal close frame will hard close ws connection ( #3819 )
...
* Issue #3809 - ensure abnormal close frame will hard close ws connection
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3159 - signal onError on abnormal status code close
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-07-01 16:50:56 +10:00
fa4abfa6bb
Merge pull request #3365 from lachlan-roberts/jetty-10.0.x-3170-websocket-proxy
...
Issue #3170 - WebSocket Proxy
2019-07-01 11:53:48 +10:00
c94230da40
Issue #3832 Test for proxy protocol v2
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-29 10:04:01 +02:00
1dc1aa59be
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-06-28 18:38:21 +10:00
01a02cc15b
catch exception in slack notification to avoid any build failure due to this ( #3794 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 18:04:43 +10:00
afaf678c6f
javadoc:aggregate-jar do not work with java 11 and modules
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 17:20:16 +10:00
3a5e6511dd
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-06-28 17:19:34 +10:00
e19cc68a38
test no issue building the aggregated javadoc jar
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 17:18:52 +10:00
d545fca96e
test with last javadoc plugin snapshot
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 10:03:33 +10:00
38a3a51a54
Jetty 10.0.x javadoc fix (testing javadoc plugin SNAPSHOT) ( #3831 )
...
* fix javadoc generation with jdk11
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* currently disable javadoc:aggregate-jar as do not work yet
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 10:00:57 +10:00
644aeca364
checkstyle report enabled
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:05:50 +10:00
69b6160445
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-06-27 07:04:06 +10:00
8a6d25fe25
suppression of generated files must work for ide as well
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
943d123798
checkstyle will only check our source files and not generated jmh etc..
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
a1d292da58
only checkstyle:check no need of building site
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
b54dbcff63
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
2443423eff
simplify checkstyle check with not using site generation but only check as jenkins only need checkstyle result
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
484c7538d6
fix version of build-resources module
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
0047740af6
Limiting target suppressions
2019-06-26 09:13:34 -05:00
8cf00f7226
disable autobahn for every build
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-26 20:29:58 +10:00
cc4304a0f6
WebSocket core autobahn and MessageHandler refactor ( #3802 )
...
* reworked WebSocket autobahn test code and the core MessageHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* PR #3802 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-26 13:47:46 +10:00
390033edfc
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-06-26 13:00:45 +10:00
eb64d2e9fd
add missing checks attribute
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-26 11:03:19 +10:00
94a0154be7
Adding supression on /target/ files
2019-06-25 19:07:26 -05:00
9f49fa5da7
Adding supression on /target/ files
2019-06-25 19:02:44 -05:00
c97403fb0d
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
2019-06-25 16:01:02 -05:00
7071c53bdd
Merge pull request #3814 from eclipse/jetty-9.4.x-checkstyle-suppress-tests
...
Adding CheckStyle suppression's for src/test/java
2019-06-25 16:00:36 -05:00
8121f9773c
Adding jetty-jmh to suppressions
2019-06-25 13:32:26 -05:00
9c6c1990b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-25 11:16:53 +02:00
a42ad99871
Misc minor checkstyle fixes
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-25 11:13:34 +02:00
0781e0af3d
Fix Eclipse java style for jetty ( #3813 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-06-25 11:06:52 +02:00
fd952d42ff
Removing redundant check
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 14:30:33 -05:00
81894fb4ed
Using property based lookup for Checkstyle suppressions filter.
...
+ This is to be maximally compatible across all plugins and scenarios
where the Checkstyle suppressions filter can be used.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:58:23 -05:00
16cf6a34e1
Adapting suppressions filter for various plugin's expectations.
...
Each plugin finds the suppressions in different ways.
+ Eclipse CS finds it via property ${config_loc}
+ Newest IntelliJ CS finds it via same property
+ Maven plugin finds it via classloader.getResource()
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:27:14 -05:00
0cb56a8e21
Adding CheckStyle suppression's for src/test/java
...
+ No MethodNameCheck
+ No TypeNameCheck
+ No LocalVariableNameCheck
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:04:30 -05:00
7b941098d0
Fixing version of build-resources
2019-06-24 11:12:47 -05:00
1ae14b6ad4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-06-24 17:44:26 +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
804419bf89
Minor cleanups
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-23 17:26:06 +02:00
e2193a303b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-23 10:50:47 +02:00
3030ccb2df
Merge branch 'jetty-9.4.x-checkstyle' into jetty-9.4.x
2019-06-22 09:00:15 -05:00
85f198419d
Issue #3804 - Disabling CDI tests until Weld can be fixed
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 18:28:54 -05:00
c7b6110267
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 16:05:17 -05:00
b9fc1f7362
Merge pull request #3777 from eclipse/jetty-9.4.x-3700-felix-webapp-testing
...
Issue #3700 - Adding felix webapp to test-distribution to help catch URLStreamHandler classloader issues earlier
2019-06-21 14:45:21 -05:00
6ca87a0de1
Merge branch `jetty-9.4.x` into `jetty-9.4.x-3700-felix-webapp-testing`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# tests/test-webapps/pom.xml
2019-06-21 14:44:56 -05:00
bb486c55cc
Merge pull request #3737 from eclipse/jetty-9.4.x-3731-cdi-testing
...
Issue #3731 - Testing various ways to use CDI
2019-06-21 14:37:30 -05:00
Greg Wilkins
Lachlan
olivier lamy
Joakim Erdfelt
Jan Bartel