Commit Graph

1412 Commits

Author SHA1 Message Date
Joakim Erdfelt 38c112764d Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch 2017-06-28 16:42:37 -07:00
Joakim Erdfelt 2fac7f07aa Issue #207 - Support javax.websocket version 1.1
+ Removing more EventDriver references
+ Fixing bad implementation exposed by testcases

# Conflicts:
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/AbstractJsrEventDriver.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrAnnotatedEventDriver.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointImpl.java
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEventDriverFactory.java
2017-06-26 11:24:30 -07:00
Joakim Erdfelt 4d2c299fe8 Updating to version 9.2.23-SNAPSHOT 2017-06-06 08:55:12 -07:00
Joakim Erdfelt 0af30bce5a Updating to version 9.2.22.v20170606 2017-06-06 07:03:05 -07:00
Joakim Erdfelt 5d7e97993c Merge remote-tracking branch 'origin/master' into issue-207-master 2017-06-05 10:05:05 -07:00
Joakim Erdfelt 6a3c40e935 Updating to version 9.4.7-SNAPSHOT 2017-05-31 17:26:34 -07:00
Joakim Erdfelt 8ba0f2d95d Updating to version 9.4.6.v20170531 2017-05-31 16:22:52 -07:00
Joakim Erdfelt 429380d36a Updating to version 9.3.21-SNAPSHOT 2017-05-31 16:10:04 -07:00
Joakim Erdfelt 0f3b1cbe36 Updating to version 9.3.20.v20170531 2017-05-31 15:24:57 -07:00
Joakim Erdfelt 04b6afe879 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-05-15 09:48:41 -07:00
Joakim Erdfelt 873c3554e7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-12 14:06:21 -07:00
Greg Wilkins 04019675f6 Issue #1505 remove trailing / from jetty.home.uri 2017-05-12 10:55:35 +02:00
Joakim Erdfelt cf56168f7d Updating to version 9.3.20-SNAPSHOT 2017-05-02 15:26:56 -07:00
Joakim Erdfelt d36d57d5c7 Updating to version 9.3.19.v20170502 2017-05-02 14:31:51 -07:00
Joakim Erdfelt 782f36f157 Updating to version 9.4.6-SNAPSHOT 2017-05-02 14:29:09 -07:00
Joakim Erdfelt 9d8ad7489c Updating to version 9.4.5.v20170502 2017-05-02 13:22:18 -07:00
Simone Bordet 146a1d5ed5 Merged branch 'jetty-9.4.x' into 'master'. 2017-05-02 22:17:06 +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 68caf72835 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-01 13:30:41 +02:00
Joakim Erdfelt 002ba9cf00 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
Conflicts:
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/AltFilterTest.java
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeAnnotatedTest.java
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeContainerTest.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/DecoratorsTest.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/TestABCase3.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/WebSocketCloseTest.java
2017-04-28 06:01:06 -07: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
Joakim Erdfelt 849ad7c917 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-04-21 09:00:54 -07: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 92ea5bda21 Updating to version 9.4.5-SNAPSHOT 2017-04-14 14:43:36 -07:00
Joakim Erdfelt 3dc8f557c6 Updating to version 9.4.4.v20170414 2017-04-14 13:20:17 -07:00
Joakim Erdfelt 9e2aeda052 Updating to version 9.3.19-SNAPSHOT 2017-04-06 07:47:53 -07:00
Joakim Erdfelt 63273aa40b Updating to version 9.3.18.v20170406 2017-04-06 06:31:02 -07:00
Joakim Erdfelt 1360b863dc Updating to version 9.4.4-SNAPSHOT 2017-03-17 10:53:54 -07:00
Joakim Erdfelt 95e94b49d8 Updating to version 9.4.3.v20170317 2017-03-17 09:54:58 -07:00
Joakim Erdfelt a6a0ab991f Updating to version 9.3.18-SNAPSHOT 2017-03-17 09:48:19 -07:00
Joakim Erdfelt 307d23975e Updating to version 9.3.17.v20170317 2017-03-17 09:07:39 -07:00
Joakim Erdfelt 9273d99a99 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-03-15 15:07:17 -07:00
Joakim Erdfelt 523fab30bd Updating to version 9.4.3-SNAPSHOT 2017-02-20 08:13:31 -07:00
Joakim Erdfelt 4a674b9cc9 Updating to version 9.4.2.v20170220 2017-02-20 06:22:45 -07:00
Joakim Erdfelt 3c29947a0d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-02-15 11:54:57 -07: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 c5c7be2bc5 Merge branch 'jetty-9.4.x' 2017-02-02 16:23:13 -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
Jesse McConnell e695fc80d6 Updating to version 9.2.22-SNAPSHOT 2017-01-20 12:32:51 -06:00
Jesse McConnell 513b5e5f90 Updating to version 9.2.21.v20170120 2017-01-20 12:32:00 -06:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06:00
Simone Bordet cef2ff9522 Happy New Year 2017. 2017-01-19 19:31:53 +01: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
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Simone Bordet 0d8d754772 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-18 18:55:08 +01:00
Simone Bordet a7938910b7 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-18 18:54:47 +01:00
Simone Bordet 53281d3202 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-01-18 18:52:20 +01:00
Simone Bordet 79202d1cc6 Updated ALPN version for JDK 8u121. 2017-01-18 18:30:30 +01:00
Simone Bordet 4b381b0185 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-17 15:53:37 +01:00
Simone Bordet fc947c92fd Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-17 15:53:13 +01:00
Simone Bordet f6ea2e4fa5 Issue #1073 - JDK9 support in Jetty 9.3.x.
Made module tests work with JDK 9 too.
2017-01-17 15:38:50 +01:00
Simone Bordet 9c975d7c9b Merged branch 'jetty-9.4.x' into 'master'. 2017-01-13 19:06:36 +01:00
Greg Wilkins 999195fdb7 Issue #1260 expand system properties for exec 2017-01-13 19:11:24 +11:00
Greg Wilkins 07fb9c97db Issue #1260 expand system properties 2017-01-13 17:49:27 +11:00
Simone Bordet b7b3dfdc77 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-12 17:53:09 +01:00
Simone Bordet e539d0b1fd Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-12 17:52:45 +01:00
Simone Bordet 11d669092a Issue #1073 - JDK9 support in Jetty 9.3.x.
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
Simone Bordet 755de58ab6 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-03 11:01:05 +01:00
Jan Bartel 8cd46e7918 Issue #1195 2016-12-22 11:59:28 +11:00
Jan Bartel 2a2af4c026 Issue #1195 2016-12-22 11:56:21 +11:00
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00
Joakim Erdfelt bcbcee7f23 Updating to version 9.2.20.v20161216 2016-12-16 15:47:41 -07:00
Joakim Erdfelt 1c16964118 Merge branch 'jetty-9.4.x' 2016-12-16 08:38:16 -07:00
Joakim Erdfelt b2162cb347 Merge pull request #1159 from WalkerWatch/issues/1139
Issue #1139 - Documented new features and misc cleanup.
2016-12-14 13:10:28 -07:00
Simone Bordet b6c4e5b7c9 Merged branch 'jetty-9.4.x' into 'master'. 2016-12-14 11:53:48 +01:00
Jesse McConnell 9f012dcd17 Merge branch 'release-9.4.0' into jetty-9.4.x 2016-12-12 09:03:57 -06:00
Greg Wilkins dd50c9fa24 Fixes #1163 2016-12-12 19:55:40 +11:00
WalkerWatch ff804b6445 Issue #1139 - Documented new features and misc cleanup.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-09 15:15:39 -05:00
Jesse McConnell 6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell c54efb5929 Updating to version 9.4.0.v20161208 2016-12-08 08:56:45 -06:00
Jan Bartel c02dec5654 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-08 11:31:00 +11:00
Jesse McConnell f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell dac1d17a2d Updating to version 9.4.0.v20161207 2016-12-07 09:47:30 -06:00
Greg Wilkins 52f3f70f36 Issue #1139
Added --update-ini option to set properties in existing ini files.
2016-12-07 20:54:12 +11:00
Jesse McConnell 2bb88f566f Merge branch 'jetty-9.4.x' 2016-12-02 15:50:52 -06:00
Greg Wilkins 73ee8f29bd Issue #1139 fixed javadoc 2016-12-02 14:12:15 +11:00
Greg Wilkins 8dcdea45a1 Issue #1139 fixed empty directory commit 2016-12-02 14:05:54 +11:00
Jan Bartel 4d7a629e1b Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-01 12:07:07 +11:00
Greg Wilkins 7a741f93ee Issue #1139 read command line from file 2016-11-30 21:20:50 +11:00
Greg Wilkins 95eef4e98c Issue #1139 set properties during --add-to-start 2016-11-30 20:33:34 +11:00
Joakim Erdfelt fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
Joakim Erdfelt 5aebf6c46c Windows test case fix 2016-10-31 11:34:19 -07:00
Joakim Erdfelt 2c38511828 Updating to version 9.3.15-SNAPSHOT 2016-10-28 13:01:34 -07:00
Joakim Erdfelt 14611d2f76 Updating to version 9.3.14.v20161028 2016-10-28 12:21:02 -07:00
Simone Bordet 8421a9b200 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-26 11:13:03 +02:00
Simone Bordet 338e924a5d Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-10-26 11:10:19 +02:00
Simone Bordet 4cc5178944 Updated ALPN version for JDK 8u111 and 8u112. 2016-10-26 11:03:43 +02:00
Greg Wilkins e1c72c26dc fixed javadoc #984 2016-10-20 23:58:30 +11:00
Greg Wilkins 97470c4736 Overlay directories for modules #1013
Implemented overlay directories for modules.
Implemented by extending the basehome initializer to be able to handle
directory to directory copies, with a default of jetty.base if no location
is specified.
2016-10-20 17:44:39 +11:00
Joakim Erdfelt 93741c32a8 Merge branch 'jetty-9.4.x' 2016-10-19 16:17:36 -07:00
Greg Wilkins 6bc8717053 Improve logging modules and listing #984
Trim provider list and accept as default if only 1 available
2016-10-20 10:06:52 +11:00
Simone Bordet 6db48b2f02 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-19 16:35:36 +02:00
Simone Bordet ae228cc49a Removed deprecated [name] section from ALPN modules.
The [name] section was only needed when ALPN coexisted with NPN.
2016-10-19 16:34:24 +02:00
Simone Bordet a5d4518f94 Improved error messages. 2016-10-19 16:32:16 +02:00
Simone Bordet 582de49311 Improved error message for modules that are no longer available. 2016-10-19 15:56:28 +02:00
Simone Bordet 0e56cd4eb2 Fixed message formatting. 2016-10-19 11:36:21 +02:00
Greg Wilkins 05a968b6fb reverted accidental commit #984 2016-10-19 20:20:04 +11:00
Greg Wilkins 631437060b Improve logging modules and listing #984
Improved logging dependencies
2016-10-19 17:29:39 +11:00
Greg Wilkins b82d4ee2fe Improve logging modules and listing #984
Avoid sorting all modules. Only sort enabled modules.  This allows for
cycles to exist within all modules, but they are only seen as a problem if they
actually enabled.
2016-10-19 16:25:18 +11:00
Greg Wilkins 69a676036d Improve logging modules and listing #984
Improve usage text for property assignment
2016-10-19 16:25:18 +11:00
Greg Wilkins a0a1c83964 Improve logging modules and listing #984
Use ERROR instead of WARN for fatal start problems
improved log formatting
2016-10-19 16:25:18 +11:00
Simone Bordet 39f47244fa Merged branch 'jetty-9.4.x' into 'master'. 2016-10-17 15:36:32 +02:00
Joakim Erdfelt ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00
Joakim Erdfelt c3a78e70a8 Updating to version 9.3.13.v20161014 2016-10-14 10:39:37 -07:00
Greg Wilkins b11757a1e2 Issue #984 Improve module listing
Fixed cycle in logging from gcloud datastore
2016-10-14 15:42:12 +11:00
Greg Wilkins 68e86e4d4e Deprecated Modules #1003
Added deprecated.properties file to provide more details of deprecated modules
2016-10-14 10:48:51 +11:00
Greg Wilkins d9c2352966 Issue #984 Improve module listing
improved logging of file copies
renamed stderrout-logging to stderrout-capture
2016-10-14 10:17:39 +11:00
Greg Wilkins 85e87322fb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-13 16:37:51 +11:00
Greg Wilkins c7b833c595 Issue #984 Improve module listing
Changed |= to ?= for optional property set
2016-10-13 16:37:24 +11:00
Greg Wilkins d5a4f0f6d4 Issue #984 Improve module listing
Simplified start.jar ini mechanism
updated logging modules to have file handlers
2016-10-13 16:37:24 +11:00
Greg Wilkins 438ecb8dc3 code cleanup 2016-10-13 16:37:24 +11:00
Jan Bartel 6a2316fb23 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-13 15:21:51 +11:00
Greg Wilkins 79a6d3892c Issue #984 Improve module listing
Always add a -internal unless internal is explictly mentioned
2016-10-13 10:03:14 +11:00
Joakim Erdfelt 82942cb3a4 Merge branch 'jetty-9.4.x' into issue-207 2016-10-12 11:36:28 -07:00
Jan Bartel 6489d7fd23 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-11 18:00:12 +11:00
WalkerWatch 8248e187d9 Issue #984 - Minor edits to wording.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-10-10 12:28:34 -04:00
Greg Wilkins 0142bcde8f Issue #984 Improve module listing
renamed verbose to internal module tag
2016-10-07 20:27:38 +11:00
Greg Wilkins 33b290c8b2 Issue #984 Improve module listing
Transient modules only created in ini if directly added
improved list-modules
2016-10-07 14:12:17 +11:00
Greg Wilkins d8b1c88abc Issue #984 Improve module listing
Reworked logging modules
added support for ,= and += properties
2016-10-07 12:48:47 +11:00
Simone Bordet bcc29de3eb Merged branch 'jetty-9.4.x' into 'master'. 2016-10-06 16:37:43 +02:00
Greg Wilkins 5c57d51401 Issue #984 Improve module listing
fixed import
2016-10-06 17:21:13 +11:00
Greg Wilkins 91e9e7b76a Issue #984 Improve module listing 2016-10-06 17:01:08 +11:00
Jesse McConnell 863913b64e set for dev 2016-09-30 19:05:47 +00:00
Jesse McConnell b91cc8a4ea set for release 2016-09-30 18:01:20 +00:00
Simone Bordet 4edc50b59f Fixes #948 - 9.4.0.RC0 jetty-distribution invalid config etc/jetty-http2c.xml.
Updated references to deprecated property initialStreamSendWindow
with initialStreamRecvWindow.
2016-09-22 21:48:08 +02:00
Jan Bartel e9c59a956a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-22 17:10:48 +10:00
Greg Wilkins 1e6c5fac6b improved deprecated warning 2016-09-22 13:22:14 +10:00
Simone Bordet 4f533f39be Merged branch 'jetty-9.4.x' into 'master'. 2016-09-16 10:38:25 +02:00
Greg Wilkins f2737b1737 Issue #788 unit test 2016-09-16 17:18:32 +10:00
Greg Wilkins 70705a5ac1 Issue #788 Already enabled info 2016-09-16 12:25:24 +10:00
Jan Bartel b44b9d2540 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-16 11:38:01 +10:00
Greg Wilkins 73edfefa47 Revert "Resolves #788" (#933) 2016-09-16 11:27:57 +10:00
Joakim Erdfelt 6cf10172ca Updating to version 9.3.13-SNAPSHOT 2016-09-15 07:34:52 -07:00
Joakim Erdfelt 8b35fdc5a5 Updating to version 9.3.12.v20160915 2016-09-15 06:48:16 -07:00
Joakim Erdfelt fb7da26ad2 Updating to version 9.2.20-SNAPSHOT 2016-09-08 13:04:11 -07:00
Joakim Erdfelt 7b94bc32f4 Updating to version 9.2.19.v20160908 2016-09-08 12:11:44 -07:00
Jan Bartel 55a81fd7c6 Issue #899 2016-09-02 17:24:28 +10:00
Joakim Erdfelt 1cf61d6df7 Issue #207 - Support javax.websocket version 1.1
+ Removing more EventDriver references
+ Fixing bad implementation exposed by testcases
2016-08-19 17:59:07 -07:00
Jesse McConnell 3d939de0a8 Merge branch 'jetty-9.4.x' 2016-08-10 09:59:27 -05:00
WalkerWatch 73bc58ca78 Issue #788 - Test Cases with output check.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-05 14:54:18 -04:00
WalkerWatch 23733b1348 Merge branch 'jetty-9.4.x' of https://github.com/eclipse/jetty.project into issues/788 2016-08-05 14:47:39 -04:00
Joakim Erdfelt 6d669892b7 Merge branch 'jetty-9.4.x' 2016-08-05 11:44:37 -07:00
Joakim Erdfelt 1b3b57b2d3 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-08-05 11:44:17 -07:00
Joakim Erdfelt b4189a54c7 Fixes #819 - Adding output assertions logic to TestUseCases 2016-08-05 11:43:53 -07:00
WalkerWatch 11131acae9 Issue #788 - Adds warning for previously enabled modules.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-05 12:28:13 -04:00
Jesse McConnell a5a5098d90 Merge branch 'jetty-9.4.x' 2016-08-02 14:48:37 -05:00
WalkerWatch be54198b72 Resolves #802
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-02 12:48:50 -04:00
Joakim Erdfelt cc75888b7f Merge branch 'jetty-9.4.x' 2016-07-26 12:58:03 -07:00
Joakim Erdfelt 68f684eb3c Fixing jetty-start test usecases 2016-07-26 12:57:30 -07:00
Joakim Erdfelt 6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt 9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
Joakim Erdfelt 0b18340179 Updating to version 9.2.19-SNAPSHOT 2016-07-21 13:10:23 -07:00
Joakim Erdfelt d3ff3423f0 Updating to version 9.2.18.v20160721 2016-07-21 12:35:26 -07:00
Simone Bordet f068780749 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-20 13:19:15 +02:00
Simone Bordet 11d0569a75 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-20 13:18:26 +02:00
Simone Bordet c09251fbaf Updated ALPN version for JDK 8u101 and 8u102. 2016-07-20 13:17:31 +02:00
Simone Bordet 0d74c3ec2c Updated ALPN version for JDK 8u101 and 8u102. 2016-07-20 13:05:43 +02:00
Greg Wilkins 77d8ebf1cd Removed --add #627 2016-07-20 14:59:45 +10:00
Joakim Erdfelt 35de3899b6 Issue #706 - Removing org.apache.jasper.compiler.disablejsr199 references 2016-07-12 17:49:11 -07:00
Jan Bartel f1d9cf89a4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 12:04:59 +10:00
Greg Wilkins 5c7b0247e7 Issue #627 Use start.d or start.ini not both
Added --create-startd option
Improved tests
2016-06-23 12:01:07 +10:00
Jesse McConnell ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell 030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00
Jesse McConnell 9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell 16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
Jan Bartel 003e9cd302 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-17 15:54:02 +10:00
Greg Wilkins d79b0a7acd Issue #644 Modules for enabling logging
Separated modules for jetty logging
Added JCL
2016-06-17 14:57:25 +10:00
Jan Bartel 1e7b866d6f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-17 13:36:56 +10:00
Greg Wilkins 2fbf466393 Issue #644 Modules for enabling logging 2016-06-17 07:39:11 +10:00
Greg Wilkins a098b587bc Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-16 14:18:08 +10:00
Greg Wilkins 443e99c3fb Issue #515 Alternate start modules
Fixed ordering unit tests
made depends work for provided modules
2016-06-16 13:44:42 +10:00
Greg Wilkins fc4ebaac92 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-10 09:41:13 +10:00
Greg Wilkins 79874d80ff Fix #627 Use start.d or start.ini not both
create file in empty to ensure it is not pruned
2016-06-10 09:40:26 +10:00
Jesse McConnell c6172c9f2e Merge branch 'jetty-9.4.x' 2016-06-09 14:18:52 -05:00
Greg Wilkins 6c21f0d30d Fix #627 Use start.d or start.ini not both
Updated usage text
2016-06-09 16:51:26 +10:00
Greg Wilkins 383e81db38 Fix #627 Use start.d or start.ini not both
Updated start module to look for start.d and use it if it exists
Error or warning of both start.d and start.ini exist
updated jetty-distribution to use one or the other
2016-06-09 16:45:24 +10:00
Greg Wilkins 918399b69f fixed module ordering problem 2016-06-08 18:27:28 +10:00
Simone Bordet 473c8f0c09 Merged branch 'jetty-9.4.x' into 'master'. 2016-06-07 10:24:15 +02:00
Simone Bordet 73fe6715de Issue #306 - Merge jetty-parent into jetty-project.
Moved more plugin version declarations into jetty.project's pom.
2016-06-07 10:23:38 +02:00
Jesse McConnell dc4574f380 [maven-release-plugin] prepare for next development iteration 2016-05-17 17:30:17 -05:00
Jesse McConnell 0bbebec1e0 [maven-release-plugin] prepare release jetty-9.3.9.v20160517 2016-05-17 17:30:13 -05:00
Jesse McConnell d5c6793e6a [maven-release-plugin] prepare for next development iteration 2016-05-17 15:33:46 -05:00
Jesse McConnell 0bab7e6616 [maven-release-plugin] prepare release jetty-9.2.17.v20160517 2016-05-17 15:33:42 -05:00
Joakim Erdfelt c09f31a51d Bumping up master to version 10.0.0-SNAPSHOT 2016-04-29 11:47:15 -07:00
Greg Wilkins 3e8187dcd5 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-29 16:58:00 +10:00
Greg Wilkins 879afebfba Issue #515 Alternate start modules
Correctly remove tranient properties when replace by explicit alternative
2016-04-28 18:10:59 +10:00
Greg Wilkins d54ba38cb6 Issue #515 Alternate start modules
Additional usecases to test for loops in dynamic modules
2016-04-28 17:46:52 +10:00
Jan Bartel 9800c3c128 Issue #525
Removed deprecated "name"
2016-04-28 17:38:05 +10:00
Jan Bartel f63bdda05c Issue #532 Get rid of generated jetty-start/dependency-reduced-pom.xml 2016-04-28 17:11:46 +10:00
Greg Wilkins a377b3a8f3 Issue #529
Support zero padded version updates
2016-04-28 14:30:20 +10:00
Greg Wilkins 728e0a7d57 Issue #515 Alternate start modules
Deprecated warning if [Name] used
2016-04-28 11:40:10 +10:00
Joakim Erdfelt 301fc12d98 Merge branch 'jetty-9.3.x' 2016-04-25 12:11:38 -07:00
Joakim Erdfelt 66a70adb98 Merge branch 'release-9.2.16' into jetty-9.2.x 2016-04-25 11:34:07 -07:00
Simone Bordet 64a8d8819f Merged branch 'jetty-9.3.x' into 'master'. 2016-04-20 14:29:38 +02:00
Simone Bordet 89efdb3e09 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-04-20 14:29:11 +02:00
Simone Bordet c90f60bd9c Updated ALPN version for JDK 8u91 and 8u92. 2016-04-20 14:26:17 +02:00
Greg Wilkins ab97a78407 Issue #515 Alternate start modules
Added another usecase
2016-04-20 16:37:42 +10:00
Greg Wilkins e846379c2c Issue #515 Alternate start modules
Added another test case.
Handle (poorly) the case where a default transitive module adds ini properties
and is then replaced by a non transitive module.
2016-04-18 09:28:19 +10:00
Greg Wilkins 62563beee7 Issue #515 Alternate start modules
Added more test usecases
2016-04-17 23:16:33 +10:00
Greg Wilkins 6829bec09e Issue #515 Alternate start modules
Javadoc
2016-04-16 23:23:09 +10:00
Greg Wilkins 0f6933fca1 Issue #515 Alternate start modules
Allow enable when provided capability from transient
sort usecases
2016-04-16 23:04:14 +10:00
Greg Wilkins bbc84a3d01 Issue #515 Alternate start modules
Replaced the module Name mechanism with a Provides mechanism for #515.  This keeps a modules
name immutable, which makes it easier to find.

Simplified the unit tests by removing all the use-casees with real names (can be confusing and does
not age well).  Deleted more specific unit tests in favour of a more capable generic usecase test
mechanism.   Have added multiple tests per base; exceptional results.  Still need to add in
support for running --add-to-start type commands prior to execution and then to add many more
usecases
2016-04-16 11:01:08 +10:00
Joakim Erdfelt 939505c342 Updating to version 9.2.17-SNAPSHOT 2016-04-14 14:03:21 -07:00
Joakim Erdfelt 778fac638d Updating to version 9.2.16.v20160414 2016-04-14 13:21:34 -07:00
Joakim Erdfelt 47bbd9364d Revert "Updating to version 9.2.16.v20160414"
This reverts commit 29ae63855b.
2016-04-14 13:19:59 -07:00
Joakim Erdfelt 29ae63855b Updating to version 9.2.16.v20160414 2016-04-14 13:17:21 -07:00
Joakim Erdfelt 2c4cdbe259 Merge branch 'jetty-9.3.x' 2016-04-13 11:52:53 -07:00
Joakim Erdfelt 6abb272619 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-04-13 11:52:36 -07:00
Joakim Erdfelt 210f9a8d7c Fixes #510 - Module [depend] property expansion should support eg foo/${bar}/${bar}-xxx 2016-04-13 11:50:57 -07:00
Joakim Erdfelt 6fb338e50d Updating to version 9.3.9-SNAPSHOT 2016-04-11 16:20:50 -07:00
Joakim Erdfelt bb4f3c4882 Updating to version 9.3.9.M1 2016-04-11 15:35:22 -07:00
Simone Bordet 2cd8d55d26 Merged branch 'jetty-9.3.x' into 'master'. 2016-04-05 11:01:17 +02:00
Simone Bordet b047c6332e Fixed ALPN files merge. 2016-04-05 11:00:47 +02:00
Greg Wilkins 8f74ff3585 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-05 10:01:22 +10:00
Greg Wilkins 424f0c1e04 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-04-05 09:57:28 +10:00
Simone Bordet 5aef3ba3e4 Merged branch 'jetty-9.3.x' into 'master'. 2016-04-04 15:41:04 +02:00
Simone Bordet c1997b40a5 Updated ALPN to OpenJDK 8u77. 2016-04-04 15:38:53 +02:00
Simone Bordet 3e6bc4d17a Updated ALPN version for JDK 8u77. 2016-04-04 10:58:09 +02:00
Joakim Erdfelt c68d3b1d8d Updating to version 9.3.9-SNAPSHOT 2016-03-14 09:07:52 -07:00
Joakim Erdfelt 1f3b3f31f4 Updating to version 9.3.8.v20160314 2016-03-14 08:30:20 -07:00
Jesse McConnell c74b0c23e9 Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 08:11:27 -07:00
Jesse McConnell b08f177d47 Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 08:09:12 -07:00
Jesse McConnell d8f74233a0 fix some merge issues, some example javadoc that was never right and contributing language 2016-02-26 08:13:41 -06:00
Jesse McConnell ce5a3b11d6 Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 08:03:33 -06:00
Jesse McConnell 76b34fe79a Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 07:51:05 -06:00
Joakim Erdfelt f98dde5e5b Updating to version 9.2.16-SNAPSHOT 2016-02-10 15:36:41 -07:00
Joakim Erdfelt 9b6890d3c1 Updating to version 9.2.15.v20160210 2016-02-10 14:49:12 -07:00
Simone Bordet 2ac465a343 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-09 18:14:07 +01:00
Simone Bordet 6306f06e2f Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-02-09 18:12:04 +01:00
Simone Bordet 145e4bee71 487511 - Jetty HTTP won't work on turkish systems.
Fixed usages of toLowerCase() and toUpperCase() to use Locale.ENGLISH.
2016-02-09 17:50:26 +01:00
Simone Bordet 281313440b Merged branch 'jetty-9.3.x' into 'master'. 2016-02-08 15:57:40 +01:00
Simone Bordet 1ed327ecce Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-02-08 15:56:53 +01:00
Simone Bordet e853632c22 Updated ALPN version for JDK 8u73 and 8u74. 2016-02-08 15:52:03 +01:00
Simone Bordet 56c0bc768c Merged branch 'jetty9.3.x' into 'master'. 2016-01-21 17:52:37 +01:00
Simone Bordet 7703784cab Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-01-21 17:32:14 +01:00
Simone Bordet 35bc923f50 Updated ALPN version for JDK 8u71 and 8u72. 2016-01-21 17:25:48 +01:00
Joakim Erdfelt e0ce545ad7 Updating to version 9.3.8-SNAPSHOT 2016-01-15 17:15:14 -07:00
Joakim Erdfelt c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Joakim Erdfelt b7f9c9aca9 Updating to version 9.3.7-SNAPSHOT 2016-01-13 08:21:01 -07:00
Joakim Erdfelt 21ca3f6690 Updating to version 9.3.7.RC1 2016-01-13 07:30:24 -07:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Greg Wilkins a94e6bf0c0 481903 Module Descriptions 2015-11-11 17:18:20 +11:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Simone Bordet 700975fe41 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-05 12:17:30 +01:00
Simone Bordet 50e565bac0 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-11-05 12:14:28 +01:00
Simone Bordet b4cf2921c8 Updated ALPN version for JDK 8u65 and 8u66. 2015-11-05 12:05:08 +01:00
Greg Wilkins 0b98996745 fixed cherry pick 2015-10-15 16:27:57 +11:00
Greg Wilkins d5dab98546 start.jar uses shaded jetty-util classes 2015-10-15 15:42:28 +11:00
Greg Wilkins b9dbf7111d Use TopologicalSort for start.jar 2015-10-15 15:42:28 +11:00
Greg Wilkins 9866b31420 479712 Documented --approve-all-licenses 2015-10-15 09:47:03 +11:00
Greg Wilkins d7121881b3 479712 Documented --approve-all-licenses 2015-10-15 09:46:23 +11:00
Greg Wilkins 7c509b4d8c Revert "479712 Added --yes to start.jar"
This reverts commit 4560dabfc2.
2015-10-15 09:40:53 +11:00
Greg Wilkins 6e203c1ffa Revert "479712 Added --yes to start.jar"
This reverts commit 14b638f8f7.
2015-10-15 09:39:37 +11:00
Greg Wilkins 14b638f8f7 479712 Added --yes to start.jar 2015-10-14 18:26:14 +11:00
Greg Wilkins 4560dabfc2 479712 Added --yes to start.jar 2015-10-14 18:24:58 +11:00
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt 29722bd880 Updating to version 9.3.5.v20151012 2015-10-12 15:10:39 -07:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Joakim Erdfelt 9cf0e34a1d Updating to version 9.4.0-SNAPSHOT 2015-10-07 15:41:32 -07:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00
Greg Wilkins 3e242bef16 478280 property file in temp directory 2015-09-25 09:00:46 +10:00
Simone Bordet da3699dc55 Merged branch 'jetty-9.2.x' into 'master'. 2015-09-21 16:32:58 +02:00
Simone Bordet 77fdfb8754 Updated ALPN version for JDK 8u60. 2015-09-21 16:19:48 +02:00
Jesse McConnell 6409366499 [maven-release-plugin] prepare for next development iteration 2015-08-27 10:11:29 -05:00
Jesse McConnell 3086adc965 [maven-release-plugin] prepare release jetty-9.3.3.v20150827 2015-08-27 10:11:21 -05:00
Jesse McConnell f8734f23ce [maven-release-plugin] prepare for next development iteration 2015-08-25 14:10:01 -05:00
Jesse McConnell e9edf4c24b [maven-release-plugin] prepare release jetty-9.3.3.v20150825 2015-08-25 14:09:54 -05:00
Greg Wilkins aca2aa56ad 475483 - Starting Jetty with [exec] should use properties file.
Added --exec-properties to allow the name of the properties file to be set
and for it not to be deleted on exit.
2015-08-21 09:03:26 +10:00
Simone Bordet 837a36e3ec 475483 - Starting Jetty with [exec] should use properties file.
Now using a properties file in case of [exec], and moved the
properties file inside the $jetty.base directory.
2015-08-20 15:04:04 +02:00
Joakim Erdfelt d02a5c3c8b 474361 - Handle JVM version extensions like -internal
+ Refreshed Version.java to handle parsing alternate syntaxes
+ Introduced Version.toShortString() for the non-suffixed versions
+ Using updated Version obj in StartArgs.setProperty("java.version")
  to allow both normal System property access and arbitrary property
  setting on command line to work in a consistent fashion.
2015-08-05 17:08:40 -07:00
Joakim Erdfelt a3684f7fb8 [maven-release-plugin] prepare for next development iteration 2015-07-30 09:47:57 -07:00
Joakim Erdfelt 798fc8118b [maven-release-plugin] prepare release jetty-9.2.13.v20150730 2015-07-30 09:47:48 -07:00
Joakim Erdfelt 4b3879845d [maven-release-plugin] prepare for next development iteration 2015-07-30 07:02:10 -07:00
Joakim Erdfelt 6b7e9ac4b0 [maven-release-plugin] prepare release jetty-9.3.2.v20150730 2015-07-30 07:02:02 -07:00
Simone Bordet aa75bcf078 Updated ALPN versions for JDK 8u51. 2015-07-28 16:23:08 +02:00
Simone Bordet dea406d2b3 Updated ALPN versions for JDK 8u51. 2015-07-27 11:04:27 +02:00
Jesse McConnell 9b790c38ce [maven-release-plugin] prepare for next development iteration 2015-07-14 11:42:34 -05:00
Jesse McConnell b35d32f2b8 [maven-release-plugin] prepare release jetty-9.3.1.v20150714 2015-07-14 11:42:28 -05:00
Jesse McConnell 7204707902 [maven-release-plugin] prepare for next development iteration 2015-07-09 12:14:38 -05:00
Jesse McConnell 3b1533673e [maven-release-plugin] prepare release jetty-9.2.12.v20150709 2015-07-09 12:14:30 -05:00
Greg Wilkins 9d8d56b401 Remove unused start property defaults 2015-06-19 15:38:43 +10:00