summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/jdbc-mysql/Manifest1
-rw-r--r--dev-java/jdbc-mysql/jdbc-mysql-9.6.0.ebuild89
-rw-r--r--dev-java/protobuf-java/Manifest2
-rw-r--r--dev-java/protobuf-java/protobuf-java-4.33.5.ebuild (renamed from dev-java/protobuf-java/protobuf-java-4.33.0.ebuild)12
-rw-r--r--dev-java/tomcat-native/Manifest2
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.3.1.ebuild86
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.3.5.ebuild2
7 files changed, 98 insertions, 96 deletions
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 7178df652ad3..56133cd7077b 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,2 +1,3 @@
DIST mysql-connector-j-9.5.0.tar.gz 4533369 BLAKE2B 99fd232c72f7711e928a5ea485a444c24fe919e1d438a0f7e1a50ab81717359a1247d19de965076e9b971aab33948e863a1cac8d2a05f319d583be576542832d SHA512 59c7047eeb0ca67f5e41c2950ea4d76400ce1db8d3a299da6547b17d928fa693729d6f4427124a821ac9aed121911a284744d3957be5c638e3d6bb378d0bab68
+DIST mysql-connector-j-9.6.0.tar.gz 4535338 BLAKE2B 3c23f3bd0680c17cb6fd524426fdf8908167e722785ff42bc74dd9bf667f976343ef71b06a5657b3ebf08efd8c6c31e06e2d390fc0042a0b6bd6ff0cfb69b323 SHA512 dcad9092b08531b807069eb06b7d442894dbd05e21aa20dfd9be6d914ca8edfb73b78544e57feec2f051221e968f436bc5ae537a52e4d146074f91d992504f82
DIST oci-java-sdk-common-3.66.0.jar 491192 BLAKE2B 9570b3d0ea16348a4cf184bd5e3bce5da7fe0d2bd69386ab92ed8d6ec8889f8db02ea70ebab7aed711dfab8891edc3a7497243424d8d8339587454e051e9afe5 SHA512 eda592ba11769b374631f8a238941736235dc7d29e67490fead6855bd6f7fca000ee8647c860d2d8b0531bf71dc2e51cdd5dd7a2b03e33bf4c29e6c9c8efc960
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-9.6.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-9.6.0.ebuild
new file mode 100644
index 000000000000..30225bc0b386
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-9.6.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple junit5
+
+# Bundling binary versions of oci-java-sdk-common
+# According to src/build/misc/pom.xml
+OSC="3.66.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"
+
+# Most tests fail with:
+# Cannot connect to MySQL server on localhost:3,306.
+# Make sure that there is a MySQL server running on the machine/port you are trying to
+# connect to and that the machine this software is running on is able to connect to
+# this host/port (i.e. not firewalled). Also make sure that the server has not been
+# started with the --skip-networking flag.
+RESTRICT="test"
+
+CP_DEPEND="
+ dev-java/c3p0:0
+ dev-java/opentelemetry-java:0
+ >=dev-java/protobuf-java-4.33.0:0
+ dev-java/slf4j-api:0
+"
+
+DEPEND="
+ ${CP_DEPEND}
+ >=dev-java/guava-33.5.0:0
+ dev-java/incap:0
+ dev-java/javapoet:0
+ >=virtual/jdk-1.8:*
+ test? ( >=dev-java/hamcrest-3.0:0 )
+"
+
+RDEPEND="
+ ${CP_DEPEND}
+ >=dev-java/jackson-annotations-2.20:0
+ >=dev-java/jackson-databind-2.20.0:0
+ >=dev-java/jakarta-annotation-api-3.0.0:0
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( CHANGES README )
+
+JAVA_CLASSPATH_EXTRA="guava incap javapoet"
+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="hamcrest junit-5"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ mkdir -p src/main/resources/META-INF/services || die "META-INF"
+ # populate META-INF/services according to line 801 build.xml
+ echo com.mysql.cj.jdbc.Driver \
+ > src/main/resources/META-INF/services/java.sql.Driver || die "META-INF"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_newjar "${DISTDIR}/oci-java-sdk-common-${OSC}.jar" oci-java-sdk-common.jar
+ java-pkg_regjar "${ED}/usr/share/jdbc-mysql/lib/oci-java-sdk-common.jar"
+ java-pkg_register-dependency jackson-annotations,jackson-databind,jakarta-annotation-api
+}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index d72debe5a3a0..a6511cd31174 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,2 +1,2 @@
-DIST protobuf-33.0.tar.gz 6872665 BLAKE2B 5d456c000117b590dea5b7e721a8b8d00d9e7067ba2156f082e4959a17fcf8d4f2e306f90335aad97e1a94dfd2491544d67cb29670f0022034fde574140a8066 SHA512 2956270a81631895ab6ed8c3c2a22b353a461b0827ee17a1c569b24374307a8e2525a06db6728140bff759a40e47a1d2a291cfb34293b364fe279f10468f3cb9
DIST protobuf-33.2.tar.gz 6868986 BLAKE2B 82909ba8919b1034619a7ea5bd1525db667294310363c035e535a150dac2e7cd819b6bfbffc5203adfbcc0abf1378168e0b06da417b455bdca63ab7eb5db7dd4 SHA512 6d884194d7e4799a2ff9cb8b9d62fdf302a3a5f90e8d4006918d88b037eb5758ef4d2153abd7dc9d5d526e1e04cc91dd87ed7e06befb573bab1e7d259649bff4
+DIST protobuf-33.5.tar.gz 6888461 BLAKE2B 9c426236a9bb67061a9e2fcf2f4dbc2868ae4ea4734026921c7d1c025788747111c0b7a55c8ad4aabbb7e959da2c43c7f8a2a12c2ba295ce377bedb72c2e1785 SHA512 2ad75c81a76d7311291db51abee41108cebfbb87b3fe4aa421aa5351edc38d0b70f863a1369f37c5be4336ed399cf16791d32688b8077dfd672cfb2d727ba6f9
diff --git a/dev-java/protobuf-java/protobuf-java-4.33.0.ebuild b/dev-java/protobuf-java/protobuf-java-4.33.5.ebuild
index 5f5c97d4db56..7e6dcc73b4ac 100644
--- a/dev-java/protobuf-java/protobuf-java-4.33.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-4.33.5.ebuild
@@ -1,11 +1,10 @@
-# Copyright 2008-2025 Gentoo Authors
+# Copyright 2008-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
JAVA_PKG_IUSE="doc source test"
JAVA_TESTING_FRAMEWORKS="junit-4"
-MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
inherit cmake java-pkg-2 java-pkg-simple
@@ -19,7 +18,7 @@ S="${WORKDIR}/protobuf-${MY_PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
IUSE="system-protoc"
BDEPEND="
@@ -27,14 +26,15 @@ BDEPEND="
!system-protoc? ( >=dev-cpp/abseil-cpp-20250512.1:= )
"
+# restrict virtual/jdk because asm-jdk-bridge-0.0.13 is not ready for java 27.
DEPEND="
- >=virtual/jdk-1.8:*
+ <virtual/jdk-27
test? (
>=dev-java/guava-33.5.0:0
- dev-java/mockito:4
+ >=dev-java/mockito-4.11.0:4
>=dev-java/snakeyaml-2.5:0
>=dev-java/testparameterinjector-1.19:0
- dev-java/truth:0
+ >=dev-java/truth-1.4.5:0
)
"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 2eaa1e614300..d1cbae308a6b 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,3 @@
-DIST tomcat-native-1.3.1-src.tar.gz 346588 BLAKE2B 3b979845dd10a0c74c7ed2e6404b217c7bdebf2d432ac904b50f8288cd3cf3b1489b4e5111ce02eca442c45deb805523062862225130386a6d47853cd972d788 SHA512 06951c67d2739ab9205a537d24345e13e4472f192602fc52015ea84612c6e2c9334404b30a82be7d1e7d4ce470ea9df8b1b8ca1a3b8674d82706ff432280724f
-DIST tomcat-native-1.3.1-src.tar.gz.asc 833 BLAKE2B d7483efea5dc4d9cc069a667896950526e22a6b4b0ee1fd6739754196d1b9e84a2b16f766f68419faf2c3fcc87d1fa83c9985de7149849d4f761d2c5b7e45af7 SHA512 3550e38556dab5594aea469cd8ae43505deceeab25bf60ecd61c26ed1106ce88e35634f936cb36e7fc766f30b5c5f0f19dd01a1513ed219ae7f68c8c10e960f1
DIST tomcat-native-1.3.5-src.tar.gz 350072 BLAKE2B 1a9989e065ba2eab70b91342593976f5b0602df0e13c74b5936cd65662609a5d0be2f5bd105976a2259fce272574343ecd716b1a2137c0b54b02242a6905d908 SHA512 3fd19d8030d0c854d10a352ef7f98254284e9a08e2a699e037ea805a379a226935997c90978676fc011910d8d18d827290f301da208972cd637b77f93127f9be
DIST tomcat-native-1.3.5-src.tar.gz.asc 833 BLAKE2B af65d6fe5b01be65866a6c5f15888a38e079c1070e8db192ad1741ab5a405b52912e0dc25ba5108249aca0c8005165ac9af860cf377869efaffe494e7ab42ab0 SHA512 84a0f1f1f8d2ac116673c458090d3fc0cc8dd1cfa357b4dee4dd1ea0910230b405f1ac9eb17826404445a0d8e47482efc75098834eb6a8c79eda86ba5a9d8caf
DIST tomcat-native-1.3.6-src.tar.gz 351606 BLAKE2B 87c0591639b1488060bf60a0ec635022e8922b079f59e57a78ac371b6a3d0f9dd5263275ee0879885adf50d40f8842c084a61d7c2c9d0a0c17bca56682832c0c SHA512 69da49fcab28822d67af52b164084b983793b1741417ee3952380db303943f39c03f35c7fd4e82b3f7b6d0f8ffa2d95d82e87a9e80dfe1b3d70800b5a27f0076
diff --git a/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
deleted file mode 100644
index d59cf80486c5..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
+++ /dev/null
@@ -1,86 +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"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
- verify-sig? (
- https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz.asc
- )"
-S=${WORKDIR}/${P}-src/native
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="static-libs"
-
-DEPEND="
- >=virtual/jdk-1.8:*
-"
-RDEPEND="
- dev-libs/apr:1=
- dev-libs/openssl:0/3
- >=virtual/jre-1.8:*
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-PATCHES=( "${FILESDIR}/tomcat-native-1.2.39-slibtool.patch" )
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
- mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
- sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
- ../build.xml \
- | sed "s:\${version}:${PV}:" \
- > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_configure() {
- local myeconfargs=(
- --with-apr="${EPREFIX}"/usr/bin/apr-1-config
- --with-ssl="${EPREFIX}"/usr
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- default
-}
-
-src_test() {
- # Adjusting "String testFile =" path in TestFile.java:29 to match ${S}
- sed \
- -e '/String testFile =/s&test/&../test/&' \
- -i ../test/org/apache/tomcat/jni/TestFile.java || die
-
- JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_doso .libs/*.so*
- dodoc -r ../docs
- ! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "For more information, please visit"
- elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.3.5.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.5.ebuild
index 120594daa180..2882aaf127c5 100644
--- a/dev-java/tomcat-native/tomcat-native-1.3.5.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.3.5.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${P}-src/native
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="static-libs"
BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-11 )"