Skip to content

Commit 16b3b4b

Browse files
committed
Update README to reflect Java 7 only going forward.
1 parent 69fff3b commit 16b3b4b

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

README.markdown

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ Tomcat Versions
1818
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.
1919

2020
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.
2527

2628
Architecture
2729
------------

0 commit comments

Comments
 (0)