You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/08/15 20:02:33 UTC
[tomcat] branch master updated: Update source code links to point
to Git
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 42971a3 Update source code links to point to Git
42971a3 is described below
commit 42971a30719a557c6c82624b7b55226b393f4bd9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 15 21:01:20 2019 +0100
Update source code links to point to Git
---
build.properties.default | 3 +++
build.xml | 1 +
webapps/ROOT/index.jsp | 4 ++--
webapps/docs/changelog.xml | 8 ++++++++
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 25e83c3..ec173fd 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -29,6 +29,9 @@ version.build=25
version.patch=0
version.suffix=-dev
+# ----- Source control flags -----
+git.branch=master
+
# ----- Build control flags -----
# Note enabling validation uses Checkstyle which is LGPL licensed
ant.version.required=1.9.8
diff --git a/build.xml b/build.xml
index e44fbd9..6690daa 100644
--- a/build.xml
+++ b/build.xml
@@ -239,6 +239,7 @@
<filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
<filter token="VERSION_BUILT" value="${today} ${tstamp} UTC"/>
<filter token="JDT_VERSION" value="${jdt.version}"/>
+ <filter token="GIT_BRANCH" value="${git.branch}"/>
</filterset>
<!-- Files to change line endings for depending on target platform -->
diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index 6de0008..1d3d46d 100644
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -128,7 +128,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
<ul>
<li><a href="https://tomcat.apache.org/bugreport.html">Tomcat @VERSION_MAJOR_MINOR@ Bug Database</a></li>
<li><a href="${tomcatDocUrl}api/index.html">Tomcat @VERSION_MAJOR_MINOR@ JavaDocs</a></li>
- <li><a href="https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/">Tomcat @VERSION_MAJOR_MINOR@ SVN Repository</a></li>
+ <li><a href="https://github.com/apache/tomcat/tree/@GIT_BRANCH@">Tomcat @VERSION_MAJOR_MINOR@ Git Repository at GitHub</a></li>
</ul>
</div>
</div>
@@ -183,7 +183,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
<h4>Get Involved</h4>
<ul>
<li><a href="${tomcatUrl}getinvolved.html">Overview</a></li>
- <li><a href="${tomcatUrl}svn.html">SVN Repositories</a></li>
+ <li><a href="${tomcatUrl}source.html">Source Repositories</a></li>
<li><a href="${tomcatUrl}lists.html">Mailing Lists</a></li>
<li><a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a></li>
</ul>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d6474dc..de1bcc3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.25 (markt)" rtext="in development">
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ Correct the source code links on the index page for the ROOT web
+ application to point to Git rather than Subversion. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org