Joakim Erdfelt
|
591b0a2e37
|
Post-Merge build fixes
|
2018-06-12 12:54:41 -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
|
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
|
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
|
8763c6065d
|
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
|
2018-04-20 11:32:46 -05:00 |
Olivier Lamy
|
f36eba4577
|
class.newInstance is deprecated #2435 (#2437)
* Class.newInstance() is deprecated in Java 9+ #2435
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
|
2018-04-17 19:07:20 +10: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 |
WalkerWatch
|
534b8ea38b
|
Add edit warning for .mod files. Resolves #173
|
2018-03-15 13:23:42 -04: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 |
Lachlan Roberts
|
a639ee9275
|
Resolved errorprone MissingOverride warnings #2206
`@Override` was added to methods which were missing the annotation #2206
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
|
2018-03-01 13:59:25 +11:00 |
|
Joakim Erdfelt
|
d5a0878019
|
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
|
2018-01-09 10:08:30 -06:00 |
|
Joakim Erdfelt
|
41ed9f29f4
|
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
|
2018-01-09 09:37:25 -06:00 |
|
Joakim Erdfelt
|
fa4c7b0ca9
|
Issue #2108 - Updating license headers for year 2018
|
2018-01-09 08:39:37 -06:00 |
|
Joakim Erdfelt
|
067fc5d2d8
|
Issue #2108 - Upgrade licenses for 2018
|
2018-01-09 07:42:06 -06:00 |
|
Joakim Erdfelt
|
2dd970b055
|
Updating to version 9.2.24-SNAPSHOT
|
2017-12-18 10:43:47 -06:00 |
|
Joakim Erdfelt
|
cdbe733684
|
Updating to version 9.2.23.v20171218
|
2017-12-18 09:06:48 -06:00 |
|
Joakim Erdfelt
|
ff53002fac
|
Updating to version 9.4.9-SNAPSHOT
|
2017-11-21 13:11:31 -07:00 |
|
Joakim Erdfelt
|
82b8fb23f7
|
Updating to version 9.4.8.v20171121
|
2017-11-21 12:33:52 -07:00 |
Jesse McConnell
|
a72eb0001d
|
Updating to version 9.3.23-SNAPSHOT
|
2017-10-30 15:39:57 -05:00 |
|
Jesse McConnell
|
705048cc49
|
Updating to version 9.3.22.v20171030
|
2017-10-30 15:16:29 -05:00 |
|
Joakim Erdfelt
|
d9865a02ba
|
Updating to version 9.4.8-SNAPSHOT
|
2017-09-14 08:44:27 -07:00 |
|
Joakim Erdfelt
|
80fb788d0c
|
Updating to version 9.4.7.v20170914
|
2017-09-14 07:35:18 -07:00 |
Jan Bartel
|
56e40b3011
|
Issue #1597
Reinstate changes after incorrect merge from jetty-9.4.x branch.
|
2017-08-30 12:26:05 +10:00 |
|
Joakim Erdfelt
|
3ec5f8fa3d
|
Merge remote-tracking branch 'origin/jetty-9.4.x'
|
2017-08-09 16:21:08 -07:00 |
|
Joakim Erdfelt
|
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 |
|
Joakim Erdfelt
|
ce4a8df311
|
Fixing module [name] warning
|
2017-08-08 09:14:59 -07:00 |
|
Jan Bartel
|
3296c01e8e
|
Issue #1600
|
2017-08-08 09:13:29 -07:00 |
|
Jan Bartel
|
77d96ff36d
|
Issue ##1597
Make osgi import of javax.mail optional
|
2017-08-08 09:13:18 -07:00 |
|
Joakim Erdfelt
|
3fdbcffbbd
|
Updating to version 9.2.23-SNAPSHOT
|
2017-08-08 09:12:55 -07:00 |
|
Joakim Erdfelt
|
a7bcac6d75
|
Updating to version 9.3.20.v20170531
|
2017-08-08 09:07:35 -07:00 |
|
Joakim Erdfelt
|
11a544d6ac
|
Updating to version 9.3.22-SNAPSHOT
|
2017-08-01 11:26:37 -07:00 |
|
Joakim Erdfelt
|
bb1d69ca52
|
Updating to version 9.3.21.M0
|
2017-08-01 10:47:04 -07:00 |
|
Jan Bartel
|
21b1ecef7b
|
Issue #1597
Removed javax.mail and javax.transaction jars and tidied up dependencies for test webapps.
|
2017-06-21 16:20:01 +02:00 |
|
Jan Bartel
|
c115b4a229
|
Issue #1597
A change to jetty-jndi/pom.xml was not merged from jetty-9.4.x
|
2017-06-09 20:15:22 +02:00 |
|
Joakim Erdfelt
|
76ace004b6
|
Merge remote-tracking branch 'origin/jetty-9.4.x'
|
2017-06-09 09:17:43 -07:00 |
|
Jan Bartel
|
10a6e5fa5e
|
Issue #1600
|
2017-06-09 11:55:21 +02:00 |
|
Joakim Erdfelt
|
5ee1c7a533
|
Merge branch 'release-9.4.6' into jetty-9.4.x
|
2017-06-07 10:01:11 -07:00 |
|
Jan Bartel
|
4204061bd4
|
Issue ##1597
Make osgi import of javax.mail optional
|
2017-06-07 11:59:53 +02:00 |
|
Joakim Erdfelt
|
4d2c299fe8
|
Updating to version 9.2.23-SNAPSHOT
|
2017-06-06 08:55:12 -07:00 |
|
Joakim Erdfelt
|
0af30bce5a
|
Updating to version 9.2.22.v20170606
|
2017-06-06 07:03:05 -07:00 |
|
Joakim Erdfelt
|
6a3c40e935
|
Updating to version 9.4.7-SNAPSHOT
|
2017-05-31 17:26:34 -07:00 |
|
Joakim Erdfelt
|
8ba0f2d95d
|
Updating to version 9.4.6.v20170531
|
2017-05-31 16:22:52 -07:00 |
|
Joakim Erdfelt
|
429380d36a
|
Updating to version 9.3.21-SNAPSHOT
|
2017-05-31 16:10:04 -07:00 |
|
Joakim Erdfelt
|
0f3b1cbe36
|
Updating to version 9.3.20.v20170531
|
2017-05-31 15:24:57 -07:00 |
|
Joakim Erdfelt
|
cf56168f7d
|
Updating to version 9.3.20-SNAPSHOT
|
2017-05-02 15:26:56 -07:00 |
|
Joakim Erdfelt
|
d36d57d5c7
|
Updating to version 9.3.19.v20170502
|
2017-05-02 14:31:51 -07:00 |