gentoo auto-resync : 23:03:2023 - 12:45:13

4 files changed, 63 insertions, 57 deletions

diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 56b5397a519e..b8cd6749fad7 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,3 +1,4 @@
-DIST jdbc-mysql-8.0.26-sources.jar 1578978 BLAKE2B c42e22ea50b6c3890aaf51ec8bfe53918c680ea54b314cee80ecdd2be122f031000fdb70b895807a0d22e5841df6fe5a76ec49b2e3097749fb8eabff4afca68a SHA512 8bf73a2cd0b5348d79e81da9c96da625258066b0b40d05d085b3978538dad75f4540a2b8414f005d90b8b87303c357e762bbf81dd2d8e68ff51c18a92124b7ae
-EBUILD jdbc-mysql-8.0.26.ebuild 1567 BLAKE2B 5b714530104e9a3a7fe9e43d7416b2f2d4e0111f02fa517b7dbf9a93294d9b4185e0fba37faab3918936ef57e005e2b99385773e33c1878c7a5a1d38125fd8fd SHA512 86636e32926cb9413ed6e9a6d77ddee845feebe8b433593ab51985a8710b6ecd24c7bac33fa6a39c076bc96b3d63ee4cf8e17394dd7297da30d33f046a398cc3
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
+DIST mysql-connector-j-8.0.32.tar.gz 4229102 BLAKE2B bb4f89ac9eb4ebc5ed4a8f3d0b63a75d0dbb237e0c434c705d970ec20bbbbec89526d6b0cb11cbceb5e9e5bb485b9d7b17420407d7b01017c7531d5d531c30d8 SHA512 96d920cd137c8aadd7669d3bdc84893bb1dd2c76e81128356844c4321104fc6d2debf950ca1dfdfe958d848b16cd91ee475aad7d3d9b52478f8ac58dbf51922b
+DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e
+EBUILD jdbc-mysql-8.0.32.ebuild 1497 BLAKE2B 73cef4b5b5b59b5b2a28c705fe727b37856d68e7d64fa8e81f1c29a40c58b2a9fb00a97fad06e6d836d8149dc74ac4ea3b9ea3d14e42caad27370ac691df97f6 SHA512 3fa885dd13270c7ccd01634efdd0562bfecfcd333a39fca0142421d73f7a2442174aa4e7006bf36bf5f6c529e5ad15a30703ae817097bc2088dfaeca4daddead
+MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.ebuild
deleted file mode 100644
index 85090fea59f7..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.0.26.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 mysql-connector-java-8.0.25.pom.xml --download-uri https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.25/mysql-connector-java-8.0.25-sources.jar --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-mysql-8.0.25.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="mysql:mysql-connector-java:8.0.26"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JDBC Type 4 driver for MySQL"
-HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/"
-SRC_URI="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${PV}/mysql-connector-java-${PV}-sources.jar -> ${P}-sources.jar"
-
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: mysql-connector-java-${PV}.pom.xml
-# com.google.protobuf:protobuf-java:3.11.4 -> !!!groupId-not-found!!!
-
-CDEPEND="dev-java/c3p0:0
-	dev-java/protobuf-java:0
-	dev-java/slf4j-api:0"
-DEPEND=" ${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND=" ${CDEPEND}
-	>=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-DOCS=( META-INF/README )
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="c3p0,protobuf-java,slf4j-api"
-
-JAVA_SRC_DIR="com"
-JAVA_RESOURCE_DIRS="res"
-
-src_prepare() {
-	default
-	mkdir --parents "${JAVA_RESOURCE_DIRS}" || die
-	cp -r "${JAVA_SRC_DIR}" "META-INF" "${JAVA_RESOURCE_DIRS}"
-	find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + || die
-}
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.0.32.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.0.32.ebuild
new file mode 100644
index 000000000000..6b0870af39c9
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.0.32.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 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.0.32"
+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
+	dev-java/protobuf-java:0
+	dev-java/slf4j-api:0
+"
+DEPEND=" ${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+RDEPEND=" ${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( CHANGES README )
+
+JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/oci-java-sdk-common-${OSC}.jar"
+JAVA_JAR_FILENAME="mysql-connector-j.jar"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR=(
+	"src/generated"
+	"src/legacy/java"
+	"src/main/core-api/java"
+	"src/main/core-impl/java"
+	"src/main/protocol-impl/java"
+	"src/main/user-api/java"
+	"src/main/user-impl/java"
+)
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS="src/test/config"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jdbc-mysql/metadata.xml b/dev-java/jdbc-mysql/metadata.xml
index 4221e170cbc0..5a8beaee4341 100644
--- a/dev-java/jdbc-mysql/metadata.xml
+++ b/dev-java/jdbc-mysql/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">mysql/mysql-connector-j</remote-id>
+	</upstream>
 </pkgmetadata>