gentoo auto-resync : 05:02:2024 - 11:43:07

4 files changed, 99 insertions, 4 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a487d0338bfb..a0e6b3895a3e 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 388855965b26..f3034ada239d 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,3 +1,4 @@
 DIST jakartaee-migration-1.0.7-sources.tar.gz 43381 BLAKE2B 9a1a6bfd217f77890940240c6c860e21e0b72c758a63426a0c63009213738a9322a758d4525a9a8a8c69883c490edf128d8b70a6120ede431da434c4d1408e19 SHA512 f7edd70b997b2ae2a93b14b93c5b6dcb80de04f554125729f89e62eddaecfbfea21b304226887edb029c8a7b255b50a55a38381d017c7d44859f2e56b912f25a
-EBUILD jakartaee-migration-1.0.7-r1.ebuild 2906 BLAKE2B 54e23eddd457ccfc5e693064eeadfe94a369144f180cda8e9bd372c535de1ba871dfdd14df2bc3f6fd356a727de5718b2cc0d96f863978e4cdfdd51b22ede8b1 SHA512 1b8797cd4d9ca032f1c9d69bf89a8c3b281f79f09bb6a2de54b12dd823e17ffb5ba8fe1af66c3659309da89b49dae52f04c5853dd1361f4ad17ae3ef85064ead
+EBUILD jakartaee-migration-1.0.7-r1.ebuild 2896 BLAKE2B d2ea40493a111e042db9b4a190b9c1c675c9e7a12c897fc3a6002269037631bae0feb9c45de383dc89d098775733abe9bb4681e6f64237535143791c56b979bf SHA512 274c4b900966fa2e51a9d97d7f43502a920e8b931a74cb548c43769b27b8272086f0dcad29eee78616f6df6c6e52332537fc6b28f47e075db5d7ac461c609efe
+EBUILD jakartaee-migration-1.0.7-r2.ebuild 2900 BLAKE2B 10fd1c820538f126b4f6c56035e88e0537a722e673e757ff23ffe87ec9ac1c7eee19dcebbecd37a719396b3312412bd371b7cdd45f5cabf9443fe58602c8b16f SHA512 1375eff2fb839dc0225205b874d22baee690802f2e73bdada0ea58e1e9aac73937f1ab3fb214fd34955397cad89902bd7a8e7272e520c7f4c77313eeee52c492
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
index 4308d151f1bf..021d35532658 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -77,8 +77,8 @@ src_prepare() {
 src_test() {
 	# we need to create jar files for the tests the same way as it's done using pom.xml
 	local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
-	mkdir -p target/test-classes/META-INF || die
-	pushd target/test-classes || die
+	mkdir -p generated-test/META-INF || die
+	pushd generated-test || die
 	echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
 	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
 	jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
new file mode 100644
index 000000000000..339a87cf928b
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
+HOMEPAGE="https://tomcat.apache.org"
+SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# org.apache.bcel:bcel:6.6.0 -> >=dev-java/bcel-6.6.0:0
+# org.apache.commons:commons-compress:1.22 -> !!!suitable-mavenVersion-not-found!!!
+
+CDEPEND="
+	>=dev-java/ant-1.10.14-r1:0
+	dev-java/bcel:0
+	dev-java/commons-compress:0
+	dev-java/commons-io:1
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.ant:ant:1.10.12 -> !!!suitable-mavenVersion-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+# we need jdk-11 just for some tests as those need stuff from newer jdk,
+# otherwise the package as of version 1.0.7 compiles fine with jdk 1.8
+# with tests disabled
+# see bug https://bugs.gentoo.org/910499
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant,bcel,commons-compress,commons-io-1"
+JAVA_SRC_DIR="src/main/java"
+JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
+JAVA_RESOURCE_DIRS=(
+	"src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)
+JAVA_TEST_EXCLUDES=(
+	"org.apache.tomcat.jakartaee.TesterConstants"
+)
+
+src_prepare() {
+	default
+	sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
+}
+
+src_test() {
+	# we need to create jar files for the tests the same way as it's done using pom.xml
+	local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
+	mkdir -p generated-test/META-INF || die
+	pushd generated-test || die
+	echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
+	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
+	jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
+	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
+	jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
+	for enc in rsa dsa ec; do
+		cp hellocgi.jar hellocgi-signed-${enc}.jar || die
+		jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
+	done
+	popd
+
+	java-pkg-simple_src_test
+}