Content

Table of Contents

Version Control

The Apache Tomcat project is in the process of migrating from Subversion to Git for version control. The following components use Git:

  • Apache Tomcat 10.0.x alpha
  • Apache Tomcat 9.0.x
  • Apache Tomcat 8.5.x
  • Apache Tomcat 7.0.x
  • Apache Tomcat Connectors
  • Apache Tomcat Native
  • Apache Tomcat Training
  • Taglibs

The following components currently use Subversion as the primary version control system:

  • Tomcat Maven plugin *
  • Tomcat web site
  • archive

The Subversion repositories marked with a * are also mirrored to a Git repository.

Git

The ASF operates a dual master system for repositories that use Git as their primary version control system. This means committers may commit to either gitbox.apache.org or GitHub.

For repositories that are mirrored to Git from Subversion, the mirrors may be found at git.apache.org or GitHub and are read-only for everyone.

tomcat.git

This the Git repository that contains the Apache Tomcat source code. There are currently four branches:

  • master
  • 9.0.x
  • 8.5.x
  • 7.0.x

master is the primary development branch. Apache Tomcat 10.0.x alpha releases are tagged from this branch. Development work generally occurs in this branch first.

9.0.x is the stable release branch for Apache Tomcat 9.0.x. Generally, fixes are cherry picked from master into this branch.

8.5.x is the stable release branch for Apache Tomcat 8.5.x. Generally, fixes are cherry picked from 9.0.x into this branch.

7.0.x is the stable release branch for Apache Tomcat 7.0.x. Generally, fixes are cherry picked from 8.5.x into this branch.

A web based view of this repository is available via GitHub.

tomcat-connectors.git

This the Git repository that contains the Apache Tomcat Connectors source code. This includes mod_jk and isapi. There is currently one active branch:

  • master

master is the primary development branch. Apache Tomcat Connectors 1.2.x releases are tagged from this branch. Development work generally occurs in this branch first.

A web based view of this repository is available via GitHub.

tomcat-native.git

This the Git repository that contains the Apache Tomcat Native source code. There is currently one active branch:

  • master

master is the primary development branch. Apache Tomcat Native 1.2.x releases are tagged from this branch. Development work generally occurs in this branch first.

A web based view of this repository is available via GitHub.

tomcat-training.git

This the Git repository that contains the Apache Tomcat training material source code. There is currently one active branch:

  • master

master is the primary development branch. Apache Tomcat training courses are tagged from this branch. Development work generally occurs in this branch first.

A web based view of this repository is available via GitHub.

tomcat-taglibs-parent.git

This the Git repository that contains the parent POM for the Apache Tomcat Tag Libraries. There is currently one active branch:

  • master

master is the only development branch. All development work occurs in this branch.

A web based view of this repository is available via GitHub.

tomcat-taglibs-standard.git

This the Git repository that contains the Apache Tomcat Standard Tag Library. There is currently one active branch:

  • master

master is the only development branch. All development work occurs in this branch.

A web based view of this repository is available via GitHub.

tomcat-taglibs-rdc.git

This the Git repository that contains the Apache Tomcat RDC Tag Library. There is currently one active branch:

  • master

master is the only development branch. All development work occurs in this branch.

A web based view of this repository is available via GitHub.

tomcat-taglibs-site.git

This the Git repository that contains the web site for the Apache Tomcat Tag Libraries. There is currently one active branch:

  • master

master is the only development branch. All development work occurs in this branch.

A web based view of this repository is available via GitHub.

Subversion Repository

The root of the repository is http://svn.apache.org/repos/asf/tomcat.

Note: there is also ViewVC-powered web view of the repository.

The directories below this level are:

DirectoryContents
/archive/ Modules that are no longer maintained or have been moved to git
/maven-plugin/ The Apache Tomcat Maven Plugin source code and website.
/sandbox/ An area where Tomcat committers can experiment with new ideas.
/site/ The Apache Tomcat website.

Line endings

The repositories are configured so that when you check out from svn, you get the line ending appropriate for your platform for all files. The thinking behind this is that, for example, if you need to fix a typo in a .bat file from MacOS, it is easier if the .bat file has MacOS line-endings.

When you build locally, line-endings are not changed. The expectation is that the source has the correct line-endings for your platform so all the files that matter on your platform will have the correct line endings. When you are on Windows it doesn't matter if the .sh files have Windows line-endings since you'll never use them on Windows.