From 95c20b170b50a028890f00e7e9c338427d92279f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 Apr 2024 12:32:48 +0100 Subject: gentoo auto-resync : 11:04:2024 - 12:32:48 --- dev-java/Manifest.gz | Bin 59488 -> 59481 bytes dev-java/caffeine/Manifest | 2 +- dev-java/caffeine/caffeine-2.6.2-r1.ebuild | 34 +++++++++ dev-java/caffeine/caffeine-2.6.2.ebuild | 33 -------- dev-java/jdbc-mysql/Manifest | 5 +- dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild | 56 ++++++++++++++ dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild | 56 -------------- dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild | 55 +++++++++++++ dev-java/junit/Manifest | 9 ++- ...unit-4.13.2_p20240222-ignore-failing-test.patch | 85 +++++++++++++++++++++ dev-java/junit/junit-3.8.2-r2.ebuild | 24 +++--- dev-java/junit/junit-4.13.2-r1.ebuild | 2 +- dev-java/junit/junit-4.13.2_p20240222.ebuild | 53 +++++++++++++ dev-java/junit/junit-5.9.2.ebuild | 6 +- 14 files changed, 307 insertions(+), 113 deletions(-) create mode 100644 dev-java/caffeine/caffeine-2.6.2-r1.ebuild delete mode 100644 dev-java/caffeine/caffeine-2.6.2.ebuild create mode 100644 dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild delete mode 100644 dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild create mode 100644 dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild create mode 100644 dev-java/junit/files/junit-4.13.2_p20240222-ignore-failing-test.patch create mode 100644 dev-java/junit/junit-4.13.2_p20240222.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 85b8110eba92..a2119299e0de 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/caffeine/Manifest b/dev-java/caffeine/Manifest index 56920f088f27..f949ad4d1b03 100644 --- a/dev-java/caffeine/Manifest +++ b/dev-java/caffeine/Manifest @@ -1,3 +1,3 @@ DIST caffeine-2.6.2-sources.jar 715580 BLAKE2B 882cac33d205c8186232c64010b4e25e805d3d188d6a9e6ca151187b55d5ee3a3d5641566f5e8d32de596fab3dae8967c74f3d60e2321b34374ce996382322fe SHA512 52a8c67648e2a6bb1c600d99712473a64911f2b6c8fe6c924ba98e72b4b040a1094fa5c93ae2bae8734d352634bc72960711afd152566ef02f6bad4c84e510c8 -EBUILD caffeine-2.6.2.ebuild 995 BLAKE2B 5b7304bd4567b5dd761072bc0400b0d2189e5b2844c48f0c3dc47810c5083006b440d40a28371f6941b5886032d6dde370d7b7927212d88fd0d441cb18ea164d SHA512 095d3424c0a005437cfcf450b4ba74555826e27bc116e7d1a34f63200a97ef784c22f2fa3af369f1f779e440ca758307e70211765ed61440b383eaf4e242fc19 +EBUILD caffeine-2.6.2-r1.ebuild 1032 BLAKE2B fe123fbcfc40a7f69e897586ed2caa8204d1e2c6f5ab8f846d5a0472fea99a7f5e12025eb60a3b2fc8df9d7229f82ab9b357d39b6ebbfd85b3f8b3e713f1adc5 SHA512 8fc56ea11c9977be21accf913749eef930041361cf4f3bec3021221c20be455a5a2142eca193399b74bc30cb138d6eaaa726b97b99840b4788371dcd8354f9bd MISC metadata.xml 300 BLAKE2B fc46ab992a4cbfe6a697b414e72f7bfa69992f5fdfdfa99c2b94b69643492f8144351125ca0edf4cfb4e8d9e67c6aa026d9e7e4d000f46250ff57716cce65ff0 SHA512 fc4dc1847395e619c603488ca3b18b94fcc96e21461854009d46a0e73ff694066e85478eae5c20f8493eda9203ab159ab3a625ac7df49190f7f2e162dd3418fb diff --git a/dev-java/caffeine/caffeine-2.6.2-r1.ebuild b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild new file mode 100644 index 000000000000..b15bcc26da75 --- /dev/null +++ b/dev-java/caffeine/caffeine-2.6.2-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.github.ben-manes.caffeine:caffeine:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A high performance caching library" +HOMEPAGE="https://github.com/ben-manes/caffeine" +SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar" +# Compiling from Github tarball would require to be packaged at least +# package com.squareup.javapoet +# package MethodSpec +# package TypeSpec +# SRC_URI="https://github.com/ben-manes/caffeine/archive/v${PV}.tar.gz -> ${P}.tar.gz" +# S="${WORKDIR}/${P}/caffeine" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ppc64 x86" + +BDEPEND="app-arch/unzip" +CP_DEPEND="dev-java/jsr305:0" +# min java 11 for bug #919464 +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:*" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +JAVA_AUTOMATIC_MODULE_NAME="com.github.benmanes.caffeine" diff --git a/dev-java/caffeine/caffeine-2.6.2.ebuild b/dev-java/caffeine/caffeine-2.6.2.ebuild deleted file mode 100644 index e55aadd659b2..000000000000 --- a/dev-java/caffeine/caffeine-2.6.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.github.ben-manes.caffeine:caffeine:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A high performance caching library" -HOMEPAGE="https://github.com/ben-manes/caffeine" -SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar" -# Compiling from Github would require to be packaged at least -# package com.squareup.javapoet -# package MethodSpec -# package TypeSpec -# SRC_URI="https://github.com/ben-manes/caffeine/archive/v${PV}.tar.gz -> ${P}.tar.gz" -# S="${WORKDIR}/${P}/caffeine" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -BDEPEND="app-arch/unzip" -CP_DEPEND="dev-java/jsr305:0" -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:*" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" - -JAVA_AUTOMATIC_MODULE_NAME="com.github.benmanes.caffeine" diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest index 15d33624879e..11118c88f965 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -1,4 +1,7 @@ DIST mysql-connector-j-8.1.0.tar.gz 4241696 BLAKE2B 930257a876b1b512b598ebf8397125145bb9d1a438fe33bb55ca208dddfdd29bd436a365cc35b9128cdee6eee436da688dd53cc3ed6cd04efb22d1f5af731863 SHA512 f8a7c621397f49981dd7d19e880d92ee051015ad011c027380ac85760dc22ce2f4117fd27b8d72325c5e2bc40a1a9c22e9534f7200208916ee62bbf1e5ad0c75 +DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41 DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e -EBUILD jdbc-mysql-8.1.0.ebuild 1496 BLAKE2B 738e010421ca1a13870d14aa63353d6d5e8981ddcf81292f0be1499e1449a49b22576a8db873d2519858c7e8a6d4e2c60c86c91123b9d4e978a199895b15c69d SHA512 628433db9e89ff506aa871d667220d4a44c5cf458b519c0bcd2c16eeea9721574ec5c2829f3abe046b119c0bd456c7ee969bad8dc50cc49dd7cfadd6a27b9212 +DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430 +EBUILD jdbc-mysql-8.1.0-r1.ebuild 1504 BLAKE2B 041ca21fb16cfc11fc7ee33dc3c9d6b3b6526955e71ca1bfdedcc2721614f60e74357e62e8c07ede49d5cd50f8d38b7714c1d0f5c98c820cf95b2dc8e2e7e041 SHA512 aed6b6d5345a1bdb95fbbc79bb76f0676e55a0646ce8949c13b6b90fd52e13b624d45528ef0e0603e01482909686619ab7c451cb01201d073d70afbdacccb942 +EBUILD jdbc-mysql-8.3.0.ebuild 1576 BLAKE2B cdb39e83b3d94f048eab504808dcdf93d811cf818524c3b959f6b794208f2ac9f9d7bd63f8ba7cbfe3445bce843c3b10aee4e15452a8e52c5986e59eadef6bd3 SHA512 d0d1754258946ff6db3d45efc2947318324cb383d9d750e15358b92baa1a461cdc81fab2566ea50e1c5851b0b326dbefacccfe7d8d1fa6b0cf049c0ea0d84780 MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8 diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild new file mode 100644 index 000000000000..649d226c823b --- /dev/null +++ b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Tests disabled, see bug #902723 +JAVA_PKG_IUSE="doc source" +MAVEN_ID="com.mysql:mysql-connector-j:8.1.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +# Bundling a binary version of oci-java-sdk-common +# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml +OSC="2.47.0" + +DESCRIPTION="JDBC Type 4 driver for MySQL" +HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/" +SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${PV}.tar.gz + https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/${OSC}/oci-java-sdk-common-${OSC}.jar" + +S="${WORKDIR}/mysql-connector-j-${PV}" + +LICENSE="GPL-2-with-MySQL-FLOSS-exception" +SLOT="0" +KEYWORDS="amd64 ppc64 x86" + +CP_DEPEND=" + dev-java/c3p0:0 + innerThreadGroup = new AtomicReference(); diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild index 2872a332ce63..da6bba7b5fed 100644 --- a/dev-java/junit/junit-3.8.2-r2.ebuild +++ b/dev-java/junit/junit-3.8.2-r2.ebuild @@ -1,31 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" MAVEN_ID="junit:junit:3.8.2" inherit java-pkg-2 java-pkg-simple -MY_P=${P/-/} - DESCRIPTION="Simple framework to write repeatable tests" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" -HOMEPAGE="http://www.junit.org/" +HOMEPAGE="https://junit.org/" +SRC_URI="mirror://sourceforge/project/junit/junit/${PV}/junit${PV}.zip" +S="${WORKDIR}/junit${PV}" + LICENSE="CPL-1.0" SLOT="0" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +BDEPEND="app-arch/unzip" DEPEND=">=virtual/jdk-1.8" RDEPEND=">=virtual/jre-1.8" -DOCS=( README.html cpl-v10.html ) +HTML_DOCS=( README.html cpl-v10.html ) JAVA_SRC_DIR="${PN}" -S="${WORKDIR}/${MY_P}" - src_unpack() { unpack ${A} cd "${S}" || die @@ -33,11 +32,6 @@ src_unpack() { } src_prepare() { - default + java-pkg-2_src_prepare java-pkg_clean } - -src_install() { - java-pkg-simple_src_install - einstalldocs -} diff --git a/dev-java/junit/junit-4.13.2-r1.ebuild b/dev-java/junit/junit-4.13.2-r1.ebuild index af5e4f424217..0fa825c0272c 100644 --- a/dev-java/junit/junit-4.13.2-r1.ebuild +++ b/dev-java/junit/junit-4.13.2-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 diff --git a/dev-java/junit/junit-4.13.2_p20240222.ebuild b/dev-java/junit/junit-4.13.2_p20240222.ebuild new file mode 100644 index 000000000000..3ca8e79546cc --- /dev/null +++ b/dev-java/junit/junit-4.13.2_p20240222.ebuild @@ -0,0 +1,53 @@ +# 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="junit:junit:${PV}" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Simple framework to write repeatable tests" +HOMEPAGE="https://junit.org/junit4/" +MY_COMMIT="28fa2cae48b365c949935b28967ffb3f388e77ef" +SRC_URI="https://github.com/${PN}-team/${PN}4/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}4-${MY_COMMIT}" + +LICENSE="EPL-1.0" +SLOT="4" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +CP_DEPEND="dev-java/hamcrest-core:1.3" +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:* + test? ( dev-java/hamcrest-library:1.3 )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +PATCHES=( "${FILESDIR}/junit-4.13.2_p20240222-ignore-failing-test.patch" ) + +JAVA_AUTOMATIC_MODULE_NAME="junit" +JAVA_ENCODING="ISO-8859-1" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS="src/test/resources" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} + +src_test() { + cd "${JAVA_TEST_SRC_DIR}" || die + + local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars ${JAVA_TEST_GENTOO_CLASSPATH})" + + ejavac -cp "${CP}" -d . $(find * -name "*.java") + # pom.xml lines 264-268 + java -cp "${CP}" -Djava.awt.headless=true \ + org.junit.runner.JUnitCore org.junit.tests.AllTests || die "Running junit failed" +} diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild index 6b6d656db44a..46efd8fcf0d8 100644 --- a/dev-java/junit/junit-5.9.2.ebuild +++ b/dev-java/junit/junit-5.9.2.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 @@ -11,7 +11,6 @@ EAPI=8 # installs each module's Javadoc to the same directory, which would # trigger an error when the second module's Javadoc is installed. JAVA_PKG_IUSE="source" -IUSE="doc migration-support suite vintage" inherit java-pkg-2 java-pkg-simple @@ -19,10 +18,11 @@ DESCRIPTION="Simple framework to write repeatable tests" HOMEPAGE="https://junit.org/junit5/" SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/junit5-r${PV}" - LICENSE="EPL-2.0" + SLOT="5" KEYWORDS="amd64 ~arm arm64 ppc64 x86" +IUSE="doc migration-support suite vintage" CP_DEPEND=" dev-java/apiguardian-api:0 -- cgit v1.2.3