Joakim Erdfelt
9b19374c5d
Updating to version 9.2.28-SNAPSHOT
2019-04-03 19:38:05 -05:00
Joakim Erdfelt
84dfe74b97
Updating to version 9.2.27.v20190403
2019-04-03 19:04:45 -05:00
Joakim Erdfelt
c70034766e
Updating to version 9.3.27-SNAPSHOT
2019-04-03 18:46:31 -05:00
Joakim Erdfelt
dae476e369
Updating to version 9.3.26.v20190403
2019-04-03 18:16:32 -05:00
Joakim Erdfelt
2ccde9772b
Undoing bad release-9.3.26
2019-04-03 18:11:16 -05:00
Greg Wilkins
9f4b3542cb
Updating to version 9.3.27-SNAPSHOT
2019-04-03 17:32:08 +11:00
Greg Wilkins
7ec6d2fb32
Updating to version 9.3.26.v20190403
2019-04-03 13:06:51 +11:00
Jan Bartel
de5d04177e
Issue #3399 jetty.webapps.uri should be the parent of the webapp ( #3430 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-03-14 07:59:25 +11:00
Joakim Erdfelt
5658bf96f6
Issue #1676 - Removing Deprecated Resource.getURL()
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-03-01 10:21:42 -05:00
Joakim Erdfelt
cff63f2b6a
Merge of `jetty-9.4.x` to `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-21 09:45:12 -05:00
Joakim Erdfelt
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05:00
Joakim Erdfelt
eb70b24016
Updating to version 9.4.15.v20190215
2019-02-15 11:53:00 -05:00
olivier lamy
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
Olivier Lamy
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
Simone Bordet
5f972b451c
Jetty 10.0.x 2978 add module info ( #3120 )
...
Fixes #2978 - Add module-info to relevant Jetty modules.
Added module-info.java for Jetty modules that are not test modules.
Moved jetty-http test utility classes to new module "jetty-http-tools".
Removed generation of test-jar from websocket-core.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:37:35 +01: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
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
olivier lamy
32912b922d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-06 17:39:57 +10:00
olivier lamy
1504b7da93
Revert "Issue #2431 - Upgrade to Junit 5 ( #2436 )"
...
This reverts commit e24fc48539
.
2018-09-06 09:27:11 +10:00
Joakim Erdfelt
e24fc48539
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 21:27:18 +10:00
Joakim Erdfelt
a3f1592c50
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 10:07:17 +10: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
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
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
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
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
f0ff571c98
Reverting version to 9.3.24-SNAPSHOT
2018-06-05 12:06:58 -05:00
Joakim Erdfelt
13640c297c
Bumping version to 9.3.25-SNAPSHOT
2018-06-05 11:58:37 -05:00
Joakim Erdfelt
6b0652c499
Issue #2556 - bad "file:" scheme present in Xml usage of "jetty.base" and "jetty.home" properties
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-04 13:00:49 -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
Jan Bartel
fbdc1165a3
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-04-03 12:30:40 +10:00
Mat Booth
c316cf1cfe
Make the requirement on "osgi.serviceloader.processor" optional ( #2377 )
...
This allows Eclipse to continue to make use of jetty-* bundles
without requiring the presence of Apache Aries.
This fixes a problem introduced by the resolution to #2164 and
the same solution is used as in 10cdf16
See also the discussion at Eclipse:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=532294
Signed-off-by: Mat Booth <mat.booth@redhat.com>
2018-04-03 12:25:50 +10:00
Jan Bartel
67d887758d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-03-29 17:36:29 +11:00
Joakim Erdfelt
f7953573b5
Removing old (no longer used) jetty-start reference
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-26 15:17:31 -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
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
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
Jan Bartel
df012bb0a3
Issue #2164 correct manifest headers for ServiceLoader use in osgi
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
Joakim Erdfelt
3001c8af2f
Merge remote-tracking branch 'origin/release-9.2.24' into jetty-9.2.x
2018-02-07 15:35:04 -06:00
WalkerWatch
a836e03749
Merge 9.4.x to 10.0.x
2018-01-24 09:43:16 -05:00
Greg Wilkins
e6ecdd4a7d
Issue #2136 load XmlConfiguration DTDs from same classloader
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-18 18:43:49 +01: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
bd01e1877a
Updating to version 9.2.25-SNAPSHOT
2018-01-05 11:35:42 -06:00
Joakim Erdfelt
a617842695
Updating to version 9.2.24.v20180105
2018-01-05 10:11:08 -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
Jan Bartel
e3bec841da
Issue #1838
2017-09-26 16:07:18 +10:00
Greg Wilkins
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10: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
Greg Wilkins
c9c83b846a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-09-06 11:27:32 +10:00
Greg Wilkins
aa083ff81c
Removed spurious dependency
2017-09-06 11:27:02 +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
Greg Wilkins
76981a0a15
Fixed #1715 standardise XML properties and IDs
2017-08-08 09:16:08 -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
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
Greg Wilkins
d3e50f8f80
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-22 23:37:51 +02:00
Greg Wilkins
971044fe31
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-05-22 23:35:04 +02:00
Greg Wilkins
33e2f89ccb
Fix #1567
2017-05-22 21:13:00 +02: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
Joakim Erdfelt
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
Joakim Erdfelt
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
Joakim Erdfelt
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
Joakim Erdfelt
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
Joakim Erdfelt
9e2aeda052
Updating to version 9.3.19-SNAPSHOT
2017-04-06 07:47:53 -07:00
Joakim Erdfelt
63273aa40b
Updating to version 9.3.18.v20170406
2017-04-06 06:31:02 -07:00
Joakim Erdfelt
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
Joakim Erdfelt
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
Joakim Erdfelt
a6a0ab991f
Updating to version 9.3.18-SNAPSHOT
2017-03-17 09:48:19 -07:00
Joakim Erdfelt
307d23975e
Updating to version 9.3.17.v20170317
2017-03-17 09:07:39 -07:00
Joakim Erdfelt
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
Joakim Erdfelt
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
Jesse McConnell
e695fc80d6
Updating to version 9.2.22-SNAPSHOT
2017-01-20 12:32:51 -06:00
Jesse McConnell
513b5e5f90
Updating to version 9.2.21.v20170120
2017-01-20 12:32:00 -06:00
Jesse McConnell
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
Jesse McConnell
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
Jesse McConnell
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
Jesse McConnell
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
Simone Bordet
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
Simone Bordet
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
Simone Bordet
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
Simone Bordet
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd
, reversing
changes made to 4565c186d7
.
2017-01-19 18:26:43 +01:00
Jesse McConnell
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
Jesse McConnell
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
Joakim Erdfelt
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
Joakim Erdfelt
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
Joakim Erdfelt
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
Joakim Erdfelt
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -07:00
Jesse McConnell
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
Jesse McConnell
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
Jesse McConnell
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
Jesse McConnell
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
Jan Bartel
bc96a8e0e6
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-30 15:56:04 +11:00
Greg Wilkins
32eff3ffd3
apply #1135 to XmlConfiguration
2016-11-30 09:40:09 +11:00
Greg Wilkins
bf3ea9ae44
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-18 11:19:40 +11:00
Greg Wilkins
ed14d739f3
Issue #1103 original URI trimmed
2016-11-16 23:31:03 +11:00
Joakim Erdfelt
2c38511828
Updating to version 9.3.15-SNAPSHOT
2016-10-28 13:01:34 -07:00
Joakim Erdfelt
14611d2f76
Updating to version 9.3.14.v20161028
2016-10-28 12:21:02 -07:00
Joakim Erdfelt
ade14ba34b
Updating to version 9.3.14-SNAPSHOT
2016-10-14 11:33:51 -07:00
Joakim Erdfelt
c3a78e70a8
Updating to version 9.3.13.v20161014
2016-10-14 10:39:37 -07:00
Jesse McConnell
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
Jesse McConnell
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
Joakim Erdfelt
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
Joakim Erdfelt
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
Joakim Erdfelt
fb7da26ad2
Updating to version 9.2.20-SNAPSHOT
2016-09-08 13:04:11 -07:00
Joakim Erdfelt
7b94bc32f4
Updating to version 9.2.19.v20160908
2016-09-08 12:11:44 -07:00
Joakim Erdfelt
2830e51e04
Merge branch 'jetty-9.3.x' into release-9.3.11
2016-07-28 12:20:36 -07:00
Greg Wilkins
7d4a509462
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-28 18:45:47 +10:00
Greg Wilkins
1f949d509b
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-28 18:18:11 +10:00
Greg Wilkins
35c21d7ced
Utility improvements
...
Add Arrays
XML config get class
2016-07-28 16:50:12 +10:00
Joakim Erdfelt
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
Joakim Erdfelt
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
Joakim Erdfelt
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
Joakim Erdfelt
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07:00
Simone Bordet
8f5985e0e1
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-21 18:16:01 +02:00
Simone Bordet
823ba4add6
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-21 18:15:38 +02:00
Jesse McConnell
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
Jesse McConnell
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00
Jesse McConnell
030ec61837
[maven-release-plugin] prepare for next development iteration
2016-06-22 09:14:25 -05:00
Jesse McConnell
9a4cb41122
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 09:14:21 -05:00
Jesse McConnell
e7034117ea
[maven-release-plugin] prepare for next development iteration
2016-06-21 08:50:13 -05:00
Jesse McConnell
16c435c69d
[maven-release-plugin] prepare release jetty-9.3.10.v20160621
2016-06-21 08:50:09 -05:00
Jesse McConnell
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
Jesse McConnell
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
Jesse McConnell
d5c6793e6a
[maven-release-plugin] prepare for next development iteration
2016-05-17 15:33:46 -05:00
Jesse McConnell
0bab7e6616
[maven-release-plugin] prepare release jetty-9.2.17.v20160517
2016-05-17 15:33:42 -05:00
Joakim Erdfelt
c09f31a51d
Bumping up master to version 10.0.0-SNAPSHOT
2016-04-29 11:47:15 -07:00
Joakim Erdfelt
939505c342
Updating to version 9.2.17-SNAPSHOT
2016-04-14 14:03:21 -07:00
Joakim Erdfelt
778fac638d
Updating to version 9.2.16.v20160414
2016-04-14 13:21:34 -07:00
Joakim Erdfelt
47bbd9364d
Revert "Updating to version 9.2.16.v20160414"
...
This reverts commit 29ae63855b
.
2016-04-14 13:19:59 -07:00
Joakim Erdfelt
29ae63855b
Updating to version 9.2.16.v20160414
2016-04-14 13:17:21 -07:00
Joakim Erdfelt
6fb338e50d
Updating to version 9.3.9-SNAPSHOT
2016-04-11 16:20:50 -07:00
Joakim Erdfelt
bb4f3c4882
Updating to version 9.3.9.M1
2016-04-11 15:35:22 -07:00
Joakim Erdfelt
c68d3b1d8d
Updating to version 9.3.9-SNAPSHOT
2016-03-14 09:07:52 -07:00
Joakim Erdfelt
1f3b3f31f4
Updating to version 9.3.8.v20160314
2016-03-14 08:30:20 -07:00
Joakim Erdfelt
f98dde5e5b
Updating to version 9.2.16-SNAPSHOT
2016-02-10 15:36:41 -07:00
Joakim Erdfelt
9b6890d3c1
Updating to version 9.2.15.v20160210
2016-02-10 14:49:12 -07:00
Joakim Erdfelt
e0ce545ad7
Updating to version 9.3.8-SNAPSHOT
2016-01-15 17:15:14 -07:00
Joakim Erdfelt
c0b191119b
Updating to version 9.3.7.v20160115
2016-01-15 16:40:15 -07:00
Joakim Erdfelt
b7f9c9aca9
Updating to version 9.3.7-SNAPSHOT
2016-01-13 08:21:01 -07:00
Joakim Erdfelt
21ca3f6690
Updating to version 9.3.7.RC1
2016-01-13 07:30:24 -07:00
Joakim Erdfelt
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
Joakim Erdfelt
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
Joakim Erdfelt
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
Greg Wilkins
a311c8bde1
480904 - jetty-util Loader simplification
...
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader. Multiple loaders will never be tried.
A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).
The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
2015-11-19 12:14:05 +11:00
Joakim Erdfelt
edf686fe0a
Updating to version 9.3.7-SNAPSHOT
2015-11-06 12:13:00 -07:00
Joakim Erdfelt
d737e1c638
Updating to version 9.3.6.v20151106
2015-11-06 11:09:32 -07:00
Joakim Erdfelt
ec8f8d3e4f
Updating to version 9.2.15-SNAPSHOT
2015-11-06 11:06:48 -07:00
Joakim Erdfelt
ecba378f5c
Updating to version 9.2.14.v20151106
2015-11-06 10:32:14 -07:00
Joakim Erdfelt
dde32787c4
Updating to version 9.3.6-SNAPSHOT
2015-10-12 15:47:37 -07:00
Joakim Erdfelt
29722bd880
Updating to version 9.3.5.v20151012
2015-10-12 15:10:39 -07:00
Joakim Erdfelt
2cce7510e1
Updating to 9.3.5-SNAPSHOT
2015-10-08 17:49:09 -07:00
Joakim Erdfelt
9cf0e34a1d
Updating to version 9.4.0-SNAPSHOT
2015-10-07 15:41:32 -07:00
Joakim Erdfelt
37296bec3c
Updating to version 9.3.4.v20151007
2015-10-07 14:58:38 -07:00
Jesse McConnell
6409366499
[maven-release-plugin] prepare for next development iteration
2015-08-27 10:11:29 -05:00
Jesse McConnell
3086adc965
[maven-release-plugin] prepare release jetty-9.3.3.v20150827
2015-08-27 10:11:21 -05:00
Jesse McConnell
f8734f23ce
[maven-release-plugin] prepare for next development iteration
2015-08-25 14:10:01 -05:00
Jesse McConnell
e9edf4c24b
[maven-release-plugin] prepare release jetty-9.3.3.v20150825
2015-08-25 14:09:54 -05:00
Joakim Erdfelt
a3684f7fb8
[maven-release-plugin] prepare for next development iteration
2015-07-30 09:47:57 -07:00
Joakim Erdfelt
798fc8118b
[maven-release-plugin] prepare release jetty-9.2.13.v20150730
2015-07-30 09:47:48 -07:00
Joakim Erdfelt
4b3879845d
[maven-release-plugin] prepare for next development iteration
2015-07-30 07:02:10 -07:00
Joakim Erdfelt
6b7e9ac4b0
[maven-release-plugin] prepare release jetty-9.3.2.v20150730
2015-07-30 07:02:02 -07:00
Jesse McConnell
9b790c38ce
[maven-release-plugin] prepare for next development iteration
2015-07-14 11:42:34 -05:00
Jesse McConnell
b35d32f2b8
[maven-release-plugin] prepare release jetty-9.3.1.v20150714
2015-07-14 11:42:28 -05:00
Jesse McConnell
7204707902
[maven-release-plugin] prepare for next development iteration
2015-07-09 12:14:38 -05:00
Jesse McConnell
3b1533673e
[maven-release-plugin] prepare release jetty-9.2.12.v20150709
2015-07-09 12:14:30 -05:00
Greg Wilkins
3e401a62e9
StringUtil.csvSplit(String)
2015-06-19 16:48:53 +10:00
Greg Wilkins
13b63c194b
Default values for properties in ini files
...
While this feature is not strictly needed, the patch contains some good code cleanups. So it will be applied and then the default feature
removed in a subsequent commit.
2015-06-19 15:27:47 +10:00
Jesse McConnell
60e45a940e
[maven-release-plugin] prepare for next development iteration
2015-06-15 15:34:11 -05:00
Jesse McConnell
d3dec8d513
[maven-release-plugin] prepare release jetty-9.2.12.M0
2015-06-15 15:34:03 -05:00
Joakim Erdfelt
cf6c4a914e
Updating version to 9.3.1-SNAPSHOT
2015-06-15 10:25:49 -07:00
Joakim Erdfelt
1a9da9f9e4
Updating versions to 9.3.0.v20150612
2015-06-12 09:34:24 -07:00
Joakim Erdfelt
496b4dfc83
[maven-release-plugin] prepare for next development iteration
2015-06-11 15:08:36 -07:00
Joakim Erdfelt
f53c5d8fac
[maven-release-plugin] prepare release jetty-9.3.0.v20150611
2015-06-11 15:08:29 -07:00
Greg Wilkins
5e8652536c
469341 Not possible to use old/deprecated start properties
...
Improved warnings so that if both and and new properties are set a warning is still generated that says the new property was used.
Bug: 469341
2015-06-10 13:06:03 +10:00
Jesse McConnell
bfe6c2638e
[maven-release-plugin] prepare for next development iteration
2015-05-29 09:06:42 -05:00
Jesse McConnell
71e0f4d8ce
[maven-release-plugin] prepare release jetty-9.2.11.v20150529
2015-05-29 09:06:36 -05:00
Greg Wilkins
69bf5ab46c
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2015-05-29 21:05:26 +10:00
Greg Wilkins
4472b614b9
468747 - XSS vulnerability in HttpSpiContextHandler
2015-05-29 20:12:57 +10:00
Jesse McConnell
a7087cbfbf
[maven-release-plugin] prepare for next development iteration
2015-05-28 10:06:51 -05:00
Jesse McConnell
913c63e597
[maven-release-plugin] prepare release jetty-9.2.11.v20150528
2015-05-28 10:03:44 -05:00
Simone Bordet
f645e18622
Fixed DTD by declaring new elements Id, Name, Deprecated, Default, Class and Type.
2015-05-12 10:58:00 +02:00
Greg Wilkins
df61317f84
466645 Allow XmlConfiguration Properties to use Elements or Attributes
...
implemented for Array and Map
2015-05-08 08:47:38 +10:00
Greg Wilkins
e580f57d6e
466645 Allow XmlConfiguration Properties to use Elements or Attributes
...
implemented for New element
2015-05-07 20:15:24 +10:00
Greg Wilkins
5d041ad54f
466645 Allow XmlConfiguration Properties to use Elements or Attributes
2015-05-07 16:24:11 +10:00
Joakim Erdfelt
ed22d7e0de
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 16:11:01 -07:00
Simone Bordet
337e0bd8c9
464606 - Support property expansion in "default" attribute of Property.
2015-04-14 22:11:59 +02:00
Simone Bordet
599ab9bb1b
460671 - Rationalize property names.
...
Property format is now "jetty.<module|component>.<propertyName>".
Updated all references with new properties.
2015-04-13 16:21:48 +02:00
Greg Wilkins
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
Jesse McConnell
da4f95f3d3
[maven-release-plugin] prepare for next development iteration
2015-03-25 09:08:27 -05:00
Jesse McConnell
e92fd438fd
[maven-release-plugin] prepare release jetty-9.2.11.M0
2015-03-25 09:08:21 -05:00
Jesse McConnell
e3fd0056cf
[maven-release-plugin] prepare for next development iteration
2015-03-10 08:00:22 -05:00
Jesse McConnell
9d648f4000
[maven-release-plugin] prepare release jetty-9.2.10.v20150310
2015-03-10 08:00:14 -05:00
Jesse McConnell
1659d83978
[maven-release-plugin] prepare for next development iteration
2015-02-24 10:38:33 -06:00
Jesse McConnell
dc0c3f4c52
[maven-release-plugin] prepare release jetty-9.2.9.v20150224
2015-02-24 10:38:28 -06:00
Simone Bordet
1c00cdc7c9
460670 - Support multiple names in <Property> elements.
2015-02-24 10:54:20 +01:00
Jesse McConnell
ce5db2ca55
[maven-release-plugin] prepare for next development iteration
2015-02-17 16:02:22 -06:00
Jesse McConnell
26b7597928
[maven-release-plugin] prepare release jetty-9.2.8.v20150217
2015-02-17 16:02:16 -06:00
Jesse McConnell
aa22842c20
[maven-release-plugin] prepare for next development iteration
2015-01-16 17:48:29 -06:00
Jesse McConnell
8c58a9abc4
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 17:48:23 -06:00
Jesse McConnell
81bb8411d1
[maven-release-plugin] prepare for next development iteration
2015-01-16 12:06:36 -06:00
Jesse McConnell
7865f88b81
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 12:06:30 -06:00
Jesse McConnell
db991355a2
[maven-release-plugin] prepare for next development iteration
2015-01-16 10:41:45 -06:00
Jesse McConnell
6930abb8d3
[maven-release-plugin] prepare release jetty-9.2.7.v20140116
2015-01-16 10:41:39 -06:00
Jesse McConnell
9225b124a4
[maven-release-plugin] prepare for next development iteration
2015-01-16 08:21:35 -06:00
Jesse McConnell
ebd563e64d
[maven-release-plugin] prepare release 9.2.7.v20140116
2015-01-16 08:21:29 -06:00
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Jan Bartel
bc22ba72dc
[maven-release-plugin] prepare for next development iteration
2014-12-05 16:45:12 +01:00
Jan Bartel
1cc075cf98
[maven-release-plugin] prepare release jetty-9.2.6.v20141205
2014-12-05 16:45:01 +01:00
Jesse McConnell
127b48c932
[maven-release-plugin] prepare for next development iteration
2014-12-03 09:00:57 -06:00
Jesse McConnell
028f4b9610
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 09:00:46 -06:00
Jesse McConnell
1263d1f3c8
[maven-release-plugin] prepare for next development iteration
2014-12-03 08:26:47 -06:00
Jesse McConnell
5c7f706496
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 08:26:35 -06:00
Joakim Erdfelt
ed594425d3
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/config/etc/jetty.xml
jetty-server/src/main/config/modules/server.mod
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-11-25 12:09:21 -07:00
Greg Wilkins
ed0954f6d6
ignore bad test
2014-11-21 10:53:57 +11:00
Greg Wilkins
121a8b6ee8
improved debugging
2014-11-21 10:00:18 +11:00