From 18fac60288f15ded6a738066d230cdb6423a5b25 Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Fri, 27 Apr 2018 19:57:27 +0000
Subject: [PATCH] Tag 8.5.31

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_31@1830392 13f79535-47bb-0310-9956-ffa450edef68
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 1adecbab1960..b5551f67a7fa 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=31
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # ----- Build control flags -----
 # Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c1b821127be4..9af34fa4a064 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-<section name="Tomcat 8.5.31 (markt)" rtext="in development">
+<section name="Tomcat 8.5.31 (markt)">
   <subsection name="Catalina">
     <changelog>
       <fix>