You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Rainer Jung <ra...@kippdata.de> on 2018/05/14 11:41:41 UTC
Re: svn commit: r1830251 - in /tomcat/tc8.0.x/trunk: ./
java/org/apache/tomcat/util/http/parser/HttpParser.java res/maven/mvn-pub.xml
test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
webapps/docs/changelog.xml
Am 30.04.2018 um 10:28 schrieb Mark Thomas:
> On 29/04/18 23:14, Violeta Georgieva wrote:
>> On Sun, 29 Apr 2018 at 17:10, Violeta Georgieva <vi...@apache.org>
>> wrote:
>>> On Sun, 29 Apr 2018 at 6:54, Mark Thomas <ma...@apache.org> wrote:
>>>> On 28/04/18 17:50, Violeta Georgieva wrote:
>
> <snip/>
>
>>>>> Is this file really part of that change?
>>>>
>>>> No. I think it got caught up with that commit by mistake. I don't think
>>>> it does any harm though.
>>>>
>>>
>>> Only for the release ;)
>
> Sorry.
>
>> If you don’t mind I’ll revert this file to its previous version. Wdyt?
>
> No objection.
>
> Looking at the diff, there are rather more changes between 8.0.x and
> 8.5.x than I was expecting. Another option would be to update 8.0.x with
> all the changes from 8.5.x and 9.0.x (and the same for 7.0.x). I'd be
> happy to do that if folks are agreeable.
In addition: I have the feeling that the following lines are now broken
in 8.0:
<param name="file.in" value="@..." />
<param name="file.out" value="@..." />
The at sign notation ("@") does not work for me here. 8.5 and 9.0 have a
dollar sign in place there:
<param name="file.in" value="$..." />
<param name="file.out" value="$..." />
which seems to make it work.
Furthermore in lines 173/174 there's a "zip" suffix missing.
My current patch would be:
Index: res/maven/mvn-pub.xml
===================================================================
--- res/maven/mvn-pub.xml (revision 1831386)
+++ res/maven/mvn-pub.xml (working copy)
@@ -50,16 +50,16 @@
<!--sign the jar, the source and the pom -->
<antcall target="-sign" >
- <param name="file.in" value="@{file}" />
- <param name="file.out" value="@{file}.asc" />
+ <param name="file.in" value="${file}" />
+ <param name="file.out" value="${file}.asc" />
</antcall>
<antcall target="-sign" >
- <param name="file.in" value="@{src}" />
- <param name="file.out" value="@{src}.asc" />
+ <param name="file.in" value="${src}" />
+ <param name="file.out" value="${src}.asc" />
</antcall>
<antcall target="-sign" >
- <param name="file.in" value="@{pom}.tmp" />
- <param name="file.out" value="@{pom}.asc" />
+ <param name="file.in" value="${pom}.tmp" />
+ <param name="file.out" value="${pom}.asc" />
</antcall>
<artifact:deploy file="${file}">
@@ -115,12 +115,12 @@
<!--sign the file and pom -->
<antcall target="-sign" >
- <param name="file.in" value="@{file}" />
- <param name="file.out" value="@{file}.asc" />
+ <param name="file.in" value="${file}" />
+ <param name="file.out" value="${file}.asc" />
</antcall>
<antcall target="-sign" >
- <param name="file.in" value="@{pom}.tmp" />
- <param name="file.out" value="@{pom}.asc" />
+ <param name="file.in" value="${pom}.tmp" />
+ <param name="file.out" value="${pom}.asc" />
</antcall>
<artifact:deploy file="${file}">
@@ -170,16 +170,16 @@
<!--sign the zip, the tar.gz and the pom -->
<antcall target="-sign" >
- <param name="file.in" value="@{file}" />
- <param name="file.out" value="@{file}.asc" />
+ <param name="file.in" value="${file}.zip" />
+ <param name="file.out" value="${file}.zip.asc" />
</antcall>
<antcall target="-sign" >
- <param name="file.in" value="@{file}.tar.gz" />
- <param name="file.out" value="@{file}.tar.gz.asc" />
+ <param name="file.in" value="${file}.tar.gz" />
+ <param name="file.out" value="${file}.tar.gz.asc" />
</antcall>
<antcall target="-sign" >
- <param name="file.in" value="@{pom}.tmp" />
- <param name="file.out" value="@{pom}.asc" />
+ <param name="file.in" value="${pom}.tmp" />
+ <param name="file.out" value="${pom}.asc" />
</antcall>
<artifact:deploy file="${pom}">
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1830251 - in /tomcat/tc8.0.x/trunk: ./
java/org/apache/tomcat/util/http/parser/HttpParser.java res/maven/mvn-pub.xml
test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java webapps/docs/changelog.xml
Posted by Konstantin Kolinko <kn...@gmail.com>.
2018-05-14 14:41 GMT+03:00 Rainer Jung <ra...@kippdata.de>:
> Am 30.04.2018 um 10:28 schrieb Mark Thomas:
>>
>> On 29/04/18 23:14, Violeta Georgieva wrote:
>>>
>>> On Sun, 29 Apr 2018 at 17:10, Violeta Georgieva <vi...@apache.org>
>>> wrote:
>>>>
>>>> On Sun, 29 Apr 2018 at 6:54, Mark Thomas <ma...@apache.org> wrote:
>>>>>
>>>>> On 28/04/18 17:50, Violeta Georgieva wrote:
>>
>>
>> <snip/>
>>
>>>>>> Is this file really part of that change?
>>>>>
>>>>>
>>>>> No. I think it got caught up with that commit by mistake. I don't
>>>>> think
>>>>> it does any harm though.
>>>>>
>>>>
>>>> Only for the release ;)
>>
>>
>> Sorry.
>>
>>> If you don’t mind I’ll revert this file to its previous version. Wdyt?
>>
>>
>> No objection.
>>
>> Looking at the diff, there are rather more changes between 8.0.x and
>> 8.5.x than I was expecting. Another option would be to update 8.0.x with
>> all the changes from 8.5.x and 9.0.x (and the same for 7.0.x). I'd be
>> happy to do that if folks are agreeable.
>
>
> In addition: I have the feeling that the following lines are now broken in
> 8.0:
>
> <param name="file.in" value="@..." />
> <param name="file.out" value="@..." />
>
> The at sign notation ("@") does not work for me here. 8.5 and 9.0 have a
> dollar sign in place there:
>
> <param name="file.in" value="$..." />
> <param name="file.out" value="$..." />
>
> which seems to make it work.
Good catch.
At notation ("@") is used whendefining a macros (with <macrodef> task),
http://ant.apache.org/manual-1.9.x/Tasks/macrodef.html
> Furthermore in lines 173/174 there's a "zip" suffix missing.
>
> My current patch would be:
>
> Index: res/maven/mvn-pub.xml
> ===================================================================
> --- res/maven/mvn-pub.xml (revision 1831386)
> +++ res/maven/mvn-pub.xml (working copy)
> @@ -50,16 +50,16 @@
>
> <!--sign the jar, the source and the pom -->
> <antcall target="-sign" >
> - <param name="file.in" value="@{file}" />
> - <param name="file.out" value="@{file}.asc" />
> + <param name="file.in" value="${file}" />
> + <param name="file.out" value="${file}.asc" />
> </antcall>
> <antcall target="-sign" >
> - <param name="file.in" value="@{src}" />
> - <param name="file.out" value="@{src}.asc" />
> + <param name="file.in" value="${src}" />
> + <param name="file.out" value="${src}.asc" />
> </antcall>
> <antcall target="-sign" >
> - <param name="file.in" value="@{pom}.tmp" />
> - <param name="file.out" value="@{pom}.asc" />
> + <param name="file.in" value="${pom}.tmp" />
> + <param name="file.out" value="${pom}.asc" />
> </antcall>
>
> <artifact:deploy file="${file}">
> @@ -115,12 +115,12 @@
>
> <!--sign the file and pom -->
> <antcall target="-sign" >
> - <param name="file.in" value="@{file}" />
> - <param name="file.out" value="@{file}.asc" />
> + <param name="file.in" value="${file}" />
> + <param name="file.out" value="${file}.asc" />
> </antcall>
> <antcall target="-sign" >
> - <param name="file.in" value="@{pom}.tmp" />
> - <param name="file.out" value="@{pom}.asc" />
> + <param name="file.in" value="${pom}.tmp" />
> + <param name="file.out" value="${pom}.asc" />
> </antcall>
>
> <artifact:deploy file="${file}">
> @@ -170,16 +170,16 @@
>
> <!--sign the zip, the tar.gz and the pom -->
> <antcall target="-sign" >
> - <param name="file.in" value="@{file}" />
> - <param name="file.out" value="@{file}.asc" />
> + <param name="file.in" value="${file}.zip" />
> + <param name="file.out" value="${file}.zip.asc" />
> </antcall>
> <antcall target="-sign" >
> - <param name="file.in" value="@{file}.tar.gz" />
> - <param name="file.out" value="@{file}.tar.gz.asc" />
> + <param name="file.in" value="${file}.tar.gz" />
> + <param name="file.out" value="${file}.tar.gz.asc" />
> </antcall>
> <antcall target="-sign" >
> - <param name="file.in" value="@{pom}.tmp" />
> - <param name="file.out" value="@{pom}.asc" />
> + <param name="file.in" value="${pom}.tmp" />
> + <param name="file.out" value="${pom}.asc" />
> </antcall>
>
> <artifact:deploy file="${pom}">
>
>
> Regards,
>
> Rainer
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org