Commit Graph

651 Commits

Author SHA1 Message Date
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
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
olivier lamy 716a703b4e support 10 as well
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-18 19:01:24 +10: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
Greg Wilkins 595c6ac1ee Issue #2090 Java Version JEP223. Use shaded util in start. 2018-01-04 13:13:39 +01:00
Jan Bartel 7f6e2e8dd0 Issue #1933
Cherry-pick of 29373c6 and 44d170e
2017-11-22 13:53:38 +01: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
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
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
Simone Bordet a2d63141e9 Fixed location of ALPN files for JDK 8u141. 2017-08-08 09:15:16 -07:00
Simone Bordet 489f68c708 Fixes #1685 - Update ALPN support for Java 8u141. 2017-08-08 09:15:12 -07:00
Simone Bordet b616249603 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-08-01 11:14:28 +02:00
Simone Bordet d4d5211ede Fixes #1702 - Update ALPN for JDK 8u144. 2017-08-01 11:05:30 +02:00
Simone Bordet 6782a6fafd Fixed location of ALPN files for JDK 8u141. 2017-07-24 10:50:48 +02:00
Simone Bordet a0026fd9d2 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-07-24 10:44:39 +02:00
Simone Bordet 3f94a5d132 Fixes #1685 - Update ALPN support for Java 8u141. 2017-07-24 10:08:10 +02:00
Greg Wilkins 04019675f6 Issue #1505 remove trailing / from jetty.home.uri 2017-05-12 10:55:35 +02:00
Simone Bordet 861372c70d Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-02 22:16:45 +02:00
Simone Bordet c955fb609e Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-05-02 22:12:29 +02:00
Simone Bordet 9ba7b713d2 Fixes #1523 - Update ALPN support for Java 8u131. 2017-05-02 22:01:00 +02:00
Greg Wilkins 9e65d1ebcb Issue #1505
* minor cleanups of ClasspathPattern
* defined jetty.home.uri and jetty.base.uri in start.jar and webapp configuration properties
* minor cleanup of start.jar property handling (more needed)
* updated location classpathpatterns in modules
2017-04-26 14:54:37 +02:00
Greg Wilkins 68c7a1d960 Fixes #1494
Converted dependencies from a Set to a List, so the order of dependencies
can be used to help select between multiple provides.  More specifically,
stop an unordered Set allowing one dependency to trigger a default provider
when an earlier specified dependency enables a specific provider.
2017-04-21 14:26:28 +10:00
Joakim Erdfelt 4eda32ddca Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-02-15 11:54:19 -07:00
Joakim Erdfelt 852d9d5c01 Issue #1326 - Search system properties too for --stop
+ The NPE should be cleared up as well
2017-02-15 10:38:37 -07:00
Joakim Erdfelt 5e57b9562f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:14:10 -07:00
Joakim Erdfelt 9a8f22d5dd Testing Updates
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
  in jetty-test-helper and the test classes.
2017-02-02 15:51:38 -07:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
2017-01-19 18:26:43 +01:00