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
a3be81e618
add new module for hazelcast session manager
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 22:00:24 +10:00
8a300613df
add Hazelcast session management #1571
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:22 +10:00
4d2c299fe8
Updating to version 9.2.23-SNAPSHOT
2017-06-06 08:55:12 -07:00
ad76aa6c65
Issue #1503 Optionally strip IPv6. Default true
2017-06-06 17:07:14 +02:00
0af30bce5a
Updating to version 9.2.22.v20170606
2017-06-06 07:03:05 -07:00
5d7e97993c
Merge remote-tracking branch 'origin/master' into issue-207-master
2017-06-05 10:05:05 -07:00
6a3c40e935
Updating to version 9.4.7-SNAPSHOT
2017-05-31 17:26:34 -07:00
8ba0f2d95d
Updating to version 9.4.6.v20170531
2017-05-31 16:22:52 -07:00
429380d36a
Updating to version 9.3.21-SNAPSHOT
2017-05-31 16:10:04 -07:00
0f3b1cbe36
Updating to version 9.3.20.v20170531
2017-05-31 15:24:57 -07:00
9c3e5c2150
Removing tag, not relevant
2017-05-18 15:47:52 -07:00
04b6afe879
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-05-15 09:48:41 -07:00
69696b37b6
Using non-SNAPSHOT javax.servlet-api dependency for CI sanity
2017-05-12 14:07:35 -07:00
873c3554e7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-12 14:06:21 -07:00
98d36ff0b1
Upgrading maven-source-plugin for build stability
2017-05-12 13:41:53 -07:00
521cc6520f
Some javadoc plugin configuration updates
...
(cherry picked from commit 240c217
2017-05-12 12:09:10 -07:00
240c217c9d
Some javadoc plugin configuration updates
2017-05-12 06:41:01 -07:00
036a880f74
Revert "Disabling detection of javadoc links, only use configured ones"
...
This reverts commit 7b6dec43f2
2017-05-12 06:09:20 -07:00
cbe857de01
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-11 10:08:36 +02:00
7b6dec43f2
Disabling detection of javadoc links, only use configured ones
2017-05-10 08:28:57 -07:00
0326af2ce9
renamed for clarity
2017-05-09 09:19:54 +02:00
a89d0b1578
use b05 servlet api
2017-05-03 11:48:54 +02:00
ce8342f12a
Updated to latest servlet 4.0 draft
2017-05-03 11:04:57 +02:00
cf56168f7d
Updating to version 9.3.20-SNAPSHOT
2017-05-02 15:26:56 -07:00
d36d57d5c7
Updating to version 9.3.19.v20170502
2017-05-02 14:31:51 -07:00
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
146a1d5ed5
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-02 22:17:06 +02:00
861372c70d
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-05-02 22:16:45 +02:00
c955fb609e
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-05-02 22:12:29 +02:00
9ba7b713d2
Fixes #1523 - Update ALPN support for Java 8u131.
2017-05-02 22:01:00 +02:00
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
002ba9cf00
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
...
Conflicts:
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/AltFilterTest.java
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeAnnotatedTest.java
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeContainerTest.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/DecoratorsTest.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/TestABCase3.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/WebSocketCloseTest.java
2017-04-28 06:01:06 -07:00
f2dce2944a
Fixing build: [WARNING] Unable to locate Source XRef to link to
2017-04-26 08:51:54 -07:00
849ad7c917
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-04-21 09:00:54 -07:00
a654c7c9e5
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
...
Conflicts:
pom.xml
2017-04-20 18:33:07 -07:00
803542c485
Merge pull request #1430 from olamy/feature/bom-artifact
...
#1348 add BOM artifact
2017-04-20 06:19:08 -07:00
a2f89f2bf9
implementation for #1481
...
Add a new base class UserStore
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-04-20 15:03:04 +10:00
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
8885f24ccb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-12 11:26:09 +10:00
7e2e64e856
Issue #207 - testcase rework due to new async behaviors
2017-04-11 15:46:47 -07:00
9e2aeda052
Updating to version 9.3.19-SNAPSHOT
2017-04-06 07:47:53 -07:00
63273aa40b
Updating to version 9.3.18.v20170406
2017-04-06 06:31:02 -07:00
dd084b4e74
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-30 17:20:22 +11:00
9a8b753343
change to jetty-bom
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-03-30 11:07:24 +11:00
e036e6a7b5
#1348 add BOM artifact
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-03-28 16:53:26 +11:00
b8ddef08d6
Merge remote-tracking branch 'origin/release-9.4.3' into jetty-9.4.x
2017-03-22 09:31:44 -07:00
78450cb843
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-22 09:23:25 -07:00
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
a6a0ab991f
Updating to version 9.3.18-SNAPSHOT
2017-03-17 09:48:19 -07:00
307d23975e
Updating to version 9.3.17.v20170317
2017-03-17 09:07:39 -07:00
5ecb8b8526
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-17 09:04:37 -07:00
97f488dea4
Issue #1383 - fixing javadoc w/script issue in java 8u121+
2017-03-17 09:03:38 -07:00
9273d99a99
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-03-15 15:07:17 -07:00
59c31a40e3
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-14 12:07:57 -07:00
3168e2b1e5
Issue #1394 - hardcoding locale in surefire testing too
2017-03-13 11:17:53 -07:00
f293f637c8
Issue #1394 - fix default character encoding for surefire testing
2017-03-13 11:10:10 -07:00
05f05520eb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-07 07:55:36 +11:00
0316e18f91
Issue #207 - working @PathParam support
2017-02-23 15:38:57 -07:00
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
c5c7be2bc5
Merge branch 'jetty-9.4.x'
2017-02-02 16:23:13 -07:00
5e57b9562f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:14:10 -07:00
9a8f22d5dd
Testing Updates
...
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
in jetty-test-helper and the test classes.
2017-02-02 15:51:38 -07:00
bba4a8bbf6
Merge remote-tracking branch 'origin/release-9.4.1' into jetty-9.4.x
2017-01-26 11:22:08 -06:00
096b4d6e1e
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-23 21:46:54 +01:00
20f57fcd14
Fixed version for the maven-eclipse-plugin.
2017-01-23 21:45:43 +01:00
a2aa2679e3
Merge branch 'jetty-9.4.x'
2017-01-23 09:46:46 -06:00
f2be9f2255
add scp to site plugin so we can deploy docs after release
2017-01-23 09:46:29 -06:00
e695fc80d6
Updating to version 9.2.22-SNAPSHOT
2017-01-20 12:32:51 -06:00
513b5e5f90
Updating to version 9.2.21.v20170120
2017-01-20 12:32:00 -06:00
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd4565c186d7
2017-01-19 18:26:43 +01:00
dc1658fad3
Revert "resolve merge and update license headers"
...
This reverts commit 3c53b3a32f
2017-01-19 18:26:10 +01:00
3c53b3a32f
resolve merge and update license headers
2017-01-19 09:38:22 -06:00
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
a2cde42a68
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-19 14:55:54 +11:00
7fd8036f93
Issue #1271
...
Update to org.mortbay.jasper 8.5.9.1
2017-01-19 14:52:51 +11:00
0d8d754772
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-18 18:55:08 +01:00
a7938910b7
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-18 18:54:47 +01:00
53281d3202
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-18 18:52:20 +01:00
79202d1cc6
Updated ALPN version for JDK 8u121.
2017-01-18 18:30:30 +01:00
a49841f308
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-18 17:28:36 +01:00
6222ccba14
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-18 17:28:18 +01:00
f97396b131
Fixes #1275 - Get rid of Mockito.
...
Converted the 2 tests that were using Mockito and removed from the POMs.
2017-01-18 17:09:57 +01:00
608a33bbad
Revert "Issue #1271"
...
This reverts commit 9a7920a0fb
2017-01-19 00:22:42 +11:00
c6fa0cdd69
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-18 17:28:21 +11:00
9a7920a0fb
Issue #1271
2017-01-18 15:38:30 +11:00
76ba287f6c
Fixed JUnit JavaDocs URL.
2017-01-16 19:09:26 +01:00
5607b2a57a
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-13 22:57:00 +01:00
08c52461ec
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-13 22:56:23 +01:00
d83bb06bd6
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
Restored module jetty-documentation for all profiles.
2017-01-13 22:48:00 +01:00
2a416bbc6b
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
Fixed the compact3 profile and other small fixes.
2017-01-12 19:59:11 +01:00
b7b3dfdc77
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-12 17:53:09 +01:00
e539d0b1fd
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-12 17:52:45 +01:00
11d669092a
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
243c24338f
Merge branch 'jetty-9.4.x'
2016-12-20 15:38:51 -07:00
64f714689e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-12-20 15:38:36 -07:00
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
4bfb312a8c
Updating jetty-version-maven-plugin
2016-12-20 12:28:48 -07:00
d3ce624d9a
Merged branch 'jetty-9.4.x' into 'master'.
2016-12-17 18:38:52 +01:00
02ccbefb8a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-12-17 18:38:16 +01:00
266cac25f8
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-12-16 16:34:17 -07:00
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -07:00
6d681ce999
Using jetty-version plugin 2.3
2016-12-16 15:38:11 -07:00
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
2c38511828
Updating to version 9.3.15-SNAPSHOT
2016-10-28 13:01:34 -07:00
14611d2f76
Updating to version 9.3.14.v20161028
2016-10-28 12:21:02 -07:00
90e4d162c8
Issue #907
2016-10-27 16:15:44 +11:00
714d29db76
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-26 20:39:29 +11:00
7f7021315d
fixed bad revert
2016-10-26 20:39:04 +11:00
f4e6162b98
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-26 20:32:18 +11:00
812272c658
Revert "Adding jdk9 profile"
...
This reverts commit 1151964d74
2016-10-26 20:31:42 +11:00
8421a9b200
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-10-26 11:13:03 +02:00
338e924a5d
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-10-26 11:10:19 +02:00
4cc5178944
Updated ALPN version for JDK 8u111 and 8u112.
2016-10-26 11:03:43 +02:00
53853df3bb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-26 11:20:50 +11:00
1151964d74
Adding jdk9 profile
2016-10-25 15:15:46 -07:00
458aebbd01
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-20 15:11:40 -07:00
76992139f8
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-10-20 15:11:25 -07:00
3bfc914889
More attempts at jacoco exclusions
2016-10-20 14:14:50 -07:00
2d650512bf
Skipping jacoco collection on build/test/support/integration modules
2016-10-20 12:48:32 -07:00
b8127399d7
Tweaking jacoco includes/excludes in pom.xml
2016-10-20 11:28:26 -07:00
6ded652dae
Tweaking jacoco includes/excludes
2016-10-20 09:31:00 -07:00
fccffdb526
Merge branch 'release-9.3.13' into jetty-9.3.x
2016-10-20 09:25:57 -07:00
36d75d4c4f
Merge branch 'jetty-9.4.x'
2016-10-19 10:59:28 -07:00
0651b3fa20
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-19 10:59:09 -07:00
52e81a5ef8
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-10-19 10:56:49 -07:00
91e5fb2ce5
Adding jacoco report generation and publishing
2016-10-19 08:51:45 -07:00
ade14ba34b
Updating to version 9.3.14-SNAPSHOT
2016-10-14 11:33:51 -07:00
c3a78e70a8
Updating to version 9.3.13.v20161014
2016-10-14 10:39:37 -07:00
6c3c24e7dd
Updating jetty-version-maven-plugin declaration
2016-10-14 10:34:18 -07:00
82942cb3a4
Merge branch 'jetty-9.4.x' into issue-207
2016-10-12 11:36:28 -07:00
3d69ce327e
Merge branch 'jetty-9.4.x'
2016-09-30 19:07:23 +00:00
3a34e4d21b
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-09-30 19:06:51 +00:00
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
b44b9d2540
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-09-16 11:38:01 +10:00
878f0e90a0
Updating jetty-version-maven-plugin version
2016-09-15 11:32:13 -07:00
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
fb7da26ad2
Updating to version 9.2.20-SNAPSHOT
2016-09-08 13:04:11 -07:00
7b94bc32f4
Updating to version 9.2.19.v20160908
2016-09-08 12:11:44 -07:00
0df8a766b7
Revert "Moving jetty-documentation to release profile"
...
This reverts commit a9afa20ca3
2016-08-19 15:04:03 -07:00
a9afa20ca3
Moving jetty-documentation to release profile
2016-08-19 15:03:32 -07:00
39f1d7332c
467246 - Support javax.websocket version 1.1
...
+ WIP
2016-08-19 15:03:32 -07:00
9b6af31dce
merge from 9.4.x after M1 release
2016-08-16 08:18:27 -05:00
984dd7ed3c
[maven-release-plugin] prepare for next development iteration
2016-08-15 23:04:15 +00:00
e38e6b5a7f
[maven-release-plugin] prepare release jetty-9.4.0.M1
2016-08-15 23:04:10 +00:00
eb2cadf7fe
Merge branch 'jetty-9.4.x'
2016-08-15 13:41:46 -05:00
d5960d9900
scrape out remaining monitor references
2016-08-15 13:36:50 -05:00
176ee5774c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-08-12 11:32:08 +10:00
518c1f2575
Issue #837
...
Update to apache jsp 8.5.4
2016-08-12 11:00:56 +10:00
a711fac443
Merge branch 'jetty-9.4.x'
2016-08-10 16:56:45 -05:00
7301edefde
drop jetty-monitor from build
2016-08-10 16:56:24 -05:00
5232b933a4
Issue #746 Update osgi manifests to servlet 4.0
2016-08-04 14:20:43 +10:00
225460fea3
Bumping up dependency-plugin version
2016-07-29 09:53:54 -07:00
2830e51e04
Merge branch 'jetty-9.3.x' into release-9.3.11
2016-07-28 12:20:36 -07:00
7701c1e163
Merge branch 'jetty-9.4.x'
2016-07-26 13:30:44 -07:00
b78f05f7bd
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-26 13:15:44 -07:00
4b9b7b746e
Removing duplicate dependency-plugin reference
2016-07-26 13:11:26 -07:00
514e0b6e72
Merge branch 'jetty-9.4.x'
2016-07-26 11:41:24 -07:00
8b6f4fcb5e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-26 11:41:04 -07:00
3b907b274c
Upgrading version of maven-dependency-plugin
2016-07-26 10:40:29 -07:00
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07:00
f068780749
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-20 13:19:15 +02:00
11d0569a75
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-20 13:18:26 +02:00
c09251fbaf
Updated ALPN version for JDK 8u101 and 8u102.
2016-07-20 13:17:31 +02:00
0d74c3ec2c
Updated ALPN version for JDK 8u101 and 8u102.
2016-07-20 13:05:43 +02:00
53c07a5a83
Servlet 4.0 getMappings rough implementation #746
2016-07-20 13:58:19 +10:00
2ee64a8d56
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-07 11:49:00 +10:00
8675c17d92
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-07 11:46:38 +10:00
8a12915dac
Fixing surefire random run definition
2016-07-06 11:26:54 -07:00
2dd4843e44
merge from 9.4.x
2016-06-22 15:28:17 -05:00
399c5beb04
merge from 9.3.x
2016-06-22 15:23:51 -05:00
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00
030ec61837
[maven-release-plugin] prepare for next development iteration
2016-06-22 09:14:25 -05:00
9a4cb41122
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 09:14:21 -05:00
e7034117ea
[maven-release-plugin] prepare for next development iteration
2016-06-21 08:50:13 -05:00
16c435c69d
[maven-release-plugin] prepare release jetty-9.3.10.v20160621
2016-06-21 08:50:09 -05:00
34e92ec59e
update jetty version plugin
2016-06-21 08:18:05 -05:00
abdbd177c1
Wrong version plugin (oops)
2016-06-20 09:12:05 -07:00
7b1d807e49
Updating version plugin
2016-06-20 09:10:27 -07:00
2bb060ae32
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-15 18:21:08 +10:00
5093df33dc
Issue #505
...
Updated to asm 5.1.
2016-06-15 18:20:32 +10:00
1bccf090b5
Merge branch 'jetty-9.4.x'
2016-06-13 11:51:09 -05:00
64ed45389b
Issue 589 creation of jetty-home and leveraging it in jetty-distribution
2016-06-07 15:42:10 -05:00
473c8f0c09
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-07 10:24:15 +02:00
73fe6715de
Issue #306 - Merge jetty-parent into jetty-project.
...
Moved more plugin version declarations into jetty.project's pom.
2016-06-07 10:23:38 +02:00
2d1d3fe6e9
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-06 21:39:31 +02:00
a8f25b550f
Fixes #487 - JDK 9 build compatibility.
...
Fixes #306 - Merge jetty-parent into jetty-project.
- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
2016-06-06 21:28:51 +02:00
7dc283cc0c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-05-27 16:45:04 +10:00
d6689ce803
Add memcached option for session data caching
2016-05-27 16:43:46 +10:00
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
d5c6793e6a
[maven-release-plugin] prepare for next development iteration
2016-05-17 15:33:46 -05:00
0bab7e6616
[maven-release-plugin] prepare release jetty-9.2.17.v20160517
2016-05-17 15:33:42 -05:00
9c5beaad4f
Merge branch 'jetty-9.4.x'
2016-05-03 11:36:42 -07:00
86bf31aad7
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-05-03 11:36:25 -07:00
Joakim Erdfelt
Jan Bartel
Olivier Lamy
WalkerWatch
Jesse McConnell
Simone Bordet
Greg Wilkins
olivier lamy
Joakim Erdfelt