1
0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-14 18:44:52 +00:00

1515 Commits

Author SHA1 Message Date
Joakim Erdfelt
9b19374c5d Updating to version 9.2.28-SNAPSHOT 2019-04-03 19:38:05 -05:00
Joakim Erdfelt
84dfe74b97 Updating to version 9.2.27.v20190403 2019-04-03 19:04:45 -05:00
Joakim Erdfelt
c70034766e Updating to version 9.3.27-SNAPSHOT 2019-04-03 18:46:31 -05:00
Joakim Erdfelt
dae476e369 Updating to version 9.3.26.v20190403 2019-04-03 18:16:32 -05:00
Joakim Erdfelt
2ccde9772b Undoing bad release-9.3.26 2019-04-03 18:11:16 -05:00
Joakim Erdfelt
1f046f44fe Fixing CRLF issues.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 15:24:29 -05:00
Joakim Erdfelt
edaefdbb3b Fixing CRLF files 2019-04-03 11:56:07 -05:00
Greg Wilkins
9f4b3542cb Updating to version 9.3.27-SNAPSHOT 2019-04-03 17:32:08 +11:00
Greg Wilkins
7ec6d2fb32 Updating to version 9.3.26.v20190403 2019-04-03 13:06:51 +11:00
Joakim Erdfelt
9cdb59d4d7 Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
Joakim Erdfelt
eb70b24016 Updating to version 9.4.15.v20190215 2019-02-15 11:53:00 -05:00
Simone Bordet
6f7e1e3c48 Fixes - Jetty 10 standalone cannot start on the module-path.
Added --add-modules=ALL-MODULE-PATH by default because now Jetty has
proper JPMS modules and when starting in standalone mode only the
org.eclipse.jetty.xml module will be in the module graph - while
before automatic modules where added to the module graph implicitly.

Added --add-reads=ALL-UNNAMED to the websocket module to allow the
websocket implementation to access method handles of application
classes (the websocket endpoints) that live in the web application
classloader (which forms an unnamed module).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-07 17:48:17 +01:00
Simone Bordet
2a8b4c4c47 Updated ALPN to JDK 8u201 and 8u202.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:25:39 +01:00
Simone Bordet
0e17b56aaf Updated ALPN to JDK 8u201 and 8u202.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:12:25 +01:00
Simone Bordet
cdd553332c Updated ALPN version for JDK 8u201 and 8u202. 2019-01-16 17:03:51 +01:00
olivier lamy
63f2023e05 happy new year!!
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
Olivier Lamy
9b7afd8a03
Happy new year!! ()
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
fe1b515d25 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-10-21 10:18:36 +11: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
41663d8e5c Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-10-11 00:36:10 +02:00
Simone Bordet
1fe6c92ee9 Issue - Require JDK 11 for Jetty 10.x.
First pass at making Jetty 10.x require JDK 11.

* Removed JDK 8 modules (in particular ALPN and ALPN *.mod files).
* Removed profiles targeting JDK 8, 9 and 10.
* Updated dependencies to newer versions that support JDK 11.
* Temporarily commented out the Jetty Maven Plugins due to
maven-plugin-plugin not working with JDK 11.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-03 11:15:30 +02:00
Simone Bordet
02eccd55ae Issue - 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 - 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 - 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 - 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 - 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
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 - Upgrade to Junit 5 ()"
This reverts commit e24fc485396852569b0a6dac32d8872fa15ef297.
2018-09-06 09:27:11 +10:00
Joakim Erdfelt
e24fc48539 Issue - Upgrade to Junit 5 ()
+ 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 
+ 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 - Upgrade to Junit 5 ()
+ 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 
+ 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
f15bd225b4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-08-21 14:47:19 +10:00
Greg Wilkins
45d5bd2cae Issue --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
0892ed8983 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-07-18 16:25:39 +02:00