Re: [tomcat] 01/01: Tag 9.0.25

2019-09-16 Thread Mark Thomas
On 16/09/2019 14:23, Rainer Jung wrote:
> The BOM in changelog.xml is back, at least in the tag, letting
> checkstyle fail. See below.

Thanks for spotting this. I thought I checked that. Obviously not
carefully enough.

I'll re-roll the release.

Mark


> 
> Am 16.09.2019 um 13:55 schrieb ma...@apache.org:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> markt pushed a commit to tag 9.0.25
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>> commit fad275b0541595ea89e59f5cb024ada531d5dbe4
>> Author: Mark Thomas 
>> AuthorDate: Mon Sep 16 12:54:37 2019 +0100
>>
>>  Tag 9.0.25
>> ---
>>   build.properties.default   | 2 +-
>>   webapps/docs/changelog.xml | 4 ++--
>>   2 files changed, 3 insertions(+), 3 deletions(-)
>>
> ...
>> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
>> index c223a4c..d5328c9 100644
>> --- a/webapps/docs/changelog.xml
>> +++ b/webapps/docs/changelog.xml
>> @@ -1,4 +1,4 @@
>> -
>> +
> 
> I think that hunk points to where the BOM reappeared.
> 
>>    To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] 01/01: Tag 9.0.25

2019-09-16 Thread Rainer Jung
The BOM in changelog.xml is back, at least in the tag, letting 
checkstyle fail. See below.


Am 16.09.2019 um 13:55 schrieb ma...@apache.org:

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 9.0.25
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit fad275b0541595ea89e59f5cb024ada531d5dbe4
Author: Mark Thomas 
AuthorDate: Mon Sep 16 12:54:37 2019 +0100

 Tag 9.0.25
---
  build.properties.default   | 2 +-
  webapps/docs/changelog.xml | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)


...

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c223a4c..d5328c9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -1,4 +1,4 @@
-
+


I think that hunk points to where the BOM reappeared.


  

[tomcat] 01/01: Tag 9.0.25

2019-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 9.0.25
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit fad275b0541595ea89e59f5cb024ada531d5dbe4
Author: Mark Thomas 
AuthorDate: Mon Sep 16 12:54:37 2019 +0100

Tag 9.0.25
---
 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 a47e0e5..727f1c5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=25
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c223a4c..d5328c9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -1,4 +1,4 @@
-
+
 
-
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org