git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@992981 13f79535-47bb-0310...

diff --git a/java/org/apache/catalina/util/ServerInfo.java b/java/org/apache/catalina/util/ServerInfo.java
index 0aa1c38..348a13e 100644 (file)
--- a/java/org/apache/catalina/util/ServerInfo.java
+++ b/java/org/apache/catalina/util/ServerInfo.java
@@ -67,11 +67,11 @@ public class ServerInfo {
             //Ignore
         }
         if (serverInfo == null)
-            serverInfo = "Apache Tomcat";
+            serverInfo = "Apache Tomcat 7.0.x-dev";
         if (serverBuilt == null)
             serverBuilt = "unknown";
         if (serverNumber == null)
-            serverNumber = "5.5.0.0";
+            serverNumber = "7.0.x";
         
     }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fe3d64b..551d5e9 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,10 @@
         in log messages rather than throwing an
         <code>UnsupportedOperationException</code>. (markt)
       </fix>
+      <fix>
+        Update the version numbers in ServerInfo defaults to Tomact 7.0.x.
+        (markt) 
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">