On 24/01/2022 11:52, Rainer Jung wrote:
I had a little nag mailed on January 20th.
Thanks for the reminder.
Should be fixed now.
Mark
Copying here:
Am 13.01.2022 um 17:36 schrieb ma...@apache.org:
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/main by this push:
> new 0188b6d Remove unnecessary references to compile.source
and compile.target
> 0188b6d is described below
>
> commit 0188b6d8f326aa83dabeeefe18d70a5b92fbbace
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Thu Jan 13 16:36:32 2022 +0000
>
> Remove unnecessary references to compile.source and compile.target
> Since we are using release, that overrides source and target.
> ---
> build.xml | 31 +++++++++----------------------
> 1 file changed, 9 insertions(+), 22 deletions(-)
>
> diff --git a/build.xml b/build.xml
> index dbacea4..9dc3217 100644
> --- a/build.xml
> +++ b/build.xml
...
> @@ -983,8 +977,8 @@
> <target name="build-manifests" unless="manifests.uptodate"
> depends="build-prepare">
> <!-- Filtering tokens for JAR manifests-->
> - <filter token="source.jdk" value="${compile.source}"/>
> - <filter token="target.jdk" value="${compile.target}"/>
> + <filter token="source.jdk" value="${compile.release}"/>
> + <filter token="target.jdk" value="${compile.release}"/>
> <filter token="servlet.spec.version"
value="${servlet.spec.version}"/>
> <filter token="servlet.revision" value="${servlet.revision}"/>
> <filter token="jsp.spec.version" value="${jsp.spec.version}"/>
...
File res/bnd/build-defaults.bnd contains:
X-Compile-Source-JDK: ${compile.source}
X-Compile-Target-JDK: ${compile.target}
which leads to
[bnd] 2 WARNINGS
[bnd] No translation found for macro: compile.target
[bnd] No translation found for macro: compile.source
when bnd runs.
I have not tried, whether it suffices to use compile.release, or whether
compile.release also has to be added to the version.filters in build.xml.
Observed for 10.0.16, but probably the same in the current HEADS for
multiple branches.
Best regards,
Rainer
---------------------------------------------------------------------
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
