Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,372 Commits 69 Branches 465 Tags 359 MiB
Commit Graph

530 Commits

Author SHA1 Message Date
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 8763c6065d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-04-20 11:32:46 -05:00
Jan Bartel 0e88849a68
Issue #2164 Make osgi.serviceloader mostly optional (#2408) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-04-18 14:48:53 +10: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 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 93b6877d72 Issue #2210 - fixing flaw in safety checks with JSR356 ClientContainer 2018-03-14 16:18:19 -05:00
Joakim Erdfelt 5541fcbdba Issue #2282 - final testing tweaks 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-03-07 18:34:03 -06:00
Joakim Erdfelt abf1262848 Issue #2282 - More work on websocket server side tests 2018-03-07 14:29:22 -06:00
Joakim Erdfelt dd57cf0bf6 Issue #2282 - Simplifying BlockheadClient to drastically reduce CPU load during testing 2018-03-06 21:01:39 -06: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 1373025dff Issue #2282 - removing EventQueue from websocket tests 2018-03-05 17:52:23 -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
Jan Bartel 17f518ffb1 Issue #2164 Update websocket manifests for osgi and add test in osgi 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-02-20 16:28:39 +11:00
Greg Wilkins b94d26a720 less fragile tests 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-02-20 10:19:32 +11:00
Joakim Erdfelt 650b804142 Issue #2108 - Updating license headers for year 2018 2018-01-09 10:14:52 -06: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 21365234f8 Issue #2108 - Updating license headers for year 2018 2018-01-09 09:44:41 -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
Greg Wilkins 45e3abbdcf Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-01-09 13:17:32 +01:00
olivier lamy 1a49a6fb7e more javadoc fixes #2056 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2018-01-08 12:28:12 +11: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
Joakim Erdfelt 752fda19b9 Fixes #1767 - removing debug output from testing 2017-09-06 10:14:49 -07:00
Joakim Erdfelt 02f0649840 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-28 11:33:12 -07:00
Joakim Erdfelt f8d29c5f28 Fixed #1766 - client container is managed now 2017-08-23 15:20:47 -07:00
Joakim Erdfelt 2ed620b1f4 Fixed #1766 - removing common executor/bufferpool in JettyClientContainerProvider 2017-08-23 14:46:41 -07:00
WalkerWatch d5a9f0e0e5 EOL Fix 2017-08-09 17:42:15 -04:00
Joakim Erdfelt 71d5fcf246 Fixing javadoc errors 2017-08-08 11:09:25 -07:00
Joakim Erdfelt 952bb8dfdd Fixing compilation 2017-08-08 10:40:58 -07:00
Joakim Erdfelt 54367621e4 Fixing cdi/websocket pom versions 2017-08-08 09:54:09 -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 af4962f842 Issue #1605 - common executor and bufferpool for jsr356 client 2017-08-08 08:49:57 -07:00
Joakim Erdfelt 0de3673132 Issue #1605 - restoring default behavior of ContainerProvider.getWebSocketContainer() 
+ Allowing users to reconfigure JettyClientContainerProvider to restore
  the Jetty 9.4.x behavior for singletons and ServerContainer behaviors
 2017-08-08 08:49:57 -07:00
Joakim Erdfelt 5b72d8a733 Issue #1604 - WebSocketContainer stop is now smarter 2017-08-08 08:49:56 -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 a9c329859d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-12 13:18:12 -07:00
Joakim Erdfelt 2e8f9fc748 Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch" 
This reverts commit 38c112764d.
 2017-07-12 11:28:32 -07:00
Joakim Erdfelt 986e49ab35 Issue #1650 - fixing Suspend/Resume in websockets 2017-07-06 16:24:07 -07:00