[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2024-03-22 Thread Miroslav Šulc
commit: 9cd09dc29c90c7149e42c899d13a0c38a28ceb85
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Mar 22 08:01:45 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Mar 22 08:42:57 2024 +
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..
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2024-03-22 Thread Arthur Zamarin
commit: db4d383597d94269214788338482c0373c409686
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 22 06:49:51 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 22 06:49:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db4d3835

dev-java/jakartaee-migration: Stabilize 1.0.8-r1 amd64, #926741

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
index 6203c0152c9b..4ee56f6fa8ae 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 
 CP_DEPEND="
>=dev-java/ant-1.10.14-r1:0



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2024-03-04 Thread Miroslav Šulc
commit: 7835c3afc60fd4d8e2651b3bf56ae55ef2ccf3bb
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Mar  4 09:16:08 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Mar  4 09:16:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7835c3af

dev-java/jakartaee-migration: fixed dependency version in 1.0.8-r1

Signed-off-by: Miroslav Šulc  gentoo.org>

 ...rtaee-migration-1.0.8.ebuild => jakartaee-migration-1.0.8-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.8.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
similarity index 98%
rename from dev-java/jakartaee-migration/jakartaee-migration-1.0.8.ebuild
rename to dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
index 41b5ca2d7e47..6203c0152c9b 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.8.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~arm ~arm64"
 CP_DEPEND="
>=dev-java/ant-1.10.14-r1:0
dev-java/bcel:0
-   dev-java/commons-compress:0
+   >=dev-java/commons-compress-1.26.0:0
dev-java/commons-io:1
 "
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2024-03-03 Thread Miroslav Šulc
commit: 200e2c71b7a7958549b103d087df09147c15bf01
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Mar  3 07:28:43 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Mar  3 10:13:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=200e2c71

dev-java/jakartaee-migration: drop 1.0.7-r1

Closes: https://bugs.gentoo.org/923607
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35607
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../jakartaee-migration-1.0.7-r1.ebuild| 94 --
 1 file changed, 94 deletions(-)

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
deleted file mode 100644
index 021d35532658..
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.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-core: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-core,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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2024-02-25 Thread Jakov Smolić
commit: 76af38b4eb124581354f8045499af7871e26b996
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Feb 25 19:19:39 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Feb 25 19:19:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76af38b4

dev-java/jakartaee-migration: Stabilize 1.0.7-r2 amd64, #922766

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 339a87cf928b..7e8daacf6943 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64"
 
 # Common dependencies
 # POM: pom.xml



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2024-02-11 Thread Miroslav Šulc
commit: 91b319f57b9781b3230ec6f375f3b8661080cef9
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Feb 10 11:08:23 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb 11 12:12:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b319f5

dev-java/jakartaee-migration: add github upstream metadata

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/metadata.xml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-java/jakartaee-migration/metadata.xml 
b/dev-java/jakartaee-migration/metadata.xml
index 6021501589e0..e9aebc513f50 100644
--- a/dev-java/jakartaee-migration/metadata.xml
+++ b/dev-java/jakartaee-migration/metadata.xml
@@ -1,8 +1,11 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   j...@gentoo.org
-   Java
-
+   
+   j...@gentoo.org
+   Java
+   
+   
+   apache/tomcat-jakartaee-migration
+   
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/, dev-java/commons-compress/

2024-02-11 Thread Miroslav Šulc
commit: 51d423fd6ac15959e34a3958c87c7d78154b6545
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Feb 10 10:31:55 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb 11 12:12:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d423fd

dev-java/jakartaee-migration: add 1.0.8

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/commons-compress/Manifest |  1 +
 .../commons-compress-1.25.0.ebuild | 83 ++
 dev-java/jakartaee-migration/Manifest  |  1 +
 .../jakartaee-migration-1.0.8.ebuild   | 72 +++
 4 files changed, 81 insertions(+), 76 deletions(-)

diff --git a/dev-java/commons-compress/Manifest 
b/dev-java/commons-compress/Manifest
index d12369cb098f..9602eaf51057 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,2 +1,3 @@
 DIST commons-compress-1.21-src.tar.gz 15165800 BLAKE2B 
3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a
 SHA512 
8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
 DIST commons-compress-1.25.0-src.tar.gz 48385431 BLAKE2B 
d0ddf5ebc405355c771532dc64ddcacb6a8eb0053eb64a07890136b9f5a2ab2ae8dec33c64a80ee9d902b4c74295e80b1bf66178c19e19bfd0d4cd31acbbcc44
 SHA512 
58d9ed8160af2842fe4338ae265d591b9f96293f8997c420721e86f8c8ffce5b3a5dbc83b87b813ea68505b56cbddd02332540f0a4e01bdc7f7f36e357ba2b7a
+DIST commons-compress-1.25.0-src.tar.gz.asc 488 BLAKE2B 
4a530dee5953e9fa11d99fe7bbfaadd16eef8eb48b50a4edd6c1416766c11d261e9af4632f0601d5cc2d97e73be4e7e0c1a15857e9e5e4a43c54ba9ddaa0e65d
 SHA512 
4ced6e60590ab110c948766cdd86349e66605f9711b650ba8f4514dfd0cfb22c7b8d356a9e4433b3dfa4ceffddc3de53f8a1f174ab33d80e9f77d7469ed916ae

diff --git a/dev-java/commons-compress/commons-compress-1.25.0.ebuild 
b/dev-java/commons-compress/commons-compress-1.25.0.ebuild
index 7d48127292c2..9eca7a8afbba 100644
--- a/dev-java/commons-compress/commons-compress-1.25.0.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.25.0.ebuild
@@ -1,110 +1,41 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # Not ready for running tests, https://bugs.gentoo.org/839681
 JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-compress:1.24"
+MAVEN_ID="org.apache.commons:commons-compress:${PV}"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple verify-sig
 
 DESCRIPTION="Java API for working with archive files"
-# HOMEPAGE="https://commons.apache.org/proper/commons-compress/;
-# SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz
-#  verify-sig? ( 
https://downloads.apache.org/commons/compress/source/${P}-src.tar.gz.asc )"
+HOMEPAGE="https://commons.apache.org/proper/commons-compress/;
+SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz
+   verify-sig? ( 
https://downloads.apache.org/commons/compress/source/${P}-src.tar.gz.asc )"
 S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
 CP_DEPEND="
dev-java/asm:9
dev-java/brotli-dec:0
dev-java/xz-java:0
dev-java/zstd-jni:0
 "
-
 DEPEND="${CP_DEPEND}
>=virtual/jdk-11:*
dev-java/osgi-core:0"
-#  test? (
-#  dev-java/commons-io:1
-#  dev-java/commons-lang:3.6
-#  dev-java/felix-framework:0
-#  dev-java/hamcrest:0
-#  dev-java/javax-inject:0
-#  dev-java/junit:5
-#  dev-java/memoryfilesystem:0
-#  dev-java/mockito:4
-#  dev-java/mockito-junit-jupiter:4
-#  dev-java/slf4j-api:0
-#  )
-#"
-
 RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*"
 
-# BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
-# 
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
-
 JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.compress"
 JAVA_CLASSPATH_EXTRA="osgi-core"
 JAVA_ENCODING="iso-8859-1"
 JAVA_MAIN_CLASS="org.apache.commons.compress.archivers.Lister"
 JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
-   commons-io-1
-   commons-lang-3.6
-   felix-framework
-   javax-inject
-   junit-4
-   junit-5
-   hamcrest
-   memoryfilesystem
-   mockito-4
-   mockito-junit-jupiter-4
-   slf4j-api
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-#  default
-   java-pkg-2_src_prepare
-   # error: package 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2024-02-05 Thread Miroslav Šulc
commit: d4bbac105d90e4fda3c8d6568d92054cfec16c23
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Feb  2 18:00:44 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Feb  5 09:08:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bbac10

dev-java/jakartaee-migration: add 1.0.7-r2 for >=dev-java/ant-1.10.14-r1

Bug: https://bugs.gentoo.org/923607
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35144
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild  |  6 +++---
 ...n-1.0.7-r1.ebuild => jakartaee-migration-1.0.7-r2.ebuild} | 12 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

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-r1.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
similarity index 91%
copy from dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
copy to dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
index 4308d151f1bf..339a87cf928b 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.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
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 # Common dependencies
 # POM: pom.xml
@@ -23,7 +23,7 @@ KEYWORDS="amd64 ~arm ~arm64"
 # org.apache.commons:commons-compress:1.22 -> 
!!!suitable-mavenVersion-not-found!!!
 
 CDEPEND="
-   dev-java/ant-core:0
+   >=dev-java/ant-1.10.14-r1:0
dev-java/bcel:0
dev-java/commons-compress:0
dev-java/commons-io:1
@@ -53,7 +53,7 @@ S="${WORKDIR}/${P}"
 
 JAVA_LAUNCHER_FILENAME="${PN}"
 
-JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
+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=(
@@ -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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2023-09-05 Thread Miroslav Šulc
commit: bea6c4eada492e59f284e339c68ef010c0e0cf7b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Sep  5 07:33:43 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Sep  5 07:33:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea6c4ea

dev-java/jakartaee-migration: added comment to jdk version in DEPEND

Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild | 5 +
 1 file changed, 5 insertions(+)

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 27e7ce0744a9..4308d151f1bf 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
@@ -35,6 +35,11 @@ CDEPEND="
 # 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}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2023-09-05 Thread Miroslav Šulc
commit: 58c81279a0729be6c5f69c2814f650845755b767
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Sep  4 15:06:30 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Sep  5 07:33:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58c81279

dev-java/jakartaee-migration: min java 11

Closes: https://bugs.gentoo.org/910499
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/32606
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...rtaee-migration-1.0.7.ebuild => jakartaee-migration-1.0.7-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
similarity index 99%
rename from dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
rename to dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
index d9f90c755e38..27e7ce0744a9 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild
@@ -36,7 +36,7 @@ CDEPEND="
 # test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
 
 DEPEND="
-   >=virtual/jdk-1.8:*
+   >=virtual/jdk-11:*
${CDEPEND}
 "
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2023-07-18 Thread Sam James
commit: cf7c1d5c1d0cf9242739e35f536a66568a7116eb
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 18 17:20:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 18 17:20:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf7c1d5c

dev-java/jakartaee-migration: Keyword 1.0.7 arm, #906822

Signed-off-by: Sam James  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
index de93c66445c1..d9f90c755e38 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
@@ -14,7 +14,7 @@ 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 ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 
 # Common dependencies
 # POM: pom.xml



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2023-07-18 Thread Sam James
commit: bfd7cb3a957bd2410bd80d6c88ebb459a45034c7
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 18 17:20:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 18 17:20:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd7cb3a

dev-java/jakartaee-migration: Keyword 1.0.7 arm64, #906822

Signed-off-by: Sam James  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
index 8f226b5871b0..de93c66445c1 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm64"
 
 # Common dependencies
 # POM: pom.xml



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2023-06-12 Thread Miroslav Šulc
commit: 75de6a9c021e648297bfc2b6ae53e2c07005202d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jun 12 06:45:03 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jun 12 06:45:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75de6a9c

dev-java/jakartaee-migration: dropped obsolete 1.0.6

Bug: https://bugs.gentoo.org/908293
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 -
 .../jakartaee-migration-1.0.6.ebuild   | 92 --
 2 files changed, 93 deletions(-)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index b392a5f7d49c..085e1f137a17 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,2 +1 @@
-DIST jakartaee-migration-1.0.6-sources.tar.gz 42167 BLAKE2B 
9252078f3b31e07dab533ca9d1d32812f49571adf942a3f11bf074d2110b5fb0c2500dae244b10597f0d76c18bb153cd577528cb01ff01350abb46d32251293a
 SHA512 
81ecfe561695e4e5cacaed0ef89e5759e357b332f2798ac6f3d89c43c9a5dfed1a684745b7fe3afe6d1e82ac9405fd2de68da599a53bfe5f67397b452753b572
 DIST jakartaee-migration-1.0.7-sources.tar.gz 43381 BLAKE2B 
9a1a6bfd217f77890940240c6c860e21e0b72c758a63426a0c63009213738a9322a758d4525a9a8a8c69883c490edf128d8b70a6120ede431da434c4d1408e19
 SHA512 
f7edd70b997b2ae2a93b14b93c5b6dcb80de04f554125729f89e62eddaecfbfea21b304226887edb029c8a7b255b50a55a38381d017c7d44859f2e56b912f25a

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
deleted file mode 100644
index 8e03edd54b96..
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.tar.gz
 --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.5.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.6"
-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"
-
-# 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-core:0
-   >=dev-java/bcel-6.6.0:0
-   >=dev-java/commons-compress-1.21:0
-   >=dev-java/commons-io-2.11.0: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
-
-DEPEND="
-   >=virtual/jdk-1.8:*
-   ${CDEPEND}
-"
-
-RDEPEND="
-   >=virtual/jre-1.8:*
-   ${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,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 target/test-classes/META-INF || die
-   pushd target/test-classes || 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
-  

[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2023-06-11 Thread Sam James
commit: 9971b159c2b5090b846bc1d02a97e7cd058440e9
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 11 13:45:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 11 13:45:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9971b159

dev-java/jakartaee-migration: Stabilize 1.0.7 amd64, #908293

Signed-off-by: Sam James  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
index 212872e15d9a..8f226b5871b0 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64"
 
 # Common dependencies
 # POM: pom.xml



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2023-05-09 Thread Miroslav Šulc
commit: a32b5232e59dcd59b233d55be95ce355f63d5d4f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed May 10 05:36:12 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed May 10 05:36:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a32b5232

dev-java/jakartaee-migration: bump to 1.0.7

Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 +
 .../jakartaee-migration-1.0.7.ebuild   | 89 ++
 2 files changed, 90 insertions(+)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index a3a1cf6aa5a0..b392a5f7d49c 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1 +1,2 @@
 DIST jakartaee-migration-1.0.6-sources.tar.gz 42167 BLAKE2B 
9252078f3b31e07dab533ca9d1d32812f49571adf942a3f11bf074d2110b5fb0c2500dae244b10597f0d76c18bb153cd577528cb01ff01350abb46d32251293a
 SHA512 
81ecfe561695e4e5cacaed0ef89e5759e357b332f2798ac6f3d89c43c9a5dfed1a684745b7fe3afe6d1e82ac9405fd2de68da599a53bfe5f67397b452753b572
+DIST jakartaee-migration-1.0.7-sources.tar.gz 43381 BLAKE2B 
9a1a6bfd217f77890940240c6c860e21e0b72c758a63426a0c63009213738a9322a758d4525a9a8a8c69883c490edf128d8b70a6120ede431da434c4d1408e19
 SHA512 
f7edd70b997b2ae2a93b14b93c5b6dcb80de04f554125729f89e62eddaecfbfea21b304226887edb029c8a7b255b50a55a38381d017c7d44859f2e56b912f25a

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
new file mode 100644
index ..212872e15d9a
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 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"
+
+# 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-core: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
+
+DEPEND="
+   >=virtual/jdk-1.8:*
+   ${CDEPEND}
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,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 target/test-classes/META-INF || die
+   pushd target/test-classes || 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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-12-17 Thread Miroslav Šulc
commit: e6255d0bb3835e472c49cbc63bcf8ae71a421e02
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Dec 17 09:46:56 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Dec 17 09:46:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6255d0b

dev-java/jakartaee-migration: dropped obsolete 1.0.4

Bug: https://bugs.gentoo.org/886283
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 -
 .../jakartaee-migration-1.0.4.ebuild   | 92 --
 2 files changed, 93 deletions(-)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index 7251be753cd4..a3a1cf6aa5a0 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,2 +1 @@
-DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B 
c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f
 SHA512 
a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644
 DIST jakartaee-migration-1.0.6-sources.tar.gz 42167 BLAKE2B 
9252078f3b31e07dab533ca9d1d32812f49571adf942a3f11bf074d2110b5fb0c2500dae244b10597f0d76c18bb153cd577528cb01ff01350abb46d32251293a
 SHA512 
81ecfe561695e4e5cacaed0ef89e5759e357b332f2798ac6f3d89c43c9a5dfed1a684745b7fe3afe6d1e82ac9405fd2de68da599a53bfe5f67397b452753b572

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
deleted file mode 100644
index 92c0218f4b3b..
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.4/source/jakartaee-migration-1.0.4-src.tar.gz
 --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.4.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.4"
-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"
-
-# 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.5.0 -> >=dev-java/bcel-6.5.0:0
-# org.apache.commons:commons-compress:1.21 -> 
>=dev-java/commons-compress-1.21:0
-
-CDEPEND="
-   dev-java/ant-core:0
-   >=dev-java/bcel-6.5.0:0
-   >=dev-java/commons-compress-1.21:0
-   >=dev-java/commons-io-2.11.0: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
-
-DEPEND="
-   >=virtual/jdk-1.8:*
-   ${CDEPEND}
-"
-
-RDEPEND="
-   >=virtual/jre-1.8:*
-   ${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,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 target/test-classes/META-INF || die
-   pushd target/test-classes || 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
- 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-12-16 Thread Arthur Zamarin
commit: c68e093467d3bb0b0e0abe86a3e7f44dc0a32363
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 16 15:36:16 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 16 15:36:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68e0934

dev-java/jakartaee-migration: Stabilize 1.0.6 amd64, #886283

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
index 1c9731c85b44..8e03edd54b96 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="amd64"
 
 # Common dependencies
 # POM: pom.xml



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-12-06 Thread Miroslav Šulc
commit: 8eb65f3f0d441a755312e7f9fa8ad44925c53ed6
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Dec  6 08:50:10 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Dec  6 08:50:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb65f3f

dev-java/jakartaee-migration: bump to 1.0.6, dropped 1.0.5 because of a 
regression

Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest   | 2 +-
 ...akartaee-migration-1.0.5.ebuild => jakartaee-migration-1.0.6.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index a3a72d4776f8..7251be753cd4 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,2 +1,2 @@
 DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B 
c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f
 SHA512 
a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644
-DIST jakartaee-migration-1.0.5-sources.tar.gz 41061 BLAKE2B 
51002b1859b0beaf78fca50b6ac76ae2e7ee0cc9a84cefcf9222028d54b5dd7910e9efed0f25d4842d073128c55085ce3ca25ac4fc2603fe19e83b6916779bff
 SHA512 
c58d042047ccce396b273c5718996511b52014067e311c1ce69b4fc3d866ef6ad31b6c319b4becb60c3fddbb062f9c02abbf20587c8fabb6674f28d5162dbcd8
+DIST jakartaee-migration-1.0.6-sources.tar.gz 42167 BLAKE2B 
9252078f3b31e07dab533ca9d1d32812f49571adf942a3f11bf074d2110b5fb0c2500dae244b10597f0d76c18bb153cd577528cb01ff01350abb46d32251293a
 SHA512 
81ecfe561695e4e5cacaed0ef89e5759e357b332f2798ac6f3d89c43c9a5dfed1a684745b7fe3afe6d1e82ac9405fd2de68da599a53bfe5f67397b452753b572

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
similarity index 98%
rename from dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild
rename to dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
index cbce676a1509..1c9731c85b44 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
@@ -7,7 +7,7 @@
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.5"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.6"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-11-15 Thread Miroslav Šulc
commit: 244da2178c8b45da89f86bff58a4809796851f91
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Nov 15 13:54:02 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Nov 15 13:55:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244da217

dev-java/jakartaee-migration: bump to 1.0.5

Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 +
 .../jakartaee-migration-1.0.5.ebuild   | 92 ++
 2 files changed, 93 insertions(+)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index a462cf6701d1..a3a72d4776f8 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1 +1,2 @@
 DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B 
c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f
 SHA512 
a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644
+DIST jakartaee-migration-1.0.5-sources.tar.gz 41061 BLAKE2B 
51002b1859b0beaf78fca50b6ac76ae2e7ee0cc9a84cefcf9222028d54b5dd7910e9efed0f25d4842d073128c55085ce3ca25ac4fc2603fe19e83b6916779bff
 SHA512 
c58d042047ccce396b273c5718996511b52014067e311c1ce69b4fc3d866ef6ad31b6c319b4becb60c3fddbb062f9c02abbf20587c8fabb6674f28d5162dbcd8

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild
new file mode 100644
index ..cbce676a1509
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.tar.gz
 --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.5.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.5"
+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"
+
+# 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-core:0
+   >=dev-java/bcel-6.6.0:0
+   >=dev-java/commons-compress-1.21:0
+   >=dev-java/commons-io-2.11.0: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
+
+DEPEND="
+   >=virtual/jdk-1.8:*
+   ${CDEPEND}
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,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 target/test-classes/META-INF || die
+   pushd target/test-classes || 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
+
+   

[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-10-25 Thread John Helmert III
commit: a08f021eda54a62674d28f26644db02eecf7ae89
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Oct 25 09:32:22 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Tue Oct 25 21:55:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a08f021e

dev-java/jakartaee-migration: drop 1.0.3

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: John Helmert III  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 -
 .../jakartaee-migration-1.0.3.ebuild   | 92 --
 2 files changed, 93 deletions(-)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index 63f3b30af0d7..a462cf6701d1 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,2 +1 @@
-DIST jakartaee-migration-1.0.3-sources.tar.gz 38243 BLAKE2B 
e1c05c05dd16ec6d54f0eb3523aed14a3fcbc9c0999b54e7c240c5ebfbb968a8cc3025855485318c19f0e85931ea239f4f08efbd0d042c7ad163c1fe5d3819f9
 SHA512 
79947fe47d55e4e93a417118e7a41fd79614b3fe3bfad967bfdcc865121c9247f92ecd99231e08abb2187036cdb1dceb85b8f2bc695c5bd2ecbf48a84bdd3b2a
 DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B 
c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f
 SHA512 
a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
deleted file mode 100644
index f4e644bdec92..
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.3/source/jakartaee-migration-1.0.3-src.tar.gz
 --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.3.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.3"
-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"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
-# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
-# org.apache.commons:commons-compress:1.20 -> 
>=dev-java/commons-compress-1.20:0
-
-CDEPEND="
-   dev-java/ant-core:0
-   dev-java/bcel:0
-   >=dev-java/commons-compress-1.20:0
-   dev-java/commons-io:1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
-
-DEPEND="
-   >=virtual/jdk-1.8:*
-   ${CDEPEND}
-"
-
-RDEPEND="
-   >=virtual/jre-1.8:*
-   ${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,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 target/test-classes/META-INF || die
-   pushd target/test-classes || 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
-   

[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-10-25 Thread Sam James
commit: 08080edcee09ac507ee6958150af6f35499e605d
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 25 09:07:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 25 09:07:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08080edc

dev-java/jakartaee-migration: Stabilize 1.0.4 amd64, #877803

Signed-off-by: Sam James  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
index 06ff253bc625..92c0218f4b3b 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="amd64"
 
 # Common dependencies
 # POM: pom.xml



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-10-20 Thread Miroslav Šulc
commit: 05c9386c6cae31a70446f7f3640e7eb22e91f937
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Oct 20 12:08:41 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Oct 20 16:31:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05c9386c

dev-java/jakartaee-migration: drop 1.0.1

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.1.ebuild   | 92 --
 2 files changed, 93 deletions(-)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index f40987c027dd..63f3b30af0d7 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,3 +1,2 @@
-DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 
9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69
 SHA512 
6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7
 DIST jakartaee-migration-1.0.3-sources.tar.gz 38243 BLAKE2B 
e1c05c05dd16ec6d54f0eb3523aed14a3fcbc9c0999b54e7c240c5ebfbb968a8cc3025855485318c19f0e85931ea239f4f08efbd0d042c7ad163c1fe5d3819f9
 SHA512 
79947fe47d55e4e93a417118e7a41fd79614b3fe3bfad967bfdcc865121c9247f92ecd99231e08abb2187036cdb1dceb85b8f2bc695c5bd2ecbf48a84bdd3b2a
 DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B 
c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f
 SHA512 
a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
deleted file mode 100644
index 2f557abf9a8c..
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.tar.gz
 --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.1"
-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"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
-# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
-# org.apache.commons:commons-compress:1.20 -> 
>=dev-java/commons-compress-1.20:0
-
-CDEPEND="
-   dev-java/ant-core:0
-   dev-java/bcel:0
-   >=dev-java/commons-compress-1.20:0
-   dev-java/commons-io:1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
-
-DEPEND="
-   >=virtual/jdk-1.8:*
-   ${CDEPEND}
-"
-
-RDEPEND="
-   >=virtual/jre-1.8:*
-   ${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,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 target/test-classes/META-INF || die
-   pushd target/test-classes || 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 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-10-20 Thread Jakov Smolić
commit: 65d017280f69ab532eed21d1f530e2b13787ee0c
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Oct 20 10:50:48 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Oct 20 10:50:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65d01728

dev-java/jakartaee-migration: Stabilize 1.0.3 amd64, #877279

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
index ad63fdea59bb..f4e644bdec92 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="amd64"
 
 # Common dependencies
 # POM: pom.xml



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-09-20 Thread Miroslav Šulc
commit: edf6031953e57709d373fb551f029b16d7301b46
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Sep 20 16:19:51 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Sep 20 16:20:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edf60319

dev-java/jakartaee-migration: bump to 1.0.4

Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 +
 .../jakartaee-migration-1.0.4.ebuild   | 92 ++
 2 files changed, 93 insertions(+)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index 360533aa41ec..f40987c027dd 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,2 +1,3 @@
 DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 
9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69
 SHA512 
6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7
 DIST jakartaee-migration-1.0.3-sources.tar.gz 38243 BLAKE2B 
e1c05c05dd16ec6d54f0eb3523aed14a3fcbc9c0999b54e7c240c5ebfbb968a8cc3025855485318c19f0e85931ea239f4f08efbd0d042c7ad163c1fe5d3819f9
 SHA512 
79947fe47d55e4e93a417118e7a41fd79614b3fe3bfad967bfdcc865121c9247f92ecd99231e08abb2187036cdb1dceb85b8f2bc695c5bd2ecbf48a84bdd3b2a
+DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B 
c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f
 SHA512 
a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
new file mode 100644
index ..06ff253bc625
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.4/source/jakartaee-migration-1.0.4-src.tar.gz
 --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.4"
+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"
+
+# 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.5.0 -> >=dev-java/bcel-6.5.0:0
+# org.apache.commons:commons-compress:1.21 -> 
>=dev-java/commons-compress-1.21:0
+
+CDEPEND="
+   dev-java/ant-core:0
+   >=dev-java/bcel-6.5.0:0
+   >=dev-java/commons-compress-1.21:0
+   >=dev-java/commons-io-2.11.0: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
+
+DEPEND="
+   >=virtual/jdk-1.8:*
+   ${CDEPEND}
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,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 target/test-classes/META-INF || die
+   pushd target/test-classes || 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 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-09-12 Thread Miroslav Šulc
commit: 7b8507314b8c0f90e99291e708ee32f0e7429fa4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Sep 13 03:40:34 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Sep 13 03:40:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b850731

dev-java/jakartaee-migration: bump to 1.0.3

Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 +
 .../jakartaee-migration-1.0.3.ebuild   | 92 ++
 2 files changed, 93 insertions(+)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index 25ddd4ffdac2..360533aa41ec 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1 +1,2 @@
 DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 
9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69
 SHA512 
6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7
+DIST jakartaee-migration-1.0.3-sources.tar.gz 38243 BLAKE2B 
e1c05c05dd16ec6d54f0eb3523aed14a3fcbc9c0999b54e7c240c5ebfbb968a8cc3025855485318c19f0e85931ea239f4f08efbd0d042c7ad163c1fe5d3819f9
 SHA512 
79947fe47d55e4e93a417118e7a41fd79614b3fe3bfad967bfdcc865121c9247f92ecd99231e08abb2187036cdb1dceb85b8f2bc695c5bd2ecbf48a84bdd3b2a

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
new file mode 100644
index ..ad63fdea59bb
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.3/source/jakartaee-migration-1.0.3-src.tar.gz
 --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.3.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.3"
+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"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
+# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
+# org.apache.commons:commons-compress:1.20 -> 
>=dev-java/commons-compress-1.20:0
+
+CDEPEND="
+   dev-java/ant-core:0
+   dev-java/bcel:0
+   >=dev-java/commons-compress-1.20:0
+   dev-java/commons-io:1
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
+
+DEPEND="
+   >=virtual/jdk-1.8:*
+   ${CDEPEND}
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,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 target/test-classes/META-INF || die
+   pushd target/test-classes || 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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-08-12 Thread Miroslav Šulc
commit: fde07878a3bf73a7d81cebfc11d08d0eeda33343
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Aug 12 10:19:41 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Aug 12 10:19:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde07878

dev-java/jakartaee-migration: dropped obsolete 1.0.0

Bug: https://bugs.gentoo.org/864849
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 -
 .../jakartaee-migration-1.0.0.ebuild   | 89 --
 2 files changed, 90 deletions(-)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index f02fd4759bca..25ddd4ffdac2 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,2 +1 @@
-DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 
98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f
 SHA512 
f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c
 DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 
9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69
 SHA512 
6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
deleted file mode 100644
index d2f4bdc8953d..
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.0/source/jakartaee-migration-1.0.0-src.tar.gz
 --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.0"
-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"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
-# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
-# org.apache.commons:commons-compress:1.20 -> 
>=dev-java/commons-compress-1.20:0
-
-CDEPEND="
-   dev-java/ant-core:0
-   dev-java/bcel:0
-   >=dev-java/commons-compress-1.20:0
-   dev-java/commons-io:1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
-
-DEPEND="
-   >=virtual/jdk-1.8:*
-   ${CDEPEND}
-"
-
-RDEPEND="
-   >=virtual/jre-1.8:*
-   ${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,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"
-)
-
-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 target/test-classes/META-INF || die
-   pushd target/test-classes || 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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-08-12 Thread Agostino Sarubbo
commit: af12c734bc8ffeeaea47e6428a66c1e1e92333b8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Aug 12 08:05:35 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Aug 12 08:05:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af12c734

dev-java/jakartaee-migration: amd64 stable wrt bug #864849

Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
index 8dc73b5ae0eb..2f557abf9a8c 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="amd64"
 
 # Common dependencies
 # POM: pom.xml



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-08-11 Thread Miroslav Šulc
commit: 0aec486cd3f4f598f3255abe965ebf7ba5c49178
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Aug 11 07:13:52 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Aug 11 07:14:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aec486c

dev-java/jakartaee-migration: fixed MAVEN_ID version in 1.0.1

Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
index 112b36077026..8dc73b5ae0eb 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
@@ -7,7 +7,7 @@
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.0"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.1"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-07-11 Thread Miroslav Šulc
commit: c7277d3fc1c2e283d3feb27cc42299dd2ba225cf
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jul 11 11:34:43 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jul 11 11:34:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7277d3f

dev-java/jakartaee-migration: bump to 1.0.1, eapi8

Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 +
 .../jakartaee-migration-1.0.1.ebuild   | 92 ++
 2 files changed, 93 insertions(+)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index 9645e64bbca2..f02fd4759bca 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1 +1,2 @@
 DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 
98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f
 SHA512 
f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c
+DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 
9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69
 SHA512 
6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
new file mode 100644
index ..112b36077026
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.1/source/jakartaee-migration-1.0.1-src.tar.gz
 --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.0"
+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"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
+# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
+# org.apache.commons:commons-compress:1.20 -> 
>=dev-java/commons-compress-1.20:0
+
+CDEPEND="
+   dev-java/ant-core:0
+   dev-java/bcel:0
+   >=dev-java/commons-compress-1.20:0
+   dev-java/commons-io:1
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
+
+DEPEND="
+   >=virtual/jdk-1.8:*
+   ${CDEPEND}
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,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 target/test-classes/META-INF || die
+   pushd target/test-classes || 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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2022-02-02 Thread Jakov Smolić
commit: 43c92974991de4e6b3b475af9bbed85d845e4f78
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Feb  2 15:23:28 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Feb  2 15:23:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c92974

dev-java/jakartaee-migration: Stabilize 1.0.0 amd64, #831117

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
index 405fd366f61b..d2f4bdc8953d 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="amd64"
 
 # Common dependencies
 # POM: pom.xml



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2021-05-13 Thread Miroslav Šulc
commit: da8e19cc2beb54c6b7e0eeea00394f03a92c2889
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu May 13 11:00:07 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu May 13 11:00:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8e19cc

dev-java/jakartaee-migration: removed obsolete 0.2.0

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 -
 .../jakartaee-migration-0.2.0.ebuild   | 54 --
 2 files changed, 55 deletions(-)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index a606c0e97d6..9645e64bbca 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,2 +1 @@
-DIST jakartaee-migration-0.2.0-sources.tar.gz 34495 BLAKE2B 
98e281d4a0a2c27215131b4b72406fbf9d6b335602df6e44be8eec252071482305182ab8d3554317650f69197438c1634982ba77297c93603835ded1fe43d105
 SHA512 
c3874cf036051a0636287b3afa78af96458816601a7a79117994389f31ad8f253d9b0a9bb1530de3263f1b8ca2f63fcdf113b3ad933a545136559ca80ae7700f
 DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 
98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f
 SHA512 
f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild
deleted file mode 100644
index 7815b0e6bc2..000
--- a/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v0.2.0/source/jakartaee-migration-0.2.0-src.tar.gz
 --slot 0 --keywords "~amd64 ~x86" --ebuild jakartaee-migration-0.2.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:0.2.0"
-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"
-
-CDEPEND="
-   dev-java/ant-core:0
-   >=dev-java/bcel-6.5.0:0
-   >=dev-java/commons-compress-1.20:0
-   dev-java/commons-io:1
-"
-
-DEPEND="
-   >=virtual/jdk-1.8:*
-   ${CDEPEND}
-"
-
-RDEPEND="
-   >=virtual/jre-1.8:*
-   ${CDEPEND}
-"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,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"
-)



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2021-05-13 Thread Miroslav Šulc
commit: ab53c56a9d9e11c81ac81cbb541f91415a640ae4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu May 13 10:58:12 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu May 13 10:58:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab53c56a

dev-java/jakartaee-migration: bump to 1.0.0

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 +
 .../jakartaee-migration-1.0.0.ebuild   | 89 ++
 2 files changed, 90 insertions(+)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
index 6d2f38a8b36..a606c0e97d6 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1 +1,2 @@
 DIST jakartaee-migration-0.2.0-sources.tar.gz 34495 BLAKE2B 
98e281d4a0a2c27215131b4b72406fbf9d6b335602df6e44be8eec252071482305182ab8d3554317650f69197438c1634982ba77297c93603835ded1fe43d105
 SHA512 
c3874cf036051a0636287b3afa78af96458816601a7a79117994389f31ad8f253d9b0a9bb1530de3263f1b8ca2f63fcdf113b3ad933a545136559ca80ae7700f
+DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 
98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f
 SHA512 
f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
new file mode 100644
index 000..a5a06c63d54
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.0/source/jakartaee-migration-1.0.0-src.tar.gz
 --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.0"
+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"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
+# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
+# org.apache.commons:commons-compress:1.20 -> 
>=dev-java/commons-compress-1.20:0
+
+CDEPEND="
+   dev-java/ant-core:0
+   dev-java/bcel:0
+   >=dev-java/commons-compress-1.20:0
+   dev-java/commons-io:1
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
+
+DEPEND="
+   >=virtual/jdk-1.8:*
+   ${CDEPEND}
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,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"
+)
+
+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 target/test-classes/META-INF || die
+   pushd target/test-classes || 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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jakartaee-migration/

2021-03-13 Thread Miroslav Šulc
commit: 929ce34b976124ba37bf80bb56424e6db1a324f4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Mar 13 11:58:15 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Mar 13 12:03:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929ce34b

dev-java/jakartaee-migration: new package

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jakartaee-migration/Manifest  |  1 +
 .../jakartaee-migration-0.2.0.ebuild   | 54 ++
 dev-java/jakartaee-migration/metadata.xml  |  8 
 3 files changed, 63 insertions(+)

diff --git a/dev-java/jakartaee-migration/Manifest 
b/dev-java/jakartaee-migration/Manifest
new file mode 100644
index 000..6d2f38a8b36
--- /dev/null
+++ b/dev-java/jakartaee-migration/Manifest
@@ -0,0 +1 @@
+DIST jakartaee-migration-0.2.0-sources.tar.gz 34495 BLAKE2B 
98e281d4a0a2c27215131b4b72406fbf9d6b335602df6e44be8eec252071482305182ab8d3554317650f69197438c1634982ba77297c93603835ded1fe43d105
 SHA512 
c3874cf036051a0636287b3afa78af96458816601a7a79117994389f31ad8f253d9b0a9bb1530de3263f1b8ca2f63fcdf113b3ad933a545136559ca80ae7700f

diff --git a/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild 
b/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild
new file mode 100644
index 000..7815b0e6bc2
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-0.2.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://ftp.fau.de/apache/tomcat/jakartaee-migration/v0.2.0/source/jakartaee-migration-0.2.0-src.tar.gz
 --slot 0 --keywords "~amd64 ~x86" --ebuild jakartaee-migration-0.2.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:0.2.0"
+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"
+
+CDEPEND="
+   dev-java/ant-core:0
+   >=dev-java/bcel-6.5.0:0
+   >=dev-java/commons-compress-1.20:0
+   dev-java/commons-io:1
+"
+
+DEPEND="
+   >=virtual/jdk-1.8:*
+   ${CDEPEND}
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CDEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,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"
+)

diff --git a/dev-java/jakartaee-migration/metadata.xml 
b/dev-java/jakartaee-migration/metadata.xml
new file mode 100644
index 000..2444066aa02
--- /dev/null
+++ b/dev-java/jakartaee-migration/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+   j...@gentoo.org
+   Java
+
+