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
2dd970b055
Updating to version 9.2.24-SNAPSHOT
2017-12-18 10:43:47 -06:00
cdbe733684
Updating to version 9.2.23.v20171218
2017-12-18 09:06:48 -06:00
8e21c2f303
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-12-13 14:56:26 +01:00
8665348258
Issue #2015 add osgi headers for alpn conscrypt ( #2027 )
...
* Issue #2015 add osgi headers for alpn conscrypt
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-13 14:55:34 +01:00
ff53002fac
Updating to version 9.4.9-SNAPSHOT
2017-11-21 13:11:31 -07:00
82b8fb23f7
Updating to version 9.4.8.v20171121
2017-11-21 12:33:52 -07:00
6499baa3a2
add a build.properties file containing git hash, build timestamp scm url ( #1957 )
...
* add a build.properties file containing git hash, build timestamp and scm url #1956
Signed-off-by: olivier lamy <olamy@webtide.com>
* move build infos to Jetty class so it's available for server and client
Signed-off-by: olivier lamy <olamy@webtide.com>
* apply changes by Greg review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-11 09:26:00 +11:00
99e56f97a2
add a build.properties file containing git hash, build timestamp scm url ( #1957 )
...
* add a build.properties file containing git hash, build timestamp and scm url #1956
Signed-off-by: olivier lamy <olamy@webtide.com>
* move build infos to Jetty class so it's available for server and client
Signed-off-by: olivier lamy <olamy@webtide.com>
* apply changes by Greg review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-11 09:02:10 +11:00
9fab69ea02
add a build.properties file containing git hash, build timestamp scm url ( #1957 )
...
* add a build.properties file containing git hash, build timestamp and scm url #1956
Signed-off-by: olivier lamy <olamy@webtide.com>
* move build infos to Jetty class so it's available for server and client
Signed-off-by: olivier lamy <olamy@webtide.com>
* apply changes by Greg review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-10 18:39:28 +01:00
814769637d
Merge branch 'jetty-9.4.x'
2017-11-06 10:29:41 -05:00
4a659a9e89
upgrade assembly plugin and use tarLongFileMode posix #1782 ( #1942 )
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-06 18:24:09 +11:00
05a7c5952a
upgrade assembly plugin and use tarLongFileMode posix #1782 ( #1943 )
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-06 18:24:03 +11:00
a72eb0001d
Updating to version 9.3.23-SNAPSHOT
2017-10-30 15:39:57 -05:00
705048cc49
Updating to version 9.3.22.v20171030
2017-10-30 15:16:29 -05:00
4ec2a154fc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-19 15:17:46 +11:00
3793f974d5
Issue #1909
2017-10-19 15:08:02 +11:00
39b9f2ca95
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-18 10:55:02 +02:00
f8ce63c125
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-10-18 10:53:16 +02:00
55d461ae17
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-10-18 10:50:40 +02:00
a74ad00b77
Update ALPN support for Java 8u151 and 8u152.
2017-10-18 10:44:18 +02:00
6a921b1180
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 11:44:07 +11:00
3cffbdf6be
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 11:24:04 +11:00
37c51710b0
Issue #1213
2017-10-18 10:05:59 +11:00
bee383c894
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-03 01:22:35 +02:00
a811785d64
Reverting Maven Surefire Plugin to 2.20.
...
Version 2.20.1 suffers from https://issues.apache.org/jira/browse/SUREFIRE-1424 ,
which breaks the Infinispan tests.
2017-10-02 13:16:44 +02:00
b3ddf2b15e
Issue #487 - JDK 9 build compatibility.
...
Updated Maven Surefire and Failsafe Plugin to 2.20.1
following https://issues.apache.org/jira/browse/SUREFIRE-1403 .
2017-09-30 22:49:38 +02:00
e3bec841da
Issue #1838
2017-09-26 16:07:18 +10:00
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10:00
d4cd8c13e9
Udpdated instructions for javadoc generation
2017-09-21 12:48:16 -04:00
90b40dc683
Updated maven-dependency-plugin to 3.0.2 to solve JDK 9 issue due to
...
https://issues.apache.org/jira/browse/MDEP-571 .
2017-09-21 14:47:24 +02:00
d3b14b97fb
Issue #1760
2017-09-19 14:38:14 +10:00
6fb0eb5c9d
Toolchain version updates
2017-09-18 14:18:21 -07:00
d9865a02ba
Updating to version 9.4.8-SNAPSHOT
2017-09-14 08:44:27 -07:00
80fb788d0c
Updating to version 9.4.7.v20170914
2017-09-14 07:35:18 -07:00
562834d903
Updating jetty-version-maven-plugin
2017-09-13 16:34:51 -07:00
02f0649840
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-28 11:33:12 -07:00
1ba12a4b3d
Upgrading to recently released jetty-test-helper:4.2 (for jdk9 reasons)
2017-08-23 15:57:53 -07:00
c53f4cdd63
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-16 12:54:03 +02:00
aea4b784b5
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-08-16 12:53:35 +02:00
b7c4e1c7dc
Issue #487 - JDK 9 build compatibility.
...
Made sure that when compiling with JDK 9 we actually use a JDK 8 runtime.
Updated the Maven Compiler Plugin to latest version, with support for
JDK 9 --release command line.
Removed unnecessary Maven Compiler Plugin declarations in POMs.
2017-08-16 12:37:44 +02:00
3af1f11839
Issue #1741 - Java 9 javadoc failure in build.
...
Updated Maven Javadoc Plugin to 3.0.0-M1 and removed unused imports
that were influencing somehow the Javadoc generation.
2017-08-15 23:01:01 +02:00
d8861c795c
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-15 18:54:11 +02:00
7607c14048
Issue #487 - JDK 9 build compatibility.
...
Updated plugin versions in the dependencyManagement section.
2017-08-15 18:53:44 +02:00
0e2852a5ac
Issue #487 - JDK 9 build compatibility.
...
Specified JDK 9 compliant version for the Maven Enforcer Plugin.
2017-08-15 17:46:00 +02:00
8e7cdd8371
Updated for servlet 4.0 schemas
2017-08-15 15:33:11 +10:00
952bb8dfdd
Fixing compilation
2017-08-08 10:40:58 -07:00
1311052b15
Cleaning up state of branch to match the original jetty-9.4.x
...
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
585f126b48
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x-clean
2017-08-08 09:24:41 -07:00
a8ca4d23c6
Fixes #1702 - Update ALPN for JDK 8u144.
2017-08-08 09:15:38 -07:00
489f68c708
Fixes #1685 - Update ALPN support for Java 8u141.
2017-08-08 09:15:12 -07:00
c2598408d0
Issue #1650 - update clirr to report on API changes
2017-08-08 09:14:09 -07:00
0bee599d29
add new module for hazelcast session manager
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:28 -07:00
b8e4f72e38
add Hazelcast session management #1571
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:19 -07:00
3fdbcffbbd
Updating to version 9.2.23-SNAPSHOT
2017-08-08 09:12:55 -07:00
11a544d6ac
Updating to version 9.3.22-SNAPSHOT
2017-08-01 11:26:37 -07:00
bb1d69ca52
Updating to version 9.3.21.M0
2017-08-01 10:47:04 -07:00
f7302a13b4
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-01 11:21:41 +02:00
c04c395833
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-08-01 11:21:05 +02:00
b616249603
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-08-01 11:14:28 +02:00
d4d5211ede
Fixes #1702 - Update ALPN for JDK 8u144.
2017-08-01 11:05:30 +02:00
552b7c3e0e
Merged branch 'jetty-9.4.x' into 'master'.
2017-07-24 11:19:04 +02:00
4b0003f086
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-07-24 11:13:32 +02:00
a0026fd9d2
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-07-24 10:44:39 +02:00
3f94a5d132
Fixes #1685 - Update ALPN support for Java 8u141.
2017-07-24 10:08:10 +02:00
79cafb37a0
Issue #1676 Removed deprecated module jetty-continuations
2017-07-18 15:42:14 +02:00
a9c329859d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-12 13:18:12 -07:00
2e8f9fc748
Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch"
...
This reverts commit 38c112764d
2017-07-12 11:28:32 -07:00
38c112764d
Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch
2017-06-28 16:42:37 -07:00
a1810fa952
Issue #1650 - update clirr to report on API changes
2017-06-27 14:15:19 -07:00
2eea25cb1e
Restoring 8u131 profile to main pom
2017-06-26 13:38:00 -07:00
67cccd610a
Post cherry-pick cleanup of jetty-9.4.x...master jetty-websocket
2017-06-26 13:11:33 -07:00
17f6c28c7d
Issue #1503 Optionally strip IPv6. Default true
2017-06-26 11:59:40 -07:00
fcb8693c52
Issue #207 - testcase rework due to new async behaviors
...
# Conflicts:
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/ConnectionManager.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/RegexMatcher.java
2017-06-26 11:49:53 -07:00
70d4850ed1
Issue #207 - working @PathParam support
2017-06-26 11:31:42 -07:00
3906f9595f
467246 - Support javax.websocket version 1.1
...
+ WIP
2017-06-26 10:55:04 -07:00
00beb607fc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-13 10:40:02 -07:00
5665bb6ba4
Using released version of jetty-test-helper
2017-06-09 09:47:43 -07:00
76ace004b6
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-09 09:17:43 -07:00
olivier lamy
Joakim Erdfelt
WalkerWatch
Chris Walker
Jan Bartel
Simone Bordet
Greg Wilkins
Olivier Lamy
Jesse McConnell