e60a109897
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-11-18 07:18:22 +10:00
905deeb49a
Jetty 9.4.x rerun failing tests count set to 3 and upgrade surefire which supports it for junit5 ( #4320 )
...
* rerunFailingTestsCount and test surefire 3.0.0-M4 fixing it for junit5
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-18 07:10:44 +10: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
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
9a7e6d96de
Merged remote-tracking branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-20 16:10:39 +02:00
66dd5ad788
use last jacoco plugin 0.8.5
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-10-20 21:44:15 +10:00
94aff6b848
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2019-10-16 22:14:22 +02:00
abc92e5c5d
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2019-10-16 21:53:17 +02:00
c9bf1744a5
Updated ALPN version for JDK 8u231 and 8u232.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-16 21:11:46 +02: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
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
8e20f23b52
Removing aggregate javadoc, as it's incompatible with release on JDK 9+
2019-09-19 15:08:22 -05:00
ed30f86313
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-09-13 16:42:34 -05:00
e013c24326
Merge pull request #4038 from eclipse/jetty-9.4.x-OpenId
...
OpenID Connect Authentication
2019-09-13 16:42:17 -05:00
460e42c701
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-09-13 11:18:11 +10:00
2d6e9b0efc
use maven invoker plugin 3.2.1 released version
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-09-13 11:17:34 +10:00
2ebec27da4
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-09-06 13:29:21 +10:00
39a3cd6b3c
force mergeUserSettings to true ( #4051 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-09-06 13:28:32 +10:00
c288430f08
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-09-05 19:11:12 +02:00
638327d7e3
Updated JaCoCo to 0.8.4 to support (at least) Java 12.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-05 19:10:20 +02:00
d33b96f411
add OpenId module to support OpenId Connect authentication
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-08-29 08:03:11 +10:00
ceff82ac57
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-08-22 15:09:44 -05:00
7f5aa89042
Update Tycho and Eclipse CBI plugins.
...
* Tycho to 1.4.0
* CBI to 1.1.7
These updates are important for both speed and m2e compatibility so
warnings are not shown in the eclipse ide.
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2019-08-22 16:06:06 +03:00
3544283865
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/ReadState.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ReadStateTest.java
# tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java
2019-08-14 09:39:06 -05: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
cbe34d9bc2
Revert "Jetty 9.4.x release faster (no need of triggering plugins already triggered) ( #3944 )"
...
+ Breaks the release build.
javadoc and source artifacts lack gpg signatures
This reverts commit 50aa1cf786
2019-08-13 16:05:35 -05:00
072de1ba3c
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-13 10:22:25 +10:00
02c247be5f
include test sources in checkstyle report ( #3948 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-13 10:20:55 +10:00
20bbeeebdf
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-08-12 17:47:02 +02:00
76612ea7ca
Updated dependency to h2spec to 0.6.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-08-12 17:38:34 +02:00
62758122c3
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-08-10 00:39:54 +02:00
50aa1cf786
Jetty 9.4.x release faster (no need of triggering plugins already triggered) ( #3944 )
...
* source:jar javadoc:jar are already triggered by eclipse-release profile so no need to call directly as it add more jars to deploy :)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* no need of sources jar in release profile as it is already part of normal build, and use jar-no-fork in normal to avoid forking another lifecycle
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* no need of triggering gpg plugin again as it is part of the release-jetty.sh script
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-09 11:24:31 +10: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
0a1722d652
order test and cleanup map ( #3932 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-06 11:10:41 +10:00
e398ecebe1
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-05 17:25:03 +10:00
ab015f2653
timestamped snapshot are cleaned up on apache repo so definitely not to use
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-05 17:24:12 +10:00
5be9f1a927
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-02 13:46:45 +10:00
755317573e
Skip large file test if not enough disk space available. ( #3928 )
...
* Skip large file test if not enough disk space available.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Being consistent with cleanup.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Limping along with known semi-working invoker plugin
* back to normal maven-invoker-plugin configuration for local build, on CI use provided settings by Jenkins to keep using mirror
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-02 13:27:11 +10:00
302341f9c9
Limping along with known semi-working invoker plugin
2019-08-01 13:13:04 -05:00
f67504c4da
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-01 17:47:37 +10:00
b7fdf9f9f3
upgrade to junit 5.5.1 ( #3925 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-01 17:46:06 +10: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
ba05117a0d
use build-resources released version
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-22 21:23:04 +10:00
40fc4ef340
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2019-07-20 19:56:14 +02:00
6a0a2883ad
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2019-07-20 19:51:12 +02:00
baa325d56c
Updated ALPN version for JDK 8u221 and 8u222.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-07-20 19:43:20 +02:00
d0963178d4
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-18 17:06:38 +10:00
4ebf4b7477
Jetty 9.4.x invoker maven plugin use junit result files ( #3887 )
...
* invoker plugin can now generate junit report file so use that to ease reading of results
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-18 16:46:59 +10:00
71268ae687
make jetty-all build tested by ci build to avoid issue at release time ( #3867 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-12 09:51:42 +10: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
9923fdfefc
Jetty 10.0.x fix dependency in jetty-all ( #3864 )
...
* fix wrong dependency
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-11 20:16:57 +10: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
3082d5a4cf
disable all version name rule enforcer..
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-11 14:13:53 +10:00
9d92221a34
not using osgi rules for jetty 10 alpha/beta versions
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-11 13:59:34 +10:00
30513f9afc
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-10 20:20:33 +10:00
3c14ceab27
avoid transitive depdency on a range version which can failed the build... ( #3862 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-10 20:19:06 +10:00
4df544afc6
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-09 12:57:26 +10:00
0362595a40
javadoc plugin version 3.1.1
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-07 19:44:03 +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
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
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
c97403fb0d
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
2019-06-25 16:01:02 -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
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
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
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
2a2a11cd2e
Improvements after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-13 10:23:55 +02:00
790051556f
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-13 10:03:54 +02:00
370a85b921
Jetty 9.4.x aggregate javadoc fix ( #3780 )
...
* fix javadoc plugin configuration fixing searchbox when navigating to class found, as jetty 10 has module defined we probably do not need to merge this to 10 except other parameters
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-13 11:28:22 +10:00
ae21126cad
Updating to version 9.4.20-SNAPSHOT
2019-06-10 13:40:17 -05:00
afcf563148
Updating to version 9.4.19.v20190610
2019-06-10 11:17:56 -05:00
bf53925cfb
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-06 17:58:49 +02:00
8f4cdf1c83
upgrade log4j2 version and fix log4j2.xml provided sample ( #3721 )
...
* upgrade log4j2 version and fix log4j2.xml provided sample, add disruptor if users wants to use async logging
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-06 20:44:41 +10:00
4340a382e5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-05-28 13:40:06 +02:00
73b417a116
Issue #3690 Upgrade to asm 7.1 ( #3691 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-05-28 13:39:14 +02:00
b0bc9c9200
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-05-17 16:47:45 +02:00
699026b08d
upgrade maven plugins and configure clean plugin version
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-14 11:09:32 +10:00
c578798370
Fixes #3197 - Use jetty specific websocket API jar.
...
Introduced jetty-javax-websocket-api artifact with proper
OSGi manifest entries and JPMS Automatic-Module-Name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-10 19:33:12 +02:00
8246011020
Initial /build-resources/ with jetty-checkstyle.xml
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-08 10:57:15 -05:00
52bb963186
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# aggregates/jetty-all-compact3/pom.xml
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
# jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
# jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
# jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
# pom.xml
# tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
# tests/test-http-client-transport/pom.xml
# tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
# tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
2019-05-01 15:02:31 -05:00
e33dfabba9
Moving to IPv6 Assumption (from junit Group/Tag)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:26:14 -05:00
2b93a4e7ea
Updating jetty-test-helper + junit5 + hamcrest
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:23:55 -05: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
f28bfa9377
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-04-29 13:21:59 +02:00
29b960551f
Merge branch `release-9.4.17` into `jetty-9.4.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-bom/pom.xml
2019-04-25 09:15:42 -05:00
12ff78e06a
Issue #3564 Update to apache jsp 9.0.19
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-04-25 08:38:26 +02:00
1b7221a997
Issue #3563 Update to apache jsp 8.5.40
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-04-25 08:38:01 +02: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
926a8428a8
Updating maven-javadoc-plugin config for JDK-8212233 bug
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-18 14:09:34 -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
3232d73282
Updating maven-javadoc-plugin config for JDK-8212233 bug
2019-04-18 13:08:41 -05:00
d83e1164fc
Bumping up javadoc-plugin due to NPE during release
2019-04-18 12:44:44 -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
038c7ee6d7
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2019-04-18 18:07:00 +02:00
1f31f52a5a
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2019-04-18 18:01:59 +02:00
03243ebfbd
Updated ALPN version for JDK 8u211 and 8u212.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-18 17:55:06 +02:00
c75136fe63
Merge branch 'release-9.4.16' into jetty-9.4.x
2019-04-18 10:13:20 -05:00
72b4f92280
Updating to tests to protect if IPv6 is unavailable.
...
+ Updating to jetty-test-helper 4.2.1 with new Net.class
+ Assume.assumeTrue(Net.isIpv6InterfaceAvailable());
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 18:10:55 -05:00
879e161c22
Updating to tests to protect if IPv6 is unavailable.
...
+ Updating to jetty-test-helper 3.1.1 with new Net.class
+ Assume.assumeTrue(Net.isIpv6InterfaceAvailable());
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 16:34:12 -05:00
c7a2d8b7c6
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-15 18:22:09 +02:00
64549fb19c
Updated Conscrypt to 2.1.0.
...
Tagged tests that connect to external servers as "external".
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-15 18:10:21 +02: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
19f81c0ada
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-04-10 16:15:53 -05:00
5b3edbbc26
oops my bad we need if invoker plugin snapshot
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-10 17:50:01 +10:00
7d4577d1ed
comment access to repository.apache.org and remove duplicate jetty snapshots repository declaration
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-10 12:53:36 +10:00
40c2e76786
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-06 13:45:54 +02:00
aa7e9ee060
Merge pull request #3474 from eclipse/jetty-9.4.x-3180-review_unixsocket
...
Issue #3180 - Review client support for Unix sockets.
2019-04-06 11:55:29 +02:00
8829602201
Exclude ipv6 tests for ci profile (Jenkins) ( #3528 )
...
* exclude ipv6 test as currently failing on kubernetes, using junit tag and ci profile activated via Jenkinsfile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* upgrade surefire to 3.0.0-M3
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-06 13:27:42 +10: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
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
bfc5b1fac5
Issue #3180 - Review client support for Unix sockets.
...
Reviewed the implementation.
Got rid of the single channel stored in the HttpClientTransport.
Re-enabled tests on the Unix socket transport.
Updated JNR to 0.22.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-19 17:37:12 +01:00
95a6b76851
Merge branch `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/OneWebApp.java
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-03-15 16:00:59 -05:00
adbfcbcf60
- Issue #3425 upgrade conscrypt to 2.0.0 and get rid of reflection usage
...
- align conscrypt version in conscrypt.mod file
- add more simple unit test to test conscrypt alpn usage
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 11:35:10 +01:00
8e21c968d5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-03-12 12:14:46 +11:00
4f1b28eb3c
Issue #3415 re enable infinispan test with using correct version of infinispan ( #3443 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-12 11:20:05 +11:00
c3719b2bab
Add jdk12 build in Jenkinsfile ( #3376 )
...
* add jdk12 build stage
* test last release of infinispan for jdk12 build
* fix upperBound dependency for jboss logging
* upgrade juniper to 5.4.0 and disable infinispan test if JRE.JAVA_12
* Fixed annotations to exclude any JDK > 11 for 3 tests.
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-27 12:37:21 +10: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
aec2ebd27d
issue #2878 add an aggregated javadoc jar excluding some tests packages
...
+ force attach and use default phase bind (package)
+ fixing some dependencies to build aggregate javadoc jar
+ configure release plugin to build aggregated javadoc jar
+ test javadoc build with jdk11 including aggregated javadoc
+ Fixing bad javadoc
+ Excluding tests from aggregate-javadoc
+ Cannot aggregate-javadoc on CI (requires clean build of snapshot to work)
+ standardizing javadoc config
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-18 17:44:51 -05: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
7b686fa4b6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-02-14 10:25:59 -05:00
a6c626a891
Fixing Javadoc
2019-02-13 17:17:11 -05:00
1b904c0b77
Fixed #3351 - Restructure jetty-unixsocket module.
...
Split the original module into modules -common, -client, -server.
Added module-info.java for the new modules, referencing the JNR
JPMS module names.
Updated depedencies from old module to new modules.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 09:16:56 +01: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
5ce3d1bd61
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 11:23:56 +01:00
2d88b3b959
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Refactored streamers into class Run.
Added javadocs.
Moved "maven.resolver.version" to main POM for consistency.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 09:04:45 +01:00
9c59db6fdd
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Updated maven.version to 3.6.0.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 21:41:29 +01:00
875af5c692
Restored Automatic-Module-Name that was removed in 471dab752.
...
Cleaned up pom.xml files that required a correct JPMS module name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 10:16:07 +01:00
107170adf8
Issue #3162 - Use Jetty specific Servlet API jar.
...
Updated to jetty-servlet-api:4.0.2, based on jakarta.servlet 4.0.2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 22:55:21 +01:00
0d89f29e1b
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>
2019-02-04 18:51:26 +01:00
b9281e323d
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-04 18:49:12 +01:00
d8d1ecf6a1
use snapshot of maven-invoker-plugin because of NPE https://issues.apache.org/jira/browse/MINVOKER-247
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-04 18:49:12 +01:00
6fee10d537
use snapshot of maven-invoker-plugin because of NPE https://issues.apache.org/jira/browse/MINVOKER-247
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-31 09:40:08 +10: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
ce976b5aa3
Issue #3249 Update to apache jsp 9.0.14 ( #3299 )
...
* Issue #3249 Update to apache jsp 9.0.14
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-01-30 14:31:58 +11:00
15d998b269
fix javadoc with jdk 11.0.2
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-24 21:20:01 +10: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
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
2a8b4c4c47
Updated ALPN to JDK 8u201 and 8u202.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:25:39 +01:00
0e17b56aaf
Updated ALPN to JDK 8u201 and 8u202.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:12:25 +01:00
cdd553332c
Updated ALPN version for JDK 8u201 and 8u202.
2019-01-16 17:03:51 +01:00
14aa789738
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-16 21:48:57 +10:00
027a91d224
maven assembly plugin 3.1.1
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-15 21:20:46 +10:00
a90fda5488
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-01 12:18:15 +10:00
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
b0f13d80c3
fix bundle Copyright
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:14:48 +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
4abc4f8dd4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-12-19 10:54:41 +11:00
bbd45fa66d
Update to Maven JAR Plugin 3.1.1 to pick up the fix of MJAR-241
...
surefire plugin 3.0.0-M2
remove use of Automatic-Module-Name jar plugin property so we avoid failure on jpms module name validation by jar plugin 3.1.1
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:40:11 +10:00
471dab752b
Update to Maven JAR Plugin 3.1.1 to pick up the fix of MJAR-241
...
surefire plugin 3.0.0-M2
remove use of Automatic-Module-Name jar plugin property so we avoid failure on jpms module name validation by jar plugin 3.1.1
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-17 10:05:53 +10:00
3acb98f477
Issue #3161 Update to Apache JSP 8.5.35 ( #3163 )
...
* Issue #3161 Update to Apache JSP 8.5.35
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-13 14:57:14 +11:00
0dcdcc7baf
Jetty 10.0.x fix surefire arg line (to avoid locale dependent build) ( #3183 )
...
* surefire.argLine replaced by jetty.surefire.argLine
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-06 09:09:06 +10:00
c0655ce634
Revert "fix argLine inheritance ( #3177 )"
...
This reverts commit 3e6ab2d1ac
2018-12-03 13:25:00 +10:00
3e6ab2d1ac
fix argLine inheritance ( #3177 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-03 11:20:20 +10:00
c3348a0a03
Issue #3162 - Correcting websocket issues in OSGi
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-30 15:03:44 -06: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
4080cc6c3b
Fix websocket module name changes, etc file changes, and jetty-schemas
...
to make jetty-osgi work.
2018-11-23 16:16:22 +01:00
f0fbd63a55
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-11-22 12:56:25 +01:00
14c2431b1d
Updated Conscrypt to 1.4.1.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:46:11 +01: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
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
32af885580
Issue #3104 Update to org.mortbay.apache-jsp 8.5.33.1
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-14 12:18:40 +01:00
aaa9a1e410
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-11-13 18:12:16 +01:00
77095c626d
Adding profile to ensure release uses JDK11 (or newer)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-13 07:37:30 -06:00
4f4e720a63
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-12 16:37:48 +01: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
2707d69033
shade plugin released version 3.2.1
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-12 11:01:24 +10:00
b57c05999e
Bumping up jetty-schemas to 3.1.2
2018-11-11 10:36:49 -06:00
027cc240ca
Bumping up jetty-schemas and jetty-test-helper version
2018-11-09 12:47:37 -06:00
d81c0cad24
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-07 14:06:21 +01:00
872eafef06
Issue #2858 upgrade jnr-unixsocket to 0.19 ( #2859 )
...
* upgrade jnr-unixsocket to 0.19 #2858
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* remove hack as issue has been fixed on jnr project
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* upgrade jnr-unixsocket to 0.20
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-07 08:28:44 +01:00
b5d058d128
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-11-02 19:27:14 +10:00
af7dba1249
make compiler.target/source as a property so we can override those with the command line
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-02 19:20:35 +10: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
d33f65d322
Merge pull request #2957 from eclipse/jetty-9.4.x-2941-asm_jdk11
...
Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
2018-11-01 17:49:22 +01:00
97c37f998b
Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
...
Updated ASM version in the main POM to 7.0.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-01 17:48:39 +01:00
42c49cd503
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-11-01 13:17:20 +10:00
392260a232
maven-plugin-plugin 3.6.0
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-01 12:38:48 +10:00
f39d1a31cb
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-10-31 09:27:16 +10:00
bc1e58b0f5
*issue #2923 add LICENSE and NOTICE files ( #2940 )
...
*remove html license version
* use org.eclipse.jetty.toolchain:jetty-artifact-remote-resources:1.2 released version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-31 09:24:20 +10:00
7dbe056521
Signed-off-by: olivier lamy <oliver.lamy@gmail.com> ( #3035 )
2018-10-29 17:14:59 +10:00
b4a0d7ebcb
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-10-26 12:40:36 +10:00
b19d9b27ab
use maven pmd plugin 3.11.0
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-26 12:38:11 +10:00
1d00091bd1
Removed scope=provided from javax.activation and javax.transaction
...
dependencies, since they are not bundled with Java 11 anymore.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-23 19:25:41 +02:00
cb9301ab1d
Dropping jetty-rhttp
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-22 06:59:45 -05:00
5f5fa98a30
Eclipse CBI notes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-22 06:59:09 -05:00
993d261e36
jetty-all-compact3 no longer exists
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-22 06:56:42 -05:00
a0fa62108b
Correcting my timezone
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-22 06:56:07 -05:00
fe1b515d25
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-10-21 10:18:36 +11:00
edc47818e2
Merge pull request #2899 from quaff/jetty-9.4.x
...
Fix outdated bundle vendor
2018-10-19 10:45:42 -05:00
5e2c0600d3
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2941-asm_jdk11'.
2018-10-18 15:50:07 +02:00
be9ca8aa5d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-10-18 16:59:05 +10:00
3490add2a9
remove not anymore used javadoc tages
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-18 16:58:25 +10:00
d048dd321e
Merge branch 'jetty-9.4.x' into jetty-9.4.x
2018-10-18 17:07:24 +11:00
932f1a7516
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-10-17 15:49:54 +02:00
44ac57040a
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-10-17 12:36:56 +02:00
add74bf889
Updated ALPN version for JDK 8u191 and 8u192.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-17 11:56:39 +02:00
fc230ba7c6
Issue #114 Remove Overlay Deployer
...
Removed the unmaintained Overlay Deployer
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-10-17 10:11:37 +11:00
9fd95a329c
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-10-14 10:51:43 +10:00
64e561dcb1
upgrade surefire plugin 2.22.1 ( #2980 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-14 10:50:02 +10:00
813b526cb2
Issue #2948 - Require JDK 11 for Jetty 10.x.
...
Removed references to ALPN API.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-12 09:45:23 +02:00
41663d8e5c
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-10-11 00:36:10 +02: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
1ba945b39b
Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
...
Updated to ASM 7.0-beta, and defaulted AnnotationParser to ASM 7.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-04 13:47:56 +02:00
bd3eeeaa3f
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'.
2018-10-04 12:27:31 +02:00
75942298f5
Issue #2191 - JPMS Support.
...
Restored previous OSGi bundle name for apache-jsp.
Introduced a new property for the JPMS Automatic-Module-Name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-04 10:51:16 +02:00
1fe6c92ee9
Issue #2948 - Require JDK 11 for Jetty 10.x.
...
First pass at making Jetty 10.x require JDK 11.
* Removed JDK 8 modules (in particular ALPN and ALPN *.mod files).
* Removed profiles targeting JDK 8, 9 and 10.
* Updated dependencies to newer versions that support JDK 11.
* Temporarily commented out the Jetty Maven Plugins due to
maven-plugin-plugin not working with JDK 11.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-03 11:15:30 +02:00
8213a95a7b
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-10-02 22:51:46 +02:00
a094dbaa69
fix osgi tests not running as paxexam is not junit5 ready ( #2945 )
...
* fix osgi tests not running as paxexam is not junit5 ready
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* upgrade pax exam to 4.12.0
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* cleanup comment, using transitive deps from pax-exam-junit4
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-02 16:44:24 +10:00
e4ff653295
Issue #2191 - JPMS Support.
...
Introduced --jpms option in jetty-start to run Jetty from the module-path.
Introduced [jpms] sections in *.mod files, to specify JPMS command line
options that needs to be added to the command line generated by jetty-start.
Bumped java.transaction-api to 1.3 because it has Automatic-Module-Name.
Fixed ASM version lookup using ManifestUtils.
Fixed WebInfConfiguration.findAndFilterContainerPaths() to properly
scan the module-path, which may contain both files and directories.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-25 22:11:25 +02:00
78d529b13a
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'.
2018-09-24 15:23:30 +02:00
5e8a7403d1
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-22 20:11:03 +10:00
71a1801433
Issue #2918 restore a TestTracker with junit5 ( #2927 )
...
* add TestTracker junit5 extension #2918
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-21 14:03:05 +10:00
cf59a8aa65
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-20 07:36:11 +10:00
9fae0c2fa0
Move snapshot repositories to profile ( #2917 )
...
Issue #2917
* Move snapshot repositories to profile
* feedback from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-19 11:20:14 +10:00
defa9e42f2
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-18 10:54:36 -04:00
a6abd0b741
Issue #2191 - JPMS Support
...
Fixed apache-jsp JPMS module name.
Fixed jetty-ant JPMS module name.
ASM 6.2 contains a proper module-info.class that requires also
asm-tree and asm-analysis, so added them to the jetty-home module
so that they are present in the distribution.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-18 00:35:29 +02:00
3793fe5ae9
upgrade junit 5.3.1 ( #2904 )
2018-09-14 12:00:08 +10:00
cd7138131e
Fix outdated bundle vendor
...
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2018-09-12 10:56:05 +08: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
0ec0216542
Fixing bad merge of pom.xml
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-07 14:56:20 -05: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
ba3c95abd0
Removing updatePolicy/always
2018-09-05 08:09:00 -05: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
8dd05ac3f7
merge from 9.4.x
2018-09-04 13:48:43 -05:00
0ae0c500f0
Merge pull request #2879 from eclipse/jetty-9.4.x-2878-javadoc-gen-fix
...
Issue #2878 fix post release javadoc generation
2018-09-04 13:34:15 -05:00
d0b98186c0
Issue 2865 update to jasper 8.5.33 ( #2870 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-04 14:25:27 +10:00
44ace1f8c8
cleanup Jenkinsfile: non needed/unused variable ( #2880 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-03 16:19:18 +10:00
e893dd2546
update instructions
2018-08-31 16:05:00 -05:00
44c95865f2
Issue #2878 fix post release javadoc generation
2018-08-31 15:57:38 -05:00
78894c4aae
Issue #2191 - JPMS Support.
...
Added "Automatic-Module-Name" to jetty modules.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-31 15:18:41 +02: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
9cb9be83fd
Issue #2846 Jaas ldap unit test ( #2864 )
...
* #2846 add jaas ldap unit tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-30 14:17:08 +10:00
d95b39f5f7
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-08-29 12:16:26 -04:00
1383f60249
Updated Maven Plugin and dependencies versions.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-29 12:22:51 +02:00
5afe2e215f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-23 17:17:46 +10:00
7f3c75a6c6
Using released Jacoco 0.8.2
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-22 16:03:21 -05:00
f15bd225b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-21 14:47:19 +10:00
e5f0531db0
fixes after merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-15 11:59:15 +10:00
9ff37122db
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-08-15 11:58:52 +10:00
e0a92f6181
Issue #2794 - Add profile for jar signing with eclipse-jarsigner-plugin. ( #2803 )
...
Create a profile 'eclipse-sign' that is enabled when the property by
the same name is defined, in order to handle the signing of Eclipse
bundles by the configured signing service.
Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
2018-08-15 09:26:37 +10:00
33228edc7d
Issue #2794 - Add profile for jar signing with eclipse-jarsigner-plugin. ( #2802 )
...
Create a profile, 'eclipse-sign', that is enabled when the property by
the same name is defined, in order to handle the signing of Eclipse
bundles by the configured signing service.
Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
2018-08-15 09:19:00 +10:00
bd38bc905b
Issue #2639 - Add profile for jar signing with eclipse-jarsigner-plugin. ( #2786 )
...
Create a profile, 'eclipse-sign', that is enabled when the property by
the same name is defined, in order to handle the signing of Eclipse
bundles by the configured signing service.
Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
2018-08-09 22:12:03 +10:00
b249021b6d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-08-07 21:18:25 -04:00
c8fe66dd3a
#2778 upgrade h2spec-maven-plugin to 0.4 ( #2779 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-07 21:17:07 +10: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
cfcecce2f9
Bumping up jetty-version-maven-plugin version
2018-08-06 10:29:57 -05:00
9e97c50d90
Merge branch 'release-9.2.25' into jetty-9.2.x
2018-08-06 10:27:39 -05:00
9390c2df3f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-06 09:04:58 -05:00
f4a0bfbdd8
Issue #2746 jmh module ( #2750 )
...
#2746 move jmh classes to a dedicated jmh module
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-04 14:08:13 +10:00
0ba1d9b5a5
Issue #307 datecache contention ( #2725 )
...
* use DateTimeFormatter which is threadsafe so no need of synchronized block #307
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-07-26 20:46:50 +10:00
9a22dd820a
Issue #2679 - h2spec compliance.
...
Integrated h2spec execution in the Maven build.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-21 15:55:43 +02:00
0892ed8983
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-07-18 16:25:39 +02:00
eceaff7bed
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-07-18 16:21:00 +02:00
37e4da24cb
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-07-18 16:15:27 +02:00
7845497702
Updated ALPN version for JDK 8u181.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-18 15:47: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
30f6132117
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-07-03 10:55:22 -05:00
cd60da7a12
fix #2342 Upgrade Conscrypt to 1.1.4
...
Fixes https://github.com/google/conscrypt/issues/491
Signed-off-by: Carter Kozak <c4kofony@gmail.com>
2018-06-29 08:41:34 -04: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
3932b11e64
Merge remote-tracking branch 'origin/release-9.4.11' into jetty-9.4.x
2018-06-07 14:31:24 -05:00
ce09e48b5b
[WIP] Issue #2597 - Improving UnixSocketTest behavior. ( #2635 )
...
* Issue #2597 - Improving UnixSocketTest behavior.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jnr doesn't like filename/path with strange character so use a new property for jenkins build with docker
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-07 15:39:56 +10:00
0e6c91b604
Updating to version 9.2.26-SNAPSHOT
2018-06-06 18:54:58 -05:00
4830fd15e9
Updating to version 9.2.25.v20180606
2018-06-06 16:42:54 -05:00
e4bfe00dce
Updating to version 9.4.12-SNAPSHOT
2018-06-05 14:18:37 -05:00
d5fc0523cf
Updating to version 9.4.11.v20180605
2018-06-05 13:23:02 -05:00
5eefa90e05
Updating to version 9.3.25-SNAPSHOT
2018-06-05 13:13:07 -05:00
84205aa28f
Updating to version 9.3.24.v20180605
2018-06-05 12:11:03 -05:00
f0ff571c98
Reverting version to 9.3.24-SNAPSHOT
2018-06-05 12:06:58 -05:00
13640c297c
Bumping version to 9.3.25-SNAPSHOT
2018-06-05 11:58:37 -05:00
e84def53e5
Adding -html5 argument to maven-javadoc-plugin to squelch warnings from java 9+
2018-06-01 13:32:10 -05:00
8eb7faeccc
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-05-31 10:11:01 -05:00
519d36ae40
Restoring badly merged maven-javadoc-plugin configuration
2018-05-31 09:56:44 -05:00
d065f1e068
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2018-05-31 09:25:41 -05:00
1509d1c9aa
Issue #2586 update to asm6.2 ( #2588 )
...
Issue #2586 update to asm6.2
2018-05-30 11:29:18 +02:00
154298af64
run maven it tests as default #2576
...
* run maven its test per default #2576
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-30 08:33:25 +10:00
72ed06a630
upgrade javadoc and plugin tools maven plugins
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-29 08:08:37 +10:00
e7eecc270d
Updating pom.xml
2018-05-22 16:47:10 -05:00
9019c83517
Update pom.xml
2018-05-22 16:45:14 -05:00
718a855911
Update pom.xml
...
remove the javadoc page tracker
2018-05-22 15:20:17 -05:00
60c47c24a8
remove link to self javadoc
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-15 10:17:45 +10:00
1732ffca51
Updating to version 9.4.11-SNAPSHOT
2018-05-03 11:48:05 -05:00
daa59876e6
Updating to version 9.4.10.v20180503
2018-05-03 10:55:19 -05:00
d64d0348b7
test some Jenkinsfile changes ( #2471 )
...
* maven 3.5
* add surefire timeout to avoid build stuck
2018-04-25 19:29:21 +10:00
8763c6065d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-04-20 11:32:46 -05:00
1574ea1780
reduce pmd plugin noise
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-20 21:25:13 +10:00
5758fb52c0
Merge pull request #2469 from olamy/feature/build_local_repo_test
...
test new local repository for CI and use PMD cache
2018-04-20 18:54:10 +10:00
6e2cd06c89
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-04-20 10:31:39 +02:00
8323417622
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-04-20 10:27:14 +02:00
d7ce334f8f
Updated ALPN version for JDK 8u171 and 8u172.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-20 10:16:50 +02:00
06b04e9cda
enable cache for pmd plugin
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-20 16:53:29 +10:00
c7e78ae896
update logging versions #2461 ( #2465 )
...
* update logging versions #2461
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 15:45:11 +10:00
237d6280c3
upgrade pmd plugin
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 09:42:01 +10:00
9dd72454da
upgrade jar plugin
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 09:42:01 +10:00
c8bb36330a
upgrade dependency plugin
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 09:42:01 +10:00
d68e9ea23c
upgrade compiler plugin
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 09:42:01 +10:00
01c08133de
upgrade install plugin 2.5.2
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 09:42:01 +10:00
ea6d18f919
Jetty 9.4.x issue 2397asm jdk10 support ( #2417 )
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-04-06 12:00:09 +10:00
16e625adde
Issue #2109 remove warnings for unused imports and exports ( #2390 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-04-04 12:06:43 +10:00
67d887758d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-03-29 17:36:29 +11:00
b4e400f236
Jetty 9.4.x 2231 refactor session tests ( #2382 )
...
* Issue #2231 WIP
* Issue #2231 Add tests for FileSessionDataStore and MongoSessionDataStore.
* Issue #2231 create unit tests for every SessionDataStore
Signed-off-by: Jan Bartel <janb@webtide.com>
* Issue #2231 Refactor session tests
Signed-off-by: Jan Bartel <janb@webtide.com>
* Issue #2231 Refactor and cleanup session tests.
Signed-off-by: Jan Bartel <janb@webtide.com>
* hazelcast tests faster
Signed-off-by: olivier lamy <olamy@webtide.com>
* make hazelcasts tests even faster
Signed-off-by: olivier lamy <olamy@webtide.com>
* cleanup comments
Signed-off-by: olivier lamy <olamy@webtide.com>
* run mongodb test in embdedded mode
Signed-off-by: olivier lamy <olamy@webtide.com>
* mongodb embedded test enabled per default
Signed-off-by: olivier lamy <olamy@webtide.com>
* Issue #2231 more session tests
Signed-off-by: Jan Bartel <janb@webtide.com>
* fix mongodb embedded tests
Signed-off-by: olivier lamy <olamy@webtide.com>
* cleanup code
Signed-off-by: olivier lamy <olamy@webtide.com>
* use Logger rather than System.err.println
Signed-off-by: olivier lamy <olamy@webtide.com>
* Issue #2231 Add test for DefaultSessionCache
Signed-off-by: Jan Bartel <janb@webtide.com>
* Issue #2231 Redisable mongo tests by default.
Signed-off-by: Jan Bartel <janb@webtide.com>
* fix issue with empty local repo build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* jenkins should run mongodb tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* build this plugin last so we should not hit the maven invoker plugin
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* build test first for this one
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use invoker plugin 3.0.2-SNAPSHOT as there is a fix for https://issues.apache.org/jira/browse/MINVOKER-191
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* temporary use of apache snapshots repository because of maven-invoker-plugin 3.0.2-SNAPSHOT
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-03-28 20:14:15 +10:00
f56fb440a5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-03-26 11:50:47 -05:00
636ed4a0fe
align maven version used #2373 ( #2374 )
...
align maven version used #2373
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-03-23 20:32:29 +10:00
1c04f9838d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-22 16:42:42 -05:00
732a3c4d1c
use released jacoco 0.8.1
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-23 07:12:54 +10:00
a74a328024
Merge branch 'release-9.4.9' into jetty-9.4.x
2018-03-21 16:33:56 -05:00
5286fb8081
[WIP] add it test for jspc plugin so we can test it with jdk10 ( #2363 )
...
* add it test for jspc plugin so we can test it with jdk10
Signed-off-by: olivier lamy <olamy@webtide.com>
* record maven invoker results
Signed-off-by: olivier lamy <olamy@webtide.com>
* seems to be require as a dependency
Signed-off-by: olivier lamy <olamy@webtide.com>
* no need of install
Signed-off-by: olivier lamy <olamy@webtide.com>
* remove invoker as it do not support well parallel
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-21 21:11:16 +10:00
6f14b22a92
jacoco fixed for jdk 10
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-21 17:26:09 +10:00
c3cc138a3b
Updating to version 9.4.10-SNAPSHOT
2018-03-20 08:25:59 -05:00
1f8159b1e4
Updating to version 9.4.9.v20180320
2018-03-20 07:18:24 -05:00
c2b2935cee
#2344 upgrade javadoc plugin to 3.0.0
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-17 11:18:07 +10:00
ff00f5383a
fix bad copy/paste
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-16 12:26:04 +10:00
98875c3097
add jdk11 profile
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-16 12:23:46 +10:00
3f17f7853f
Merge pull request #2281 from joakime/issue-2278-dist-test-dep
...
Issue #2278 - making distribution pom not require tests
2018-03-15 04:45:16 -05:00
39013cbc91
adding myself in developers section to test commit karma
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-15 10:09:39 +10:00
c22eedac8b
upgrade surefire version to 2.21.0
...
Signed-off-by: olivier lamy <olamy@webtide.com>
use a property for surefire version and align version
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-09 15:12:20 +10:00
3c393da3f9
Issue #2278 - making distribution pom not require tests
...
- Speculative fix to ensure that the users of the jetty-distribution
do not require the test artifacts to utilize the tarball / zip files
- Also disabled the snapshot repository as it causes false success
- Adding now unreferenced dependency
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-06 16:11:07 -06:00
e3e3f9eb0b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-06 11:16:25 -06:00
c73ecae431
Jetty 9.4.x 2059 make osgi tests work jre9 ( #2264 )
...
* Issue #2059 WIP: make osgi tests work with jdk9
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-03-06 11:04:50 +11:00
a05b157c03
Updating to version 9.3.24-SNAPSHOT
2018-02-28 16:39:30 -06:00
0554f8d8b4
Updating to version 9.3.23.v20180228
2018-02-28 15:45:57 -06:00
27a0cbfacd
Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-2206-OperatorPrecedence
2018-02-27 14:56:33 +11:00
6e3f581ae4
Disabled errorprone OperatorPrecedence warnings #2206
...
brackets can be used optionally for clarity but aren't manditory #2206
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-02-27 14:49:17 +11:00
0cb4f5629d
Jetty 9.4.x 1803 proposal 0+2 ( #2199 )
...
Merging this PR for #2199 as we currently think it is not worse than previous and the code base is definitely simpler. While JMH has shown significant benefits for this approach, we have yet been able to demonstrate them in full scale integration tests - however that is likely due to GC and thread pool issues dominating.
A `org.eclipse.jetty.http2.PEC_MODE` System property has been added to allow the EWYK scheduling to be disabled for HTTP/2 if need be.
* Implementation of #1803 proposal 2 - EITHER dispatch type for EWYK
* made code more readable
* increase small threadpools in tests for extra reserved thread
* clean up
* minor code simplifications
* Work in progress to simplify reserved thread pool
* use a single ReservedThreadPool built into the QueuedThreadPool
* fixed javadoc
* removed more old reserved thread references
* disable EWYK for h2
* fixes from review
* use EWYK for HTTP2
* Fixed javadocs, imports and QueuedThreadPool constructors.
* fix javadoc
* EWYK avoid unnecessary pendings
* after review
* fixed merge with jetty-threadpool.xml
* alternate EWYK implementations
* added jetty copyright headers
* Simplified EWYK code after review
* fixed bad merge
* Code cleanups.
* Improved Javadocs for deprecated property "reservedThreads".
* Improved Javadocs for deprecated property "reservedThreads".
* added a system property to enable only PEC for HTTP/2
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-02-27 14:29:59 +11:00
1cf4f2a4d4
Merge pull request #2187 from olamy/feature/jdk-10-build
...
Feature/jdk 10 build
2018-02-21 16:39:48 +11:00
693aa04e03
Merge pull request #2200 from olamy/feature/errorprone
...
[WIP] Feature errorprone compiler
2018-02-21 16:30:34 +11:00
2b6c71f6ba
move errorprone to a profile
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-21 11:21:25 +10:00
17f518ffb1
Issue #2164 Update websocket manifests for osgi and add test in osgi
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
bd0b440da9
fixing one errorprone error, ATM configure it to generate warning and not errors, let see if we can collect in jenkins
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-19 13:37:28 +10:00
41b40dc97d
enable errorprobe
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-19 12:32:33 +10:00
42d9482f50
jacoco need to be skipped
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-18 19:01:24 +10:00
917880c0c1
do not skip jacoco with jdk10
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-18 19:01:24 +10:00
d29aca4ce4
fix commit for jdk10 profile
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-18 19:01:24 +10:00
a66fb84492
forcing commons-lang3 version doesn't work as it i shaded so we need a new release of failsafe and same for jacoco
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-18 19:01:24 +10:00
715e18a039
really enforce commons-lang3 3.7
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-18 19:01:24 +10:00
003c06f427
upgrade jacoco, disable jacoco for jdk10, upgrade commons-lang for maven-failsafe-plugin to prevent NPE
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-18 19:01:24 +10:00
3001c8af2f
Merge remote-tracking branch 'origin/release-9.2.24' into jetty-9.2.x
2018-02-07 15:35:04 -06:00
c9bb3843c3
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-02-07 16:30:49 -05:00
9a787b1e54
Resovling merge conflicts and updating doc headers
2018-02-07 16:28:31 -05:00
4044045936
Merge resolution
2018-02-07 16:22:12 -05:00
1704360ec3
Issue #2185 - Adds check for documentation header and separates it fr… ( #2186 )
...
* Issue #2185 - Adds check for documentation header and separates it from java license check. Updated license plugin.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
* Making requested changes for file listing
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2018-02-07 16:06:52 -05:00
c1d566a56d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-18 12:09:07 +01:00
4d682a1f2d
Issue #2128 Revert surefire version
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-01-18 12:04:06 +01:00
298580625e
Issue #2079 Update to Jasper 8.5.24
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-01-18 12:02:57 +01:00
7e91285a2c
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-01-17 12:06:28 +01:00
43f99d8857
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-01-17 12:00:13 +01:00
53eebd045c
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-01-17 11:56:26 +01:00
3de4de99d3
Updated ALPN version for JDK 8u161 and 8u162.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-01-17 11:46:12 +01:00
214298b71b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-16 17:59:28 +01:00
f4e37b1adb
Issue #2014 - Unix Socket Client ( #2025 )
...
There are still problems with this impl (some client tests ignored) and there is still a work around for the JNR bug 50, however this impl is already much better than the unix socket support that is already in the release. So will merge for now and put more effort in once there is a JNR fix.
* WIP add unix domain sockets support in HttpClient
* move unix socket client part to unix socket module #2014
* some cleanup #2014
* add missing headers #2014
* add TODO
* UnixSocket client refactor
* cleanup test and pom
* minor changes, use LOG.isDebugEnabled() before using debug method
* add UNIX SOCKET http client test with all other tests, push this to see what happen on Jenkins
* fix some unit tests
* fix more tests
* fix load test
* UnixSocket client
* Demonstrate JNR bug
* Worked around JNR bug 50
* close channel on client side as well
* more details in log
* log file path as well
* #2014 disable test per default as doesn't work on some environement
* Revert "#2014 disable test per default as doesn't work on some environement"
* test only on unix
* Allow test of specific transport(s)
* Move unix socket to /tmp
* move test socket to /tmp
* move test socket to /tmp
* ignore failing tests for now
* fix bean name and possible to use sys prop org.eclipse.jetty.http.client.AbstractTest.Transports with mvn cli
* test isBlank as surefire props is not null
* correctly create tmp file with @Before
* do not delete file
* use /tmp as build directory doesn't seem to work within docker...
* do not delete sock file on client as it is own by the server
* file must not exist when binding unix socket
* #2014 fix license header
* network specific tests assumed
* Fixed to handle null selector keys
* add assume for tests that assume a network connector
Signed-off-by: olivier lamy <olamy@webtide.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-13 11:59:47 +01:00
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06: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
bd01e1877a
Updating to version 9.2.25-SNAPSHOT
2018-01-05 11:35:42 -06:00
a617842695
Updating to version 9.2.24.v20180105
2018-01-05 10:11:08 -06:00
olivier lamy
Joakim Erdfelt
Simone Bordet
Lachlan Roberts
Alexander Kurtakov
Greg Wilkins
olivier lamy
Jan Bartel
Joakim Erdfelt
WalkerWatch
Yanming Zhou
Jesse McConnell
Roland Grunberg
Carter Kozak
olivier lamy
Chris Walker