Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,558 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

1274 Commits

Author SHA1 Message Date
Simone Bordet cdd553332c Updated ALPN version for JDK 8u201 and 8u202. 2019-01-16 17:03:51 +01:00
Olivier Lamy 9b7afd8a03
Happy new year!! (#3232) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-01 11:52:16 +10:00
Joakim Erdfelt 29fd18e046 Updating to version 9.4.15-SNAPSHOT 2018-11-14 16:42:40 -06:00
Joakim Erdfelt c4550056e7 Updating to version 9.4.14.v20181114 2018-11-14 15:19:10 -06:00
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
Greg Wilkins d048dd321e
Merge branch 'jetty-9.4.x' into jetty-9.4.x 2018-10-18 17:07:24 +11: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
Simone Bordet 02eccd55ae Issue #2191 - JPMS Support. 
NPE fixes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-09-28 10:22:51 +02:00
Simone Bordet 587ecfeb9c Issue #2191 - JPMS Support. 
Code cleanups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-09-26 13:36:51 +02:00
Simone Bordet 81d02893dc Issue #2191 - JPMS Support. 
Using BaseHome.getPaths() to resolve paths for patches modules.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-09-26 13:21:40 +02:00
Simone Bordet e4ff653295 Issue #2191 - JPMS Support. 
Introduced --jpms option in jetty-start to run Jetty from the module-path.

Introduced [jpms] sections in *.mod files, to specify JPMS command line
options that needs to be added to the command line generated by jetty-start.

Bumped java.transaction-api to 1.3 because it has Automatic-Module-Name.

Fixed ASM version lookup using ManifestUtils.

Fixed WebInfConfiguration.findAndFilterContainerPaths() to properly
scan the module-path, which may contain both files and directories.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-09-25 22:11:25 +02:00
Simone Bordet 78d529b13a Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'. 2018-09-24 15:23:30 +02:00
Simone Bordet 60e3562f99 Issue #2191 - JPMS Support 
Turns out that Package.getImplementationVersion() and similar return
null when running from the module path, so the logic in StartArgs
broke and prevented Jetty to start.

Introduced ManifestUtils to retrieve the manifest file from JarFile,
so that attribute entries can be retrieved independently from the JDK
version or module-path vs class-path.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-09-17 19:32:00 +02:00
Yanming Zhou cd7138131e Fix outdated bundle vendor 
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2018-09-12 10:56:05 +08: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
Greg Wilkins 45d5bd2cae Issue #2719 --list-config shows properties from files 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-08-21 12:19:11 +10: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
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 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
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
Olivier Lamy 71dc6d9ceb delete file if exist to prevent build failure for non clean build #2650 (#2651) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-06-12 09:23:39 +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
Joakim Erdfelt 04c1447f88 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2018-05-21 16:34:06 -05:00
Joakim Erdfelt 4f947c7ee5 Issue #2556 - Adding Testcase to verify report 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-05-21 16:32:56 -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
WalkerWatch d9de386b28 Updated documentation in light of #2403. 2018-05-02 10:34:29 -04:00
Joakim Erdfelt 0ea704a29a Fixing merge issue 2018-04-25 16:30:47 -05:00
Olivier Lamy 47586c5449
Fix typo (#2480) 
* fix typo for #2403

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

* default url to download artifacts must be https per default #2472

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

* use dot rather than dashes

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

* use central.maven.org as default

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-04-26 06:20:01 +10:00
Olivier Lamy fbbf5d2d2d
allow --add-to-start to specify maven repository location #2403 (#2473) 
* allow --add-to-start to specify maven repository location #2403

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-04-25 10:57:45 +10: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
Simone Bordet b26817767b Fixed test that was not working with JDK 11. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-04-10 11:11:31 +02: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 44546e5ca9 Fixing jetty-start tests 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-03-15 07:36:50 -05:00
Greg Wilkins 4ce7e9591b Safer simpler version parsing #2284 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-03-15 22:49:20 +11:00
Greg Wilkins a128b87e3a
Jetty 9.4.x #2279 start update params (#2285) 
Jetty 9.4.x #2279 start update params (#2285):
* Cleanup and Unify param update logic #2279
* Cleanup system property source #2279
* Cleanup property source #2279
* Property cleanup for #2279
* Removed duplicate Prop and Property classes
* properties are only updated/set if value source is not from ?=

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-03-07 16:33:28 +11:00
Greg Wilkins bcb9fa3b32
Merge pull request #2257 from lachlan-roberts/jetty-9.4.x-2206-ReferenceEquality 
Resolved errorprone ReferenceEquality warnings #2206
 2018-03-07 11:11:40 +11:00
Lachlan Roberts 020ebde77c found additional ReferenceEquality warnings which have been resolved 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-03-06 14:28:11 +11:00
Greg Wilkins e2b9351662 Avoid NPE in exception for bad version #2284 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-03-06 13:13:41 +11: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
olivier lamy 716a703b4e support 10 as well 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2018-02-18 19:01:24 +10: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
Greg Wilkins 26a4909c88
Use shaded utils in start for JavaVersion and TopologicalSort #2090 (#2094) 
* shaded TopologicalSort. Use shaded start in jetty-home
* removed unused property
* jetty-start shaded dependency
* removed component dependencies from TopologicalSort

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-01-06 11:23:37 +01:00
Joakim Erdfelt bd01e1877a Updating to version 9.2.25-SNAPSHOT 2018-01-05 11:35:42 -06:00
Joakim Erdfelt a617842695 Updating to version 9.2.24.v20180105 2018-01-05 10:11:08 -06:00
Greg Wilkins 595c6ac1ee Issue #2090 Java Version JEP223. Use shaded util in start. 2018-01-04 13:13:39 +01: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
Jan Bartel 7f6e2e8dd0 Issue #1933 
Cherry-pick of 29373c6 and 44d170e
 2017-11-22 13:53:38 +01: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
Jan Bartel 44d170e2e0 Issue #1933 
Do not set java.class.path when running with the distro.
 2017-11-21 18:12:16 +01: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
Simone Bordet f8ce63c125 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-10-18 10:53:16 +02:00
Simone Bordet 55d461ae17 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-10-18 10:50:40 +02:00
Simone Bordet a74ad00b77 Update ALPN support for Java 8u151 and 8u152. 2017-10-18 10:44:18 +02:00
Greg Wilkins 8bcf10395d Fix #1814 Java Version utility 2017-10-17 15:25:25 +11: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
Greg Wilkins 3399fd36dc Fix #1814 Java Version utility 2017-09-13 15:20:43 +10:00
Greg Wilkins 89bcba9a78 Clean imports in start 2017-09-06 12:02:16 +10:00
Joakim Erdfelt 1311052b15 Cleaning up state of branch to match the original jetty-9.4.x 
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
 2017-08-08 09:47:04 -07:00
Joakim Erdfelt 585f126b48 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x-clean 2017-08-08 09:24:41 -07:00
Simone Bordet a8ca4d23c6 Fixes #1702 - Update ALPN for JDK 8u144. 2017-08-08 09:15:38 -07:00