Author: markt
Date: Fri Apr 15 14:42:39 2016
New Revision: 1739310
URL: http://svn.apache.org/viewvc?rev=1739310&view=rev
Log:
Add 8.5.x
Modified:
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/whichversion.xml
Modified: tomcat/site/trunk/docs/whichversion.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1739310&r1=1739309&r2=1739310&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Fri Apr 15 14:42:39 2016
@@ -232,9 +232,10 @@ mapping between the specifications and t
<th><strong>JSP Spec</strong></th>
<th><strong>EL Spec</strong></th>
<th><strong>WebSocket Spec</strong></th>
+ <th><strong>JASPIC Spec</strong></th>
<th><strong>Apache Tomcat version</strong></th>
<th><strong>Actual release revision</strong></th>
- <th><strong>Support Java Versions</strong></th>
+ <th><strong>Supported Java Versions</strong></th>
</tr>
@@ -245,6 +246,7 @@ mapping between the specifications and t
<td>TBD (2.4?)</td>
<td>TBD (3.1?)</td>
<td>TBD (1.2?)</td>
+ <td>1.1</td>
<td>9.0.x</td>
<td>9.0.0.M4 (alpha)</td>
<td>8 and later</td>
@@ -258,6 +260,21 @@ mapping between the specifications and t
<td>2.3</td>
<td>3.0</td>
<td>1.1</td>
+ <td>1.1</td>
+ <td>8.5.x</td>
+ <td>8.5.0 (beta)</td>
+ <td>7 and later</td>
+
+</tr>
+
+
+<tr>
+
+<td>3.1</td>
+ <td>2.3</td>
+ <td>3.0</td>
+ <td>1.1</td>
+ <td>N/A</td>
<td>8.0.x</td>
<td>8.0.33</td>
<td>7 and later</td>
@@ -271,9 +288,10 @@ mapping between the specifications and t
<td>2.2</td>
<td>2.2</td>
<td>1.1</td>
+ <td>N/A</td>
<td>7.0.x</td>
<td>7.0.68</td>
- <td>6 and later<br> (WebSocket 1.1 requires 7 or later)</td>
+ <td>6 and later<br> (7 and later for WebSocket)</td>
</tr>
@@ -284,6 +302,7 @@ mapping between the specifications and t
<td>2.1</td>
<td>2.1</td>
<td>N/A</td>
+ <td>N/A</td>
<td>6.0.x</td>
<td>6.0.45</td>
<td>5 and later</td>
@@ -297,6 +316,7 @@ mapping between the specifications and t
<td>2.0</td>
<td>N/A</td>
<td>N/A</td>
+ <td>N/A</td>
<td>5.5.x (archived)</td>
<td>5.5.36 (archived)</td>
<td>1.4 and later</td>
@@ -310,6 +330,7 @@ mapping between the specifications and t
<td>1.2</td>
<td>N/A</td>
<td>N/A</td>
+ <td>N/A</td>
<td>4.1.x (archived)</td>
<td>4.1.40 (archived)</td>
<td>1.3 and later</td>
@@ -323,6 +344,7 @@ mapping between the specifications and t
<td>1.1</td>
<td>N/A</td>
<td>N/A</td>
+ <td>N/A</td>
<td>3.3.x (archived)</td>
<td>3.3.2 (archived)</td>
<td>1.1 and later</td>
Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1739310&r1=1739309&r2=1739310&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Fri Apr 15 14:42:39 2016
@@ -24,9 +24,10 @@ mapping between the specifications and t
<th><strong>JSP Spec</strong></th>
<th><strong>EL Spec</strong></th>
<th><strong>WebSocket Spec</strong></th>
+ <th><strong>JASPIC Spec</strong></th>
<th><strong>Apache Tomcat version</strong></th>
<th><strong>Actual release revision</strong></th>
- <th><strong>Support Java Versions</strong></th>
+ <th><strong>Supported Java Versions</strong></th>
</tr>
<tr>
@@ -34,6 +35,7 @@ mapping between the specifications and t
<td>TBD (2.4?)</td>
<td>TBD (3.1?)</td>
<td>TBD (1.2?)</td>
+ <td>1.1</td>
<td>9.0.x</td>
<td>9.0.0.M4 (alpha)</td>
<td>8 and later</td>
@@ -44,6 +46,18 @@ mapping between the specifications and t
<td>2.3</td>
<td>3.0</td>
<td>1.1</td>
+ <td>1.1</td>
+ <td>8.5.x</td>
+ <td>8.5.0 (beta)</td>
+ <td>7 and later</td>
+</tr>
+
+<tr>
+ <td>3.1</td>
+ <td>2.3</td>
+ <td>3.0</td>
+ <td>1.1</td>
+ <td>N/A</td>
<td>8.0.x</td>
<td>8.0.33</td>
<td>7 and later</td>
@@ -54,9 +68,10 @@ mapping between the specifications and t
<td>2.2</td>
<td>2.2</td>
<td>1.1</td>
+ <td>N/A</td>
<td>7.0.x</td>
<td>7.0.68</td>
- <td>6 and later<br/> (WebSocket 1.1 requires 7 or later)</td>
+ <td>6 and later<br/> (7 and later for WebSocket)</td>
</tr>
<tr>
@@ -64,6 +79,7 @@ mapping between the specifications and t
<td>2.1</td>
<td>2.1</td>
<td>N/A</td>
+ <td>N/A</td>
<td>6.0.x</td>
<td>6.0.45</td>
<td>5 and later</td>
@@ -74,6 +90,7 @@ mapping between the specifications and t
<td>2.0</td>
<td>N/A</td>
<td>N/A</td>
+ <td>N/A</td>
<td>5.5.x (archived)</td>
<td>5.5.36 (archived)</td>
<td>1.4 and later</td>
@@ -84,6 +101,7 @@ mapping between the specifications and t
<td>1.2</td>
<td>N/A</td>
<td>N/A</td>
+ <td>N/A</td>
<td>4.1.x (archived)</td>
<td>4.1.40 (archived)</td>
<td>1.3 and later</td>
@@ -94,6 +112,7 @@ mapping between the specifications and t
<td>1.1</td>
<td>N/A</td>
<td>N/A</td>
+ <td>N/A</td>
<td>3.3.x (archived)</td>
<td>3.3.2 (archived)</td>
<td>1.1 and later</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
