On Wed, Apr 8, 2026 at 3:11 PM <[email protected]> wrote:
> 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 4971ee2606 Update the URL to the CDDL 1.0 license > 4971ee2606 is described below > > commit 4971ee2606c39c04b1d30479ac0810d44740066c > Author: Mark Thomas <[email protected]> > AuthorDate: Wed Apr 8 12:58:01 2026 +0100 > > Update the URL to the CDDL 1.0 license > --- > res/maven/tomcat-servlet-api.pom | 2 +- > webapps/docs/changelog.xml | 3 +++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/res/maven/tomcat-servlet-api.pom > b/res/maven/tomcat-servlet-api.pom > index 7c04ebec0d..a826d1c876 100644 > --- a/res/maven/tomcat-servlet-api.pom > +++ b/res/maven/tomcat-servlet-api.pom > @@ -34,7 +34,7 @@ > </name> > <url> > http://www.apache.org/licenses/LICENSE-2.0.txt and > - http://www.opensource.org/licenses/cddl1.txt and > + https://opensource.org/license/CDDL-1.0 and > https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt > </url> > <distribution>repo</distribution> > diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml > index d29a32f0c7..5d8d8da9dd 100644 > --- a/webapps/docs/changelog.xml > +++ b/webapps/docs/changelog.xml > @@ -372,6 +372,9 @@ > Update Derby to 10.17.1.0. (markt) > </update> > <!-- Entries for backport and removal before 12.0.0-M1 below this > line --> > + <fix> > + <bug>69993</bug>: Update the URL to the CDDL 1.0 license. (markt) > + </fix> > </changelog> > </subsection> > </section> > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > I was looking at that at the same time :/ Should we consider adding an assignee to the PRs or something to prevent conflicts?
