2720868475
Updating to version 9.4.12.v20180830
2018-08-30 08:56:44 -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
45d5bd2cae
Issue #2719 --list-config shows properties from files
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-21 12:19:11 +10:00
96218e8bc4
Fix typos detected by github.com/client9/misspell
...
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
2018-08-10 23:52:16 +09:00
516d93c488
Updating to version 9.2.27-SNAPSHOT
2018-08-06 11:33:22 -05:00
8c637489ae
Updating to version 9.2.26.v20180806
2018-08-06 10:51:25 -05:00
9e97c50d90
Merge branch 'release-9.2.25' into jetty-9.2.x
2018-08-06 10:27:39 -05: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
346879f2a5
Merge pull request #2664 from mperktold/jetty-9.4.x
...
Issue #2662 Unnecessary boxing conversions
2018-06-13 22:52:27 +02:00
f901efc413
Issue #2662 - Unnecessary boxing conversions
...
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-13 16:20:12 +02: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
71dc6d9ceb
delete file if exist to prevent build failure for non clean build #2650 ( #2651 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-12 09:23:39 +02: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
04c1447f88
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2018-05-21 16:34:06 -05:00
4f947c7ee5
Issue #2556 - Adding Testcase to verify report
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-21 16:32:56 -05:00
07b3367519
#2472 it looks https://central.maven.org/maven2 does not work anymore ( #2538 )
...
* #2472 it looks https://central.maven.org/maven2 does not work anymore
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* #2472 add unit test we correctly download files from default repo
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use maven format to download alpn boot jar modules
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* change default to https://repo1.maven.org/maven2 #2472
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-18 08:21:29 +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
d9de386b28
Updated documentation in light of #2403 .
2018-05-02 10:34:29 -04:00
0ea704a29a
Fixing merge issue
2018-04-25 16:30:47 -05:00
47586c5449
Fix typo ( #2480 )
...
* fix typo for #2403
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* default url to download artifacts must be https per default #2472
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use dot rather than dashes
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use central.maven.org as default
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-26 06:20:01 +10:00
fbbf5d2d2d
allow --add-to-start to specify maven repository location #2403 ( #2473 )
...
* allow --add-to-start to specify maven repository location #2403
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-25 10:57:45 +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
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
b26817767b
Fixed test that was not working with JDK 11.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-10 11:11:31 +02: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
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
afd0677719
Fixes #2358 - Add ALPN module file for JDK 10.
...
Also added ALPN module file for JDK 11.
Removed merge leftovers under directory protonego-impl/.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-20 11:00:47 +01:00
534b8ea38b
Add edit warning for .mod files. Resolves #173
2018-03-15 13:23:42 -04:00
44546e5ca9
Fixing jetty-start tests
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-15 07:36:50 -05:00
4ce7e9591b
Safer simpler version parsing #2284
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-15 22:49:20 +11:00
a128b87e3a
Jetty 9.4.x #2279 start update params ( #2285 )
...
Jetty 9.4.x #2279 start update params (#2285 ):
* Cleanup and Unify param update logic #2279
* Cleanup system property source #2279
* Cleanup property source #2279
* Property cleanup for #2279
* Removed duplicate Prop and Property classes
* properties are only updated/set if value source is not from ?=
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-07 16:33:28 +11:00
bcb9fa3b32
Merge pull request #2257 from lachlan-roberts/jetty-9.4.x-2206-ReferenceEquality
...
Resolved errorprone ReferenceEquality warnings #2206
2018-03-07 11:11:40 +11: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
020ebde77c
found additional ReferenceEquality warnings which have been resolved
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-06 14:28:11 +11:00
e2b9351662
Avoid NPE in exception for bad version #2284
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-06 13:13:41 +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
716a703b4e
support 10 as well
...
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
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
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06:00
21365234f8
Issue #2108 - Updating license headers for year 2018
2018-01-09 09:44:41 -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
b2ff7c5cb8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-08 21:30:12 +01:00
26a4909c88
Use shaded utils in start for JavaVersion and TopologicalSort #2090 ( #2094 )
...
* shaded TopologicalSort. Use shaded start in jetty-home
* removed unused property
* jetty-start shaded dependency
* removed component dependencies from TopologicalSort
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-06 11:23:37 +01: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
595c6ac1ee
Issue #2090 Java Version JEP223. Use shaded util in start.
2018-01-04 13:13:39 +01: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
7f6e2e8dd0
Issue #1933
...
Cherry-pick of 29373c644d170e
2017-11-22 13:53:38 +01:00
24699b75e4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-11-21 23:21:15 +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
44d170e2e0
Issue #1933
...
Do not set java.class.path when running with the distro.
2017-11-21 18:12:16 +01: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
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
8bcf10395d
Fix #1814 Java Version utility
2017-10-17 15:25:25 +11:00
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10: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
3399fd36dc
Fix #1814 Java Version utility
2017-09-13 15:20:43 +10:00
89bcba9a78
Clean imports in start
2017-09-06 12:02:16 +10:00
3ec5f8fa3d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-09 16:21:08 -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
a2d63141e9
Fixed location of ALPN files for JDK 8u141.
2017-08-08 09:15:16 -07:00
489f68c708
Fixes #1685 - Update ALPN support for Java 8u141.
2017-08-08 09:15:12 -07:00
3fdbcffbbd
Updating to version 9.2.23-SNAPSHOT
2017-08-08 09:12:55 -07:00
a7bcac6d75
Updating to version 9.3.20.v20170531
2017-08-08 09:07:35 -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
6782a6fafd
Fixed location of ALPN files for JDK 8u141.
2017-07-24 10:50:48 +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
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
ee8d4c1587
gitattributes followup
2017-07-06 16:24:31 -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
2fac7f07aa
Issue #207 - Support javax.websocket version 1.1
...
+ Removing more EventDriver references
+ Fixing bad implementation exposed by testcases
# Conflicts:
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/AbstractJsrEventDriver.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointImpl.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEventDriverFactory.java
2017-06-26 11:24:30 -07:00
4d2c299fe8
Updating to version 9.2.23-SNAPSHOT
2017-06-06 08:55:12 -07: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
04b6afe879
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-05-15 09:48:41 -07:00
873c3554e7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-12 14:06:21 -07:00
04019675f6
Issue #1505 remove trailing / from jetty.home.uri
2017-05-12 10:55:35 +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
9e65d1ebcb
Issue #1505
...
* minor cleanups of ClasspathPattern
* defined jetty.home.uri and jetty.base.uri in start.jar and webapp configuration properties
* minor cleanup of start.jar property handling (more needed)
* updated location classpathpatterns in modules
2017-04-26 14:54:37 +02:00
849ad7c917
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-04-21 09:00:54 -07:00
68c7a1d960
Fixes #1494
...
Converted dependencies from a Set to a List, so the order of dependencies
can be used to help select between multiple provides. More specifically,
stop an unordered Set allowing one dependency to trigger a default provider
when an earlier specified dependency enables a specific provider.
2017-04-21 14:26:28 +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
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
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
9273d99a99
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-03-15 15:07:17 -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
3c29947a0d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-02-15 11:54:57 -07:00
4eda32ddca
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-02-15 11:54:19 -07:00
852d9d5c01
Issue #1326 - Search system properties too for --stop
...
+ The NPE should be cleared up as well
2017-02-15 10:38:37 -07:00
Jesse McConnell
Greg Wilkins
Kazuhiro Sera
Joakim Erdfelt
Simone Bordet
Matthias Perktold
Olivier Lamy
WalkerWatch
Lachlan Roberts
olivier lamy
Jan Bartel