git: b5f9ca9d84f3 - main - www/tomcat{9,101,-devel}: Update to 9.0.70, 10.1.4, 11.0.0-M1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Sat, 10 Dec 2022 01:39:28 UTC
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b5f9ca9d84f3eb684ae0333ef95c63cdc34b5683

commit b5f9ca9d84f3eb684ae0333ef95c63cdc34b5683
Author:     VVD <vvd@unislabs.com>
AuthorDate: 2022-12-10 01:36:57 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-12-10 01:39:00 +0000

    www/tomcat{9,101,-devel}: Update to 9.0.70, 10.1.4, 11.0.0-M1
    
    ChangeLog:
    https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.70_(remm)
    https://tomcat.apache.org/tomcat-10.1-doc/changelog.html#Tomcat_10.1.4_(markt)
    https://tomcat.apache.org/tomcat-11.0-doc/changelog.html#Tomcat_11.0.0-M1_(markt)
    
    PR:             268280
---
 www/tomcat-devel/Makefile  | 2 +-
 www/tomcat-devel/distinfo  | 6 +++---
 www/tomcat-devel/pkg-descr | 8 ++++----
 www/tomcat101/Makefile     | 2 +-
 www/tomcat101/distinfo     | 6 +++---
 www/tomcat101/pkg-plist    | 2 +-
 www/tomcat9/Makefile       | 2 +-
 www/tomcat9/distinfo       | 6 +++---
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index 9c702757e572..dc35824847e2 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	10.1.2
+DISTVERSION=	11.0.0-M1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo
index 8e3c7c3668c5..9f35b3cb4ac1 100644
--- a/www/tomcat-devel/distinfo
+++ b/www/tomcat-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668503115
-SHA256 (apache-tomcat-10.1.2.tar.gz) = 0ae2087f3e2355a33263eed89b05ea436d73c3934f64a0ee3cf5f1e28da3583a
-SIZE (apache-tomcat-10.1.2.tar.gz) = 12111013
+TIMESTAMP = 1670264590
+SHA256 (apache-tomcat-11.0.0-M1.tar.gz) = ab252ed0495e4f7e85b987afbbec37834ab9718f2428026e7fd2f8be90f1932e
+SIZE (apache-tomcat-11.0.0-M1.tar.gz) = 12064343
diff --git a/www/tomcat-devel/pkg-descr b/www/tomcat-devel/pkg-descr
index 15a66f08fd07..57f0ed2ec3ff 100644
--- a/www/tomcat-devel/pkg-descr
+++ b/www/tomcat-devel/pkg-descr
@@ -1,6 +1,6 @@
 Apache Tomcat is a web server written in 100% Pure Java.
 
-Apache Tomcat 10.1.x is the current focus of development. It builds on
-Tomcat 10.0.x and implements the Servlet 6.0, JSP 3.1, EL 5.0, WebSocket 2.1
-and Authentication 3.0 specifications (the versions required by Jakarta EE 10
-platform).
+Apache Tomcat 11.0.x is the current focus of development. It builds on
+Tomcat 10.1.x and implements the Servlet 6.1, JSP 4.0, EL 6.0, WebSocket TDB
+and Authentication TDB specifications.
+This release is a milestone release and is targeted at Jakarta EE 11.
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile
index ee607ccc5ebf..e7b742b47bfd 100644
--- a/www/tomcat101/Makefile
+++ b/www/tomcat101/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	10.1.2
+DISTVERSION=	10.1.4
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	101
diff --git a/www/tomcat101/distinfo b/www/tomcat101/distinfo
index 852fecd5be8c..d6f09fff8087 100644
--- a/www/tomcat101/distinfo
+++ b/www/tomcat101/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668503044
-SHA256 (apache-tomcat-10.1.2.tar.gz) = 0ae2087f3e2355a33263eed89b05ea436d73c3934f64a0ee3cf5f1e28da3583a
-SIZE (apache-tomcat-10.1.2.tar.gz) = 12111013
+TIMESTAMP = 1670597201
+SHA256 (apache-tomcat-10.1.4.tar.gz) = 95e68c8663187aa62de9b3e6869b2835a61975a38b64949d7c06bd64aef7f17f
+SIZE (apache-tomcat-10.1.4.tar.gz) = 12119820
diff --git a/www/tomcat101/pkg-plist b/www/tomcat101/pkg-plist
index e146ddc7133f..3f963ce76507 100644
--- a/www/tomcat101/pkg-plist
+++ b/www/tomcat101/pkg-plist
@@ -29,7 +29,7 @@
 %%T%%/lib/catalina.jar
 %%T%%/lib/ecj-4.25.jar
 %%T%%/lib/el-api.jar
-%%T%%/lib/jakartaee-migration-1.0.5-shaded.jar
+%%T%%/lib/jakartaee-migration-1.0.6-shaded.jar
 %%T%%/lib/jasper-el.jar
 %%T%%/lib/jasper.jar
 %%T%%/lib/jaspic-api.jar
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index c5cae7949f09..05c91ff873de 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-PORTVERSION=	9.0.69
+PORTVERSION=	9.0.70
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	9
diff --git a/www/tomcat9/distinfo b/www/tomcat9/distinfo
index fe71884ad0aa..751d7e2e88dd 100644
--- a/www/tomcat9/distinfo
+++ b/www/tomcat9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668502999
-SHA256 (apache-tomcat-9.0.69.tar.gz) = ef6564505f43f8f50afc25b7aa3b1ee4bae8c937f1d93131007f179fab92805a
-SIZE (apache-tomcat-9.0.69.tar.gz) = 11607790
+TIMESTAMP = 1670260173
+SHA256 (apache-tomcat-9.0.70.tar.gz) = 38bc58342dccc3b0b2c238f55ff4f579a0a550758be940492e47e3fa622fb3a4
+SIZE (apache-tomcat-9.0.70.tar.gz) = 11613418