Commit Graph

370 Commits

Author SHA1 Message Date
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
Simone Bordet 932f1a7516 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-10-17 15:49:54 +02:00
Simone Bordet 44ac57040a Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-10-17 12:36:56 +02:00
Simone Bordet add74bf889 Updated ALPN version for JDK 8u191 and 8u192.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-17 11:56:39 +02: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 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 516d93c488 Updating to version 9.2.27-SNAPSHOT 2018-08-06 11:33:22 -05:00
Joakim Erdfelt 8c637489ae Updating to version 9.2.26.v20180806 2018-08-06 10:51:25 -05:00
Joakim Erdfelt 9e97c50d90 Merge branch 'release-9.2.25' into jetty-9.2.x 2018-08-06 10:27:39 -05:00
Simone Bordet 06303492f9 There already exist JDK 12 early access builds.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-18 17:43:49 +02:00
Simone Bordet eceaff7bed Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-07-18 16:21:00 +02:00
Simone Bordet 37e4da24cb Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-07-18 16:15:27 +02:00
Simone Bordet 7845497702 Updated ALPN version for JDK 8u181.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-18 15:47:39 +02: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
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
Joakim Erdfelt 0e6c91b604 Updating to version 9.2.26-SNAPSHOT 2018-06-06 18:54:58 -05:00
Joakim Erdfelt 4830fd15e9 Updating to version 9.2.25.v20180606 2018-06-06 16:42:54 -05: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 5eefa90e05 Updating to version 9.3.25-SNAPSHOT 2018-06-05 13:13:07 -05:00
Joakim Erdfelt 84205aa28f Updating to version 9.3.24.v20180605 2018-06-05 12:11:03 -05:00
Joakim Erdfelt f0ff571c98 Reverting version to 9.3.24-SNAPSHOT 2018-06-05 12:06:58 -05:00
Joakim Erdfelt 13640c297c Bumping version to 9.3.25-SNAPSHOT 2018-06-05 11:58:37 -05:00
Olivier Lamy 07b3367519 #2472 it looks https://central.maven.org/maven2 does not work anymore (#2538)
* #2472 it looks https://central.maven.org/maven2 does not work anymore

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

* #2472 add unit test we correctly download files from default repo

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

* use maven format to download alpn boot jar modules

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

* change default to https://repo1.maven.org/maven2 #2472

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-18 08:21:29 +10:00
Joakim Erdfelt 1732ffca51 Updating to version 9.4.11-SNAPSHOT 2018-05-03 11:48:05 -05:00
Joakim Erdfelt daa59876e6 Updating to version 9.4.10.v20180503 2018-05-03 10:55:19 -05:00
Simone Bordet 6e2cd06c89 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-04-20 10:31:39 +02:00
Simone Bordet 8323417622 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-04-20 10:27:14 +02:00
Simone Bordet d7ce334f8f Updated ALPN version for JDK 8u171 and 8u172.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-20 10:16:50 +02: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
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
Simone Bordet afd0677719 Fixes #2358 - Add ALPN module file for JDK 10.
Also added ALPN module file for JDK 11.
Removed merge leftovers under directory protonego-impl/.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-20 11:00:47 +01:00
WalkerWatch 534b8ea38b Add edit warning for .mod files. Resolves #173 2018-03-15 13:23:42 -04:00
Joakim Erdfelt a05b157c03 Updating to version 9.3.24-SNAPSHOT 2018-02-28 16:39:30 -06:00
Joakim Erdfelt 0554f8d8b4 Updating to version 9.3.23.v20180228 2018-02-28 15:45:57 -06:00
Joakim Erdfelt 3001c8af2f Merge remote-tracking branch 'origin/release-9.2.24' into jetty-9.2.x 2018-02-07 15:35:04 -06:00
Simone Bordet 43f99d8857 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-01-17 12:00:13 +01:00
Simone Bordet 53eebd045c Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-01-17 11:56:26 +01:00
Simone Bordet 3de4de99d3 Updated ALPN version for JDK 8u161 and 8u162.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-01-17 11:46:12 +01: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
Joakim Erdfelt bd01e1877a Updating to version 9.2.25-SNAPSHOT 2018-01-05 11:35:42 -06:00