Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-23 16:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,762 Commits 55 Branches 466 Tags
Commit Graph

795 Commits

Author SHA1 Message Date
Joakim Erdfelt
68a9498092 Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 11:51:55 -05:00
Joakim Erdfelt
5dbc0bdaa5
Merge pull request #3745 from eclipse/jetty-9.4.x-3743-xmlconfig-locations 
Issue #3743 - Using Location based XmlConfiguration where possible
 2019-06-10 11:08:51 -05:00
Joakim Erdfelt
59ce0ea0e3 Issue #3743 - Cleanup requested from PR 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 10:12:39 -05:00
Joakim Erdfelt
ff43fd3de4 Issue #3743 - More changes from review of PR 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 09:58:53 -05:00
Simone Bordet
2523e828b3 Issue #3751 - Use Modern DTD/FPI consistently. 
Fixed duplicate `redirectEntity()` after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-10 16:09:49 +02:00
Joakim Erdfelt
a8d008b851 Issue #3743 - Making new ConfigurationProcessor interface default 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 08:19:59 -05:00
Joakim Erdfelt
bb0c87a42a Issue #3743 - Addressing PR review items 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 07:56:46 -05:00
Simone Bordet
826d68e80a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-10 11:41:47 +02:00
Joakim Erdfelt
63109108a8 Issue #3751 - Use Modern DTD/FPI consistently 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-07 07:21:59 -05:00
Joakim Erdfelt
66aa966596 Revert "Issue #3743 - Updating usages of configure_9_3.dtd to use proper syntax" 
This reverts commit fc97acf1ea8f2b6bf6f530518766c18d283f9ba0.
 2019-06-07 07:03:44 -05:00
Joakim Erdfelt
0c23808827 Issue #3743 - Applying changes from PR feedback. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-06 17:38:54 -05:00
Joakim Erdfelt
fc97acf1ea Issue #3743 - Updating usages of configure_9_3.dtd to use proper syntax 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-06 14:06:46 -05:00
Joakim Erdfelt
c065eaa3cc Issue #3743 - Handling StringReader using try-with-resources 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-06 14:06:23 -05:00
Joakim Erdfelt
a72a6ab875 Issue #3743 - Using Location based XmlConfiguration where possible 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-06 12:27:41 -05:00
Joakim Erdfelt
6686083462 Issue #3743 - Using only Location based XmlConfiguration in Jetty itself 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-06 11:55:01 -05:00
Lachlan Roberts
bb65167549 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-05 01:34:53 +10:00
Simone Bordet
2688ed55e5 Issue #3713 - Emit warning when invoking deprecated method in Jetty XML. 
Added warnings for deprecated field get/set.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-04 10:24:13 +02:00
Simone Bordet
4058abd7c7 Issue #3713 - Emit warning when invoking deprecated method in Jetty XML. 
Improved test case to test for log lines with deprecation warnings.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-03 16:08:33 +02:00
Simone Bordet
8dc9f745ff Issue #3713 - Emit warning when invoking deprecated method in Jetty XML. 
Fixed return value from varargs methods.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-03 16:07:45 +02:00
olivier lamy
9802e7dca5 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-05-31 19:45:15 +10:00
Simone Bordet
fe94da9e46 Issue #3713 - Emit warning when invoking deprecated method in Jetty XML. 
Added warnings for invocation of deprecated constructors and methods.
Moved methods exclusively used by XmlConfiguration from TypeUtil.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-05-30 22:27:27 +02:00
Simone Bordet
4bc4a60e8d Code cleanup and reformatting. 
Javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-05-30 19:22:37 +02:00
Joakim Erdfelt
52bb963186 Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	aggregates/jetty-all-compact3/pom.xml
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
#	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
#	jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
#	jetty-http2/http2-alpn-tests/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
#	jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
#	jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
#	jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
#	pom.xml
#	tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
#	tests/test-http-client-transport/pom.xml
#	tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
 2019-05-01 15:02:31 -05:00
Joakim Erdfelt
41ab9baf8c Standardizing on hamcrest Matchers (not CoreMatchers from junit4) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-30 14:39:57 -05:00
Joakim Erdfelt
734be56938 Updating to version 9.4.19-SNAPSHOT 2019-04-29 16:27:23 -05:00
Joakim Erdfelt
e1bc35120a Updating to version 9.4.18.v20190429 2019-04-29 15:40:33 -05:00
Joakim Erdfelt
05bb111580 Updating to version 9.4.18-SNAPSHOT 2019-04-18 15:59:49 -05:00
Joakim Erdfelt
aa1c656c31 Updating to version 9.4.17.v20190418 2019-04-18 14:44:28 -05:00
Joakim Erdfelt
79537a5f51 Updating to version 9.4.17-SNAPSHOT 2019-04-11 11:00:24 -05:00
Joakim Erdfelt
e0aa4ae4c0 Updating to version 9.4.16.v20190411 2019-04-11 10:01:26 -05: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 e24fc485396852569b0a6dac32d8872fa15ef297.
 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
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
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