Diff tomcat-9.0.80 with a tomcat-10.1.13

/usr/portage/www-servers/tomcat/tomcat-10.1.13.ebuild 2023-10-09 14:52:35.900368512 +0300
14 14
BND_VERSION="6.4.0"
15 15
BND="biz.aQute.bnd-${BND_VERSION}.jar"
16 16

  
17
DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
17
DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
18 18
HOMEPAGE="https://tomcat.apache.org/"
19
SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
19
SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
20 20
	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
21 21
	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
22 22

  
23 23
LICENSE="Apache-2.0"
24
SLOT="9"
25
KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
24
SLOT="10.1"
25
KEYWORDS="amd64 ~arm ~arm64 ~amd64-linux"
26 26
IUSE="extra-webapps"
27 27

  
28 28
RESTRICT="test" # can we run them on a production system?
29 29

  
30
# though it could work with 4.22 and upstream uses 4.20,
31
# we still use 4.15 because 4.20+ is currently built with java 11
32
# and it would force Tomcat to use at least java 11 too
33
ECJ_SLOT="4.15"
30
ECJ_SLOT="4.26"
34 31

  
35 32
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
36 33
	dev-java/jax-rpc-api:0
34
	>=dev-java/jakartaee-migration-1.0.5:0
37 35
	dev-java/wsdl4j:0"
38 36
RDEPEND="${COMMON_DEP}
39 37
	acct-group/tomcat
40 38
	acct-user/tomcat
41
	>=virtual/jre-1.8:*"
39
	>=virtual/jre-11:*"
42 40
DEPEND="${COMMON_DEP}
43 41
	app-admin/pwgen
44 42
	dev-java/ant-core
45
	>=virtual/jdk-1.8:*
43
	>=virtual/jdk-11:*
46 44
	test? (
47
		dev-java/ant-junit
45
		dev-java/ant-junit:0
48 46
		dev-java/easymock:3.2
49 47
	)"
50 48

  
51 49
BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
52 50
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
53 51

  
54
S=${WORKDIR}/${MY_P}
52
PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" )
55 53

  
56
PATCHES=(
57
	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
58
	"${FILESDIR}/${PN}-9.0.72-build.xml.patch"
59
)
54
S=${WORKDIR}/${MY_P}
60 55

  
61 56
BND_HOME="${S}/tomcat-build-libs/bnd"
62 57
BND_JAR="${BND_HOME}/${BND}"
......
77 72

  
78 73
	find -name '*.jar' -type f -delete -print || die
79 74

  
75
	local vm_version="$(java-config -g PROVIDES_VERSION)"
76

  
80 77
	# For use of catalina.sh in netbeans
81 78
	sed -i -e "/^# ----- Execute The Requested Command/ a\
82 79
		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
......
88 85
JAVA_ANT_REWRITE_CLASSPATH="true"
89 86

  
90 87
EANT_BUILD_TARGET="deploy"
91
EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},wsdl4j"
88
EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,wsdl4j"
92 89
EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
93 90
EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
94 91
EANT_NEEDS_TOOLS="true"
......
175 172
	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
176 173
	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
177 174

  
175
	ewarn "Please note that since version 10 the primary package for all implemented APIs"
176
	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
177
	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
178

  
178 179
	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
179 180
	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
180 181
}
Thank you!