Joakim Erdfelt
|
2d9f1a22af
|
Merge branch 'jetty-9.4.x' into jetty-10.0.x
|
2018-11-15 07:06:53 -06:00 |
|
Joakim Erdfelt
|
29fd18e046
|
Updating to version 9.4.15-SNAPSHOT
|
2018-11-14 16:42:40 -06:00 |
|
Joakim Erdfelt
|
c4550056e7
|
Updating to version 9.4.14.v20181114
|
2018-11-14 15:19:10 -06:00 |
|
Joakim Erdfelt
|
024d24fe8b
|
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
|
2018-11-12 10:05:33 -06:00 |
|
Joakim Erdfelt
|
a903017f5f
|
Updating to version 9.4.14-SNAPSHOT
|
2018-11-11 21:06:50 -06:00 |
|
Joakim Erdfelt
|
49123a3313
|
Updating to version 9.4.13.v20181111
|
2018-11-11 20:02:42 -06:00 |
Simone Bordet
|
4c1a0f9138
|
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
|
2018-10-17 15:56:05 +02:00 |
|
Simone Bordet
|
932f1a7516
|
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
|
2018-10-17 15:49:54 +02:00 |
|
Simone Bordet
|
44ac57040a
|
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
|
2018-10-17 12:36:56 +02:00 |
olivier lamy
|
32912b922d
|
Merge branch 'jetty-9.4.x' into jetty-10.0.x
|
2018-09-06 17:39:57 +10:00 |
Jesse McConnell
|
c249685953
|
merge from 9.3.x
|
2018-09-05 10:27:31 -05:00 |
|
Jesse McConnell
|
863a19bccf
|
Updating to version 9.3.26-SNAPSHOT
|
2018-09-04 17:23:31 -05:00 |
|
Jesse McConnell
|
3ce520221d
|
Updating to version 9.3.25.v20180904
|
2018-09-04 16:08:21 -05:00 |
|
Jesse McConnell
|
8dd05ac3f7
|
merge from 9.4.x
|
2018-09-04 13:48:43 -05:00 |
|
Jesse McConnell
|
dcf6a8fa9f
|
Updating to version 9.4.13-SNAPSHOT
|
2018-08-30 10:48:22 -05:00 |
|
Jesse McConnell
|
2720868475
|
Updating to version 9.4.12.v20180830
|
2018-08-30 08:56:44 -05:00 |
Greg Wilkins
|
f15bd225b4
|
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
|
2018-08-21 14:47:19 +10:00 |
|
Greg Wilkins
|
babdd5d4b7
|
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
|
2018-08-16 08:44:07 +10:00 |
|
Greg Wilkins
|
2c0557b1ae
|
VERSION.txt cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2018-08-16 08:33:29 +10:00 |
|
Greg Wilkins
|
5ee856c0c1
|
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
|
2018-08-12 16:59:33 +10:00 |
|
Greg Wilkins
|
b3d1c240e1
|
fixed VERSION.txt for 9.3.18
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2018-08-12 16:59:03 +10:00 |
|
Joakim Erdfelt
|
516d93c488
|
Updating to version 9.2.27-SNAPSHOT
|
2018-08-06 11:33:22 -05:00 |
|
Joakim Erdfelt
|
8c637489ae
|
Updating to version 9.2.26.v20180806
|
2018-08-06 10:51:25 -05:00 |
|
Joakim Erdfelt
|
9390c2df3f
|
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
|
2018-08-06 09:04:58 -05:00 |
|
Joakim Erdfelt
|
321b4b4f7a
|
Updating VERSION.txt
|
2018-08-01 12:26:58 -05:00 |
|
Simone Bordet
|
0892ed8983
|
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
|
2018-07-18 16:25:39 +02:00 |
|
Joakim Erdfelt
|
0b69f00665
|
Updating to version 9.4.12-SNAPSHOT
|
2018-07-11 17:32:16 -05:00 |
|
Joakim Erdfelt
|
260596dd10
|
Updating to version 9.4.12.RC0
|
2018-07-11 16:30:55 -05:00 |
|
Joakim Erdfelt
|
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 |
|
Joakim Erdfelt
|
3932b11e64
|
Merge remote-tracking branch 'origin/release-9.4.11' into jetty-9.4.x
|
2018-06-07 14:31:24 -05:00 |
|
Joakim Erdfelt
|
bf5697cc14
|
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
|
2018-06-07 14:31:10 -05:00 |
|
Joakim Erdfelt
|
0e6c91b604
|
Updating to version 9.2.26-SNAPSHOT
|
2018-06-06 18:54:58 -05:00 |
|
Joakim Erdfelt
|
4830fd15e9
|
Updating to version 9.2.25.v20180606
|
2018-06-06 16:42:54 -05:00 |
|
Joakim Erdfelt
|
e4bfe00dce
|
Updating to version 9.4.12-SNAPSHOT
|
2018-06-05 14:18:37 -05:00 |
|
Joakim Erdfelt
|
d5fc0523cf
|
Updating to version 9.4.11.v20180605
|
2018-06-05 13:23:02 -05:00 |
|
Joakim Erdfelt
|
5eefa90e05
|
Updating to version 9.3.25-SNAPSHOT
|
2018-06-05 13:13:07 -05:00 |
|
Joakim Erdfelt
|
84205aa28f
|
Updating to version 9.3.24.v20180605
|
2018-06-05 12:11:03 -05:00 |
|
Joakim Erdfelt
|
e89180698c
|
Improving VERSION.txt
|
2018-06-05 12:08:46 -05:00 |
|
Joakim Erdfelt
|
734af26ccb
|
Updating to version 9.3.25-SNAPSHOT
|
2018-05-21 13:46:46 -05:00 |
|
Joakim Erdfelt
|
e2a533fd3d
|
Updating to version 9.3.24.v20180521
|
2018-05-21 12:52:08 -05:00 |
|
Joakim Erdfelt
|
1732ffca51
|
Updating to version 9.4.11-SNAPSHOT
|
2018-05-03 11:48:05 -05:00 |
|
Joakim Erdfelt
|
daa59876e6
|
Updating to version 9.4.10.v20180503
|
2018-05-03 10:55:19 -05:00 |
|
Joakim Erdfelt
|
f56fb440a5
|
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
|
2018-03-26 11:50:47 -05:00 |
|
Joakim Erdfelt
|
e2cd16f8aa
|
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
|
2018-03-26 11:38:04 -05:00 |
|
Joakim Erdfelt
|
1c04f9838d
|
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
|
2018-03-22 16:42:42 -05:00 |
|
Joakim Erdfelt
|
c3cc138a3b
|
Updating to version 9.4.10-SNAPSHOT
|
2018-03-20 08:25:59 -05:00 |
|
Joakim Erdfelt
|
1f8159b1e4
|
Updating to version 9.4.9.v20180320
|
2018-03-20 07:18:24 -05:00 |
|
Joakim Erdfelt
|
e3e3f9eb0b
|
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
|
2018-03-06 11:16:25 -06:00 |
|
Joakim Erdfelt
|
a05b157c03
|
Updating to version 9.3.24-SNAPSHOT
|
2018-02-28 16:39:30 -06:00 |
|
Joakim Erdfelt
|
0554f8d8b4
|
Updating to version 9.3.23.v20180228
|
2018-02-28 15:45:57 -06:00 |