Commit Graph

17283 Commits

Author SHA1 Message Date
Joakim Erdfelt 59a9a0114a More junit5 test fixes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-12 16:55:01 -05: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
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
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
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
olivier lamy 8a05c651c0 Revert "fix merging"
This reverts commit a3e4a08903.
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 2018-09-04 16:08:21 -05:00
Jesse McConnell 8dd05ac3f7
merge from 9.4.x 2018-09-04 13:48:43 -05:00
Jesse McConnell 0ae0c500f0
Merge pull request #2879 from eclipse/jetty-9.4.x-2878-javadoc-gen-fix
Issue #2878 fix post release javadoc generation
2018-09-04 13:34:15 -05:00
Jan Bartel d0b98186c0
Issue 2865 update to jasper 8.5.33 (#2870)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-04 14:25:27 +10:00
Jan Bartel fe3816d05a
Issue #2866 Put back jstl dep for jetty jspc maven plugin (#2869)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-04 14:25:10 +10:00
Olivier Lamy 44ace1f8c8
cleanup Jenkinsfile: non needed/unused variable (#2880)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-03 16:19:18 +10:00
Jesse McConnell 3bea46c03c
clean out comment 2018-08-31 16:22:25 -05:00
Jesse McConnell e893dd2546
update instructions 2018-08-31 16:05:00 -05:00
Jesse McConnell 44c95865f2
Issue #2878 fix post release javadoc generation 2018-08-31 15:57:38 -05:00
Simone Bordet 4bbb41a450 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-08-31 19:10:21 +02:00
Simone Bordet 831b684300 Issue #2871 - Server reads -1 after client resets HTTP/2 stream.
Backported to jetty-9.3.x branch.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-31 19:07:57 +02: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 a878170e22
Merge pull request #2872 from eclipse/jetty-9.4.x-2871-wrong_eof_after_http2_reset
Issue #2871 - Server reads -1 after client resets HTTP/2 stream.
2018-08-30 15:12:38 +02:00
Simone Bordet eb87415ed6 Issue #2871 - Server reads -1 after client resets HTTP/2 stream.
HttpInput.consume() now checks if the state is already failed,
and if so it does not change it when consuming the input.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-30 11:47:50 +02:00
Olivier Lamy 9cb9be83fd Issue #2846 Jaas ldap unit test (#2864)
* #2846 add jaas ldap unit tests

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-30 14:17:08 +10:00
olivier lamy a82d09829e fix parent version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-30 13:47:00 +10:00
WalkerWatch d95b39f5f7 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-08-29 12:16:26 -04:00
WalkerWatch 88363dd3c1 Cleaning up note. 2018-08-29 12:15:37 -04: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 7cf027b98f Jetty 9.4.x 2711 tls 13 compliance (#2857)
Issue #2711 - TLS 1.3 compliance.

Disabled few tests that are TLS 1.2 specific.
Renegotiation in SslConnection is now skipped for TLS 1.3.
Replaced SNI keystore DSA certificate with RSA certificate.
First full build achieved with JDK 11+28.
Small changes after review.
Modified the test case to pass in JDK 8, where the implementation
throws SSLException, while in later JDKs throws SSLHandshakeException.
Minor cleanup

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-28 21:43:45 +10:00
WalkerWatch 90f15f278b 9.4.x->10.0.x 2018-08-27 22:58:01 -04:00
WalkerWatch 9f6747d741 Updated gzip doc. Resolves #2845 2018-08-27 22:52:58 -04:00
Greg Wilkins 05d4049d46 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2018-08-28 10:53:20 +10:00
Jan Bartel 09be34e08b
Issue #2844 Clean up webdefault and DefaultServlet documentation (#2851)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-08-28 09:53:06 +10:00
Simone Bordet 5b5f2fcf5f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-08-27 10:29:12 +02:00