You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.markdown
+6-4Lines changed: 6 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -18,10 +18,12 @@ Tomcat Versions
18
18
This project supports both Tomcat 6 and Tomcat 7. Starting at project version 1.1, precompiled JAR downloads are available for either version of Tomcat while project versions before 1.1 are only available for Tomcat 6.
19
19
20
20
The official release branches in Git are as follows:
21
-
*`tomcat-6`: Continuing work for Tomcat 6 releases. Compatible with Java 6.
22
-
*`master`: Continuing work for Tomcat 7 releases. Compatible with Java 6 or 7.
23
-
*`tomcat-7`: Finalized; has now been merged into `master`. Compatible with Java 6 or 7.
24
-
*`java-7`: All of the work from master for Tomcat 7 but taking advantage of new features in Java 7. Compatible with Java 7 only.
21
+
*`master`: Continuing work for Tomcat 7 releases. Compatible with Java 7.
22
+
*`tomcat-6`: Deprecated; may accept submitted patches, but no new work is being done on this branch. Compatible with Tomcat 6 and Java 6.
23
+
24
+
Finalized branches include:
25
+
*`tomcat-7`: Has been merged into `master`. Compatible with Java 6 or 7.
26
+
*`java-7`: Has been merged into `master`. All of the work from master for Tomcat 7 but taking advantage of new features in Java 7. Compatible with Java 7 only.
0 commit comments