From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2B11C158041 for ; Fri, 22 Mar 2024 08:43:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 600C9E29B9; Fri, 22 Mar 2024 08:43:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3BB6AE29B9 for ; Fri, 22 Mar 2024 08:43:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 589EE34301E for ; Fri, 22 Mar 2024 08:43:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3FDF15BD for ; Fri, 22 Mar 2024 08:43:07 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1711096977.9cd09dc29c90c7149e42c899d13a0c38a28ceb85.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/jakartaee-migration/Manifest dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild X-VCS-Directories: dev-java/jakartaee-migration/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 9cd09dc29c90c7149e42c899d13a0c38a28ceb85 X-VCS-Branch: master Date: Fri, 22 Mar 2024 08:43:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7780b7cf-aee1-4416-9cf2-9480418af964 X-Archives-Hash: ee844472cc552d46636e2655f5ab2531 commit: 9cd09dc29c90c7149e42c899d13a0c38a28ceb85 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Mar 22 08:01:45 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Mar 22 08:42:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd09dc2 dev-java/jakartaee-migration: drop 1.0.7-r2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/jakartaee-migration/Manifest | 1 - .../jakartaee-migration-1.0.7-r2.ebuild | 94 ---------------------- 2 files changed, 95 deletions(-) diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest index b2977130e476..604ff981904b 100644 --- a/dev-java/jakartaee-migration/Manifest +++ b/dev-java/jakartaee-migration/Manifest @@ -1,2 +1 @@ -DIST jakartaee-migration-1.0.7-sources.tar.gz 43381 BLAKE2B 9a1a6bfd217f77890940240c6c860e21e0b72c758a63426a0c63009213738a9322a758d4525a9a8a8c69883c490edf128d8b70a6120ede431da434c4d1408e19 SHA512 f7edd70b997b2ae2a93b14b93c5b6dcb80de04f554125729f89e62eddaecfbfea21b304226887edb029c8a7b255b50a55a38381d017c7d44859f2e56b912f25a DIST jakartaee-migration-1.0.8-sources.tar.gz 43466 BLAKE2B f9ffbb46ef6a26c9884e1d3eb55f283556cf8dbaf0955c9efe7e9766f77eadaae1e5bd066225948e9d97adac0f2f34fee3d6ad552bbbdad7303a0abb98d3070c SHA512 ecb1db63cb258b1b8c0e8106ea171e80e66622a48cafa62f8fb75e1b1ba6d539cfefc5dfe0ba9536d06b102c599afeba80d094598d2af3fe1d2ca153ef61ced8 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 deleted file mode 100644 index 7e8daacf6943..000000000000 --- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# 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 -}