17407 Commits

Author SHA1 Message Date
Olivier Lamy
27179786a0
fix groovy variable scope (#2905) 2018-09-14 15:17:50 +10:00
Olivier Lamy
3793fe5ae9
upgrade junit 5.3.1 (#2904) 2018-09-14 12:00:08 +10:00
Joakim Erdfelt
6f50afde38 Fixing groovy error on isMainBuild
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-13 20:57:55 -05:00
Joakim Erdfelt
2d44cc3189 Migrating websocket tests to junit5
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-13 20:55:49 -05:00
Joakim Erdfelt
62da301e19 Re-enabling maven threaded testing
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-12 19:10:46 -05:00
Joakim Erdfelt
a9d394f0af Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2018-09-12 16:55:36 -05:00
Joakim Erdfelt
59a9a0114a More junit5 test fixes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-12 16:55:01 -05: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
ae169aa624 Fixing #2875 - WebSocketClient upgrade with redirect support
+ Using HttpClient fixes from #2901 to allow upgrader to be
  held for entire conversation regardless of authentication
  or redirect behaviors.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-12 15:57:31 -05:00
Joakim Erdfelt
00843c8ed9 Issue #2901 - Moving Http Upgrader to Http Conversation
+ Solves for Authentication and Redirect

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-12 14:35:01 -05:00
Greg Wilkins
4b461b7556 DelegatingThreadPool as TryExecutor
Noticed while looking at #2718, it is more efficient if tryExecute semantics are available.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-12 16:42:05 +10:00
Joakim Erdfelt
aebe436e00 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2018-09-11 13:22:12 -05: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
olivier lamy
5aaae07b94 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-11 21:09:14 +10:00
Olivier Lamy
1b330f2efc
inherit plugin versions from main pom (#2897)
* inherit plugin versions from main pom

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-11 21:05:37 +10:00
Алексей Пастухов
04941fd44c Issue #2691 replace static dn by subtee based ldap lookup for an entry inside _userBaseDn (#2842)
* replace static dn by subtee based ldap lookup for an entry inside _userBaseDn
* additional ldap tests to cover enhancement of #2842

Signed-off-by: Alexei Pastuchov <alexei.pastuchov@telecolumbus.de>
2018-09-11 15:57:48 +10:00
olivier lamy
a8e9a8a78b Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-11 14:21:49 +10:00
Jan Bartel
2dd5fec4f4
Issue #2740 Ensure OSGiWebappClassLoader uses bundleloader for all loadClass methods. (#2804)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-11 12:04:31 +10:00
Jan Bartel
5056ac5895
Issue #2834 Make ASM version error message friendlier (#2887)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-11 09:28:06 +10:00
Joakim Erdfelt
79460a7cdb Back to jdk11 default (non-ea)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-10 10:19:57 -05:00
Joakim Erdfelt
de4fcd3932 Back to jdk11 default (non-ea)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-10 08:14:56 -05:00
Olivier Lamy
154e5ea1a5
align plugin version (#2893)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-10 18:38:34 +10:00
Joakim Erdfelt
a07f6cf7b9 Using declared default for Jetty 10.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-10 02:03:43 -05:00
Joakim Erdfelt
9d811ba5de Bumping build timeout to 2 hours
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-10 02:03:26 -05:00
Olivier Lamy
0c97d28cba
java 8 required (#2885)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-10 12:32:45 +10:00
olivier lamy
5910c064e8 remove unused import
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-10 12:05:32 +10:00
Joakim Erdfelt
b9b0166065 Temporarily removing maven threaded execution to isolate specific tests that cause hangs 2018-09-08 08:38:30 -05:00
Joakim Erdfelt
d1602d340f Attempting to use older jdk-11-ea+18 JRE
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-07 16:15:08 -05:00
Joakim Erdfelt
cbcd0e4caf Simplifying Jenkinsfile even more
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-07 15:22:45 -05:00
Joakim Erdfelt
980cde7f70 Greatly simplifying Jenkinsfile build
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-07 14:56:31 -05:00
Joakim Erdfelt
0ec0216542 Fixing bad merge of pom.xml
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-07 14:56:20 -05:00
Joakim Erdfelt
4978321a93 More post-merge IPv6 test corrections (missed merges)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-07 13:55:21 -05:00
Joakim Erdfelt
d237b5ca2f Fixing missed merge of ProxyConfigurationTest 2018-09-07 11:58:30 -05:00
Joakim Erdfelt
d134c9b8fa Fixing missed merge of HostPort 2018-09-07 11:19:25 -05:00
Joakim Erdfelt
bcb5da0224 Minor correction in JRE execution for SslBytesClientTest now that Java 12-ea's are out 2018-09-07 09:55:37 -05:00
Simone Bordet
82c04f3ae8 Fixed typos SPENGO -> SPNEGO.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-07 10:12:06 +02:00
Simone Bordet
f3fb290b2a Fixed test to not run on JDK 11 due to TLS 1.3.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-06 11:29:14 +02: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
olivier lamy
8a05c651c0 Revert "fix merging"
This reverts commit a3e4a08903912c7b7b3f77ca72591dac1355f832.
2018-09-06 09:26:57 +10:00
Olivier Lamy
2cbe395f29
Cleanup jaas ldaptest (#2881)
* reduce test verbosity

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* reduce verbosity of failed login

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* apply jan changes

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix javadoc

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-06 08:05:47 +10:00
Jan Bartel
ffb11fd98f Fix junit version in jetty-maven-plugin 2018-09-06 07:36:47 +10:00
Jesse McConnell
c249685953
merge from 9.3.x 2018-09-05 10:27:31 -05:00
Joakim Erdfelt
ba3c95abd0 Removing updatePolicy/always 2018-09-05 08:09:00 -05:00
olivier lamy
a3e4a08903 fix merging
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 22:05:18 +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 jetty-9.3.25.v20180904 2018-09-04 16:08:21 -05:00
Jesse McConnell
8dd05ac3f7
merge from 9.4.x 2018-09-04 13:48:43 -05:00