You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Mark Thomas <ma...@apache.org> on 2022/01/18 09:04:28 UTC
All current branches building with Java 11
Hi all,
I've just completed the switch to building with Java 11 for all
currently supported branches.
I have performed a spot check on local builds of 10.0.x, 9.0.x and 8.5.x
and the Java class version is correct.
I am monitoring the CI systems. All looks good for 10.0.x and 9.0.x.
Just need to wait for 8.5.x to build with Buildbot and Gump. Ah -
Travis. I need to check that...
Next up is reviewing a diff of the build files between versions to check
that there aren't any unexpected discrepancies.
After that is looking at dependencies. My plan is to update test
libraries, and build tool (checkstyle, jsign etc) to the same version
for all branches now we no longer need to used older versions for older
branches.
I should hopefully get all of the above done today.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: All current branches building with Java 11
Posted by Mark Thomas <ma...@apache.org>.
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 markt@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-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
Re: All current branches building with Java 11
Posted by Rainer Jung <ra...@kippdata.de>.
I had a little nag mailed on January 20th.
Copying here:
Am 13.01.2022 um 17:36 schrieb markt@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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org