8dd61c6d1c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-15 18:07:01 +10:00
e607acfa4e
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-15 18:06:32 +10:00
69804f9e76
Chapter 24 touch-ups. ( #635 )
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-15 15:55:11 +10:00
c6172c9f2e
Merge branch 'jetty-9.4.x'
2016-06-09 14:18:52 -05:00
147df2a031
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-09 14:18:27 -05:00
7e3db100ab
resolve version expansion across blocks by adding subs= attributes
2016-06-09 14:18:04 -05:00
e70c586533
Merge branch 'jetty-9.4.x'
2016-06-07 15:52:23 -05:00
4283c15fe1
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-07 15:52:07 -05:00
ef63395b07
Removed references to SPDY in Chapter 3, updated Chapter 10 with general info on Sessions
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-07 16:40:24 -04:00
e79c4d582b
Merge branch 'jetty-9.4.x'
2016-06-07 11:57:39 -05:00
20c1301203
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-07 11:56:27 -05:00
1d3816fdc5
Chapter 10 clean up and link fixes.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-06-06 21:20:11 -04:00
2d1d3fe6e9
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-06 21:39:31 +02:00
a8f25b550f
Fixes #487 - JDK 9 build compatibility.
...
Fixes #306 - Merge jetty-parent into jetty-project.
- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
2016-06-06 21:28:51 +02:00
b4c958e68c
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-05-31 20:38:31 -05:00
2508d73a94
Added note for CVE-2016-4800 and several small grammatical clean ups.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-31 20:37:06 -05:00
1cb7124a10
Merge pull request #606 from WalkerWatch/jetty-9.3.x
...
Added note for CVE-2016-4800 and several small grammatical clean ups.
2016-05-31 19:41:33 -05:00
cbf8c15161
Added note for CVE-2016-4800 and several small grammatical clean ups.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-31 19:39:58 -04:00
bfeccd9e39
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-30 19:11:24 +02:00
f6e460fc35
Remove Session.setMaximumMessageSize(long) example, because that method has been removed in jetty-9.1
...
Signed-off-by: Alexander Farber <Alexander.Farber@gmail.com>
2016-05-30 19:10:08 +02:00
df7a41276f
Remove Session.setMaximumMessageSize(long) example, because that method has been removed in jetty-9.1
...
Signed-off-by: Alexander Farber <Alexander.Farber@gmail.com>
2016-05-30 18:40:53 +02:00
59f35dc056
alter the basedir of the documentation zip
2016-05-27 15:42:11 -05:00
68d0ff1373
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-05-27 15:41:29 -05:00
3e809af7f6
alter the basedir of the documentation zip
2016-05-27 15:40:58 -05:00
fd059f2189
Merge branch 'jetty-9.4.x'
2016-05-25 11:39:40 -05:00
6819455c16
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-05-25 11:39:14 -05:00
ff495bc92f
Fixed bug that was causing docbook elements to duplicate on screen.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-24 21:42:26 -04:00
6c9276f946
Quick start re-work and illustration.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-24 21:30:56 -04:00
ba8e0bb828
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-24 12:42:41 +02:00
5fe1ff697e
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-24 12:42:12 +02:00
261db9aa01
Converted chapters 5 and 6 to ventilated prose and cleaned up formatting and grammar.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-22 13:31:27 -04:00
569a8d14b9
merge up from 9.3.x release
2016-05-19 10:08:51 -05:00
80cadf2c01
merging in from 9.3.x release
2016-05-19 10:05:44 -05:00
4bf91b5ab3
Merge remote-tracking branch 'origin/release-9.3.9' into jetty-9.3.x
2016-05-19 09:55:58 -05:00
b837009059
Merge branch 'jetty-9.4.x'
2016-05-19 07:38:21 -05:00
15c9556c38
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-05-19 07:37:59 -05:00
d828100e2e
Updated Chapter 4 with ventilated prose and updated grammar/formatting.
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-18 17:19:49 -04:00
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
26e1d8a09e
Merge branch 'jetty-9.4.x'
2016-05-17 14:16:32 -05:00
0193532748
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-05-17 14:16:17 -05:00
643f8e8096
Merge branch 'jetty-9.3.x' into pr/576
...
# Conflicts:
#
jetty-documentation/src/main/asciidoc/administration/logging/default-log
ging-with-stderrlog.adoc
2016-05-17 14:02:23 -05:00
af885d5e09
Reformatting of dump-tool for #549 .
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-16 22:48:33 -04:00
5af72ed1fc
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-06 17:44:16 +02:00
9a5d8f3943
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-06 17:43:49 +02:00
5d3283af0f
add screen styling and switch highlighter to something that matchs current screen look and feel
2016-05-06 08:12:16 -05:00
31899c1959
Chapter 20 tweaks
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-05-05 22:13:04 -04:00
cae9c0f1d6
support [source, screen] for html rendering
2016-05-05 17:30:08 -05:00
9a03782447
update the xsl stylesheets and try out a source, shell
2016-05-05 15:43:14 -05:00
4bfc1bfa26
added syntax highlighter colors
2016-05-05 13:01:16 -05:00
Greg Wilkins
WalkerWatch
Jesse McConnell
WalkerWatch
Simone Bordet
Alexander Farber