Commit Graph

2506 Commits

Author SHA1 Message Date
Olivier Lamy 71a1801433
Issue #2918 restore a TestTracker with junit5 (#2927)
* add TestTracker junit5 extension #2918

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-21 14:03:05 +10:00
Olivier Lamy 98cc338d2e
get rid of remaining legacy junit (#2900)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-13 07:11:09 +10:00
Joakim Erdfelt a69ad3912d Fixing #2481 - PathWatcherDemo NPE
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-11 13:21:37 -05: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
Simone Bordet 1383f60249 Updated Maven Plugin and dependencies versions.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-29 12:22:51 +02:00
Simone Bordet 3b6fa32684
Merge pull request #2855 from eclipse/jetty-9.4.x-issue-2807-new-ssl-exclusions
Issue #2807 - Updating Default TLS Cipher Suite Exclusions
2018-08-24 17:25:49 +02:00
Simone Bordet 325f943834 Issue #2807 - Updating Default TLS Cipher Suite Exclusions.
Clarified comment about exclusions.
2018-08-24 17:24:40 +02:00
Joakim Erdfelt 5e07592a69 Issue #2807 - Updating Default TLS Cipher Suite Exclusions
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-24 06:48:16 -05:00
Greg Wilkins c7fc674846
Issue #2798 thread budget warning default to available cores (#2799)
* Issue #2798 thread budget warning default to available cores
* Issue #2798 - Testcase example for ExecutorThreadPool
* Issue #2798 - Better TestCases for ThreadPoolBudget
* Simplified
* Issue #2798 - ThreadPoolBudget improvements.
* Removed unused imports.
* Made fields private.
* Removed field info.
* Changed the logic to print the info on leases only when warning or throwing.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-24 10:15:55 +10:00
Greg Wilkins 460f3fcb9b
Close on graceful #2749 (#2772)
Cleanup of Graceful shutdown, plus ensure Connection:close if connector is shutdown for #2749 
* WIP close connection when shutting down
* WIP use HttpChannel.Listener
* cleanups
* support graceful stop of a context
* only close connections if the connector is shutdown
* minor cleanups
* fixed toString and test
* fixed imports
* Move close logic to HttpConnection
* fixed generator to not override persistent
* Issue #2749 - Close connections on graceful shutdown.
* Small fix after review.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-23 08:08:17 +10:00
Joakim Erdfelt c640f4a4d5 Issue #2811 - Dump fix JreDisabled:java.security to JVM:disabled
+ ensuring SLOTH fix still works with updated testcase
+ Dump detection of JreDisabled:java.security only checked
  default SSLEngine.enabledCipherSuites
  New implementation changes meaning to be more general
  JVM:disabled (as in not selected by default), and
  only reports it as disabled in the dump if not specifically
  included from the SSLEngine.supportedCipherSuites via
  the SslContextFactory.includedCipherSuites configuration

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-16 13:49:28 -05:00
Kazuhiro Sera 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
Olivier Lamy f4a0bfbdd8
Issue #2746 jmh module (#2750)
#2746 move jmh classes to a dedicated jmh module

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-04 14:08:13 +10:00
Olivier Lamy 0ba1d9b5a5
Issue #307 datecache contention (#2725)
* use DateTimeFormatter which is threadsafe so no need of synchronized block  #307

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-07-26 20:46:50 +10: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
Greg Wilkins 4f54447585
Jetty 9.4.x 2501 accept listener (#2511)
* Issue #2501 - Accept Listener
* Issue #2501 - Include accepting connections in connection limit.
* AcceptRateLimit minimal delay

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-19 09:03:54 +02:00
Greg Wilkins 92ba1375be
Merge pull request #2641 from eclipse/jetty-9.4.x-901-load_truststore
Issue #901 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType.
2018-06-19 09:01:17 +02:00
Simone Bordet 253c637742
Fixes #2663 - Guard Throwable.addSuppressed() calls. (#2665)
* Fixes #2663 - Guard Throwable.addSuppressed() calls.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-14 15:21:44 +02:00
Greg Wilkins 346879f2a5
Merge pull request #2664 from mperktold/jetty-9.4.x
Issue #2662 Unnecessary boxing conversions
2018-06-13 22:52:27 +02:00
Matthias Perktold f901efc413 Issue #2662 - Unnecessary boxing conversions
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-13 16:20:12 +02:00
Simone Bordet 5165b082b5 Issue #901 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType.
Improved defaulting values for the truststore, avoiding to default
the password, which is often missing for a truststore.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-08 17:40:23 +02: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
Greg Wilkins 9713dbccd5 Issue #2075 cleanup MultiException to better use suppressed (#2105)
* Issue #2075 cleanup multiexceptio to better use suppressed
* Update MultiException.java fixes from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-07 12:51:58 +02:00
Joakim Erdfelt ce09e48b5b [WIP] Issue #2597 - Improving UnixSocketTest behavior. (#2635)
* Issue #2597 - Improving UnixSocketTest behavior.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

jnr doesn't like filename/path with strange character so use a new property for jenkins build with docker

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-07 15:39:56 +10:00
Joakim Erdfelt b98dcb4155 Revert "Fixing #2628 - using proper target/tests/ directory"
This reverts commit 9209343

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-06 20:05:06 -05:00
Joakim Erdfelt 9209343bce Fixing #2628 - using proper target/tests/ directory
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-06 16:14:49 -05:00
Greg Wilkins 74fc3710ba Issue #2628 Ignore test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-06 11:05:53 +02: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 79935b92ae Issue #2575 - Work around bad Bundle.getEntry() behavior with unescaped URLs (#2590)
* Adding test case to verify existing PathResource behavior
* Skipping Resource class usage in OSGi entirely
* Only using the URL class, and removing of conversions to
  other more correct forms (File and URI)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-05 10:12:50 +02:00
Simone Bordet 65748093bd Fixes #2618 - ProcessorUtilsTest fragile.
Introduced ProcessorUtils.setAvailableProcessor(int) to allow
usage in embedded code without resorting to system properties.

Refactored the static initializer to be testable.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-04 18:15:45 +02:00
Simone Bordet 77df9e1d87 Fixes #2619 - Test Failure: QueuedThreadPoolTest.testThreadPool().
Now newly created threads set _lastShrink to avoid they are immediately
removed from the pool if they happen to meet the shrink conditions.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-04 17:46:08 +02:00
Simone Bordet c6cc33805f Issue #2619 - Test Failure: QueuedThreadPoolTest.testThreadPool().
Cleanup of QueuedThreadPoolTest.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-04 17:46:08 +02:00
Simone Bordet 5fc0f323aa Fixes #2568 - QueuedThreadPool.getBusyThreads() should take into account ReservedThreadExecutor.getAvailable().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-01 17:14:07 +02:00
Joakim Erdfelt c4bcc4005a Merge branch 'jetty-9.4.x-issue-2560-pathresource-exceptions' of github.com:eclipse/jetty.project into jetty-9.4.x-issue-2560-pathresource-exceptions 2018-05-31 11:32:24 -05:00
Joakim Erdfelt ad4dceb1c0 Issue #2560 - Moving InvalidPath logic from PathResource to ResourceContentFactory
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-31 11:31:36 -05:00
Joakim Erdfelt c36390967f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-issue-2560-pathresource-exceptions 2018-05-31 10:15:11 -05:00
Greg Wilkins eb3461fd84
Merge pull request #2582 from LukeButtersFunnelback/jetty-9.4.x
Stop creating unnecessary exceptions with MultiException #2580
2018-05-30 11:18:08 +02:00
Luke Butters e7b3f6319e Remove the virtual method called from constructor & simulate a builder.
1. The virtual method to stop fillInStackTrace() from being called by the
constructor has been removed.
2. The public no argument constructor for MultiException puts the class
into a builder mode where it just lets you add exceptions.
MultiException created from the constructor should not be thrown because
fillInStackTrace() is not called.
3. In the `ifExceptionThrow*()` methods a new `MultiException` is
created, with the stack trace filled, before it is thrown.

Signed-off-by: Luke Butters <lbutters@funnelback.com>
2018-05-30 17:04:24 +10:00
Joakim Erdfelt be61fabc63 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-issue-2560-pathresource-exceptions 2018-05-29 12:09:07 -05:00
Greg Wilkins 2bcc528920 expand spruious tabs in java sources
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-29 10:40:09 +02:00
Luke Butters 7e3242b5cc Stop creating unnecessary exceptions with MultiException #2580
This doesn't actually stop creating the unnecessary exception instead it
stop running the expensive `fillInStackTrace()` unless we actually need
it.

This does result in the stack trace being set to where we throw the
exception rather than when we create it.

Signed-off-by: Luke Butters <lbutters@funnelback.com>
2018-05-29 13:43:17 +10:00
Joakim Erdfelt 65de2c6690 Issue #2560 - Review of PathResource exception handling
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-22 10:30:30 -05:00
Greg Wilkins bf8dd121b0 reduced test race
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-18 10:20:47 +10:00
Simone Bordet d8795350a4 Issue #2525 - Clean up SharedBlockingCallback.
Cosmetics.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-15 17:05:24 +02:00
Simone Bordet b4f2e6ddea Issue #2525 - Clean up SharedBlockingCallback.
Improved tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-14 12:11:10 +02:00
Simone Bordet a719c29b40 Issue #2525 - Clean up SharedBlockingCallback.
Improved test logging.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-14 12:08:33 +02:00