From 8796aaedb3257bbe4d80b0033408b2210b2259d6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 17 Oct 2024 04:04:27 +0100 Subject: gentoo auto-resync : 17:10:2024 - 04:04:26 --- dev-java/Manifest.gz | Bin 55533 -> 55536 bytes dev-java/commons-logging/Manifest | 3 + .../commons-logging/commons-logging-1.3.4.ebuild | 194 +++++++++++++++++++++ dev-java/jdbc-mysql/Manifest | 2 - dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild | 55 ------ dev-java/jetbrains-annotations/Manifest | 2 + .../jetbrains-annotations-26.0.1.ebuild | 23 +++ dev-java/protobuf-java/Manifest | 3 - ...obuf-java-3.23.0-unittest_retention.proto.patch | 35 ---- dev-java/protobuf-java/protobuf-java-3.25.3.ebuild | 166 ------------------ 10 files changed, 222 insertions(+), 261 deletions(-) create mode 100644 dev-java/commons-logging/commons-logging-1.3.4.ebuild delete mode 100644 dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild create mode 100644 dev-java/jetbrains-annotations/jetbrains-annotations-26.0.1.ebuild delete mode 100644 dev-java/protobuf-java/files/protobuf-java-3.23.0-unittest_retention.proto.patch delete mode 100644 dev-java/protobuf-java/protobuf-java-3.25.3.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index f6dc89ad37b2..6853bcf7fec5 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index bfba2fbd0fc0..49ceeba1f77a 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1,4 +1,7 @@ DIST commons-logging-1.3.1-src.tar.gz 189156 BLAKE2B 23308b2bff6ea67620b0f07f49a63ffdbd07833fc0d9a6654386f4c17c9125abef5ad2afb6d8c798dcb98bc3e99bd8d94d35b9deec569c3aec1dde20f69e1a1d SHA512 ffda970d086601df4b476caf8bd01d1bdc22dd7f8846a22287036f7f000ce6cf0a757d16621910f041f8d90aa6066819454b3977dd005ca66817bec59e91e91f DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631be03d97cde65d1c7a76c06b6a23b9e30b1cee08b048eb4fdaa41b0a6b5bcf090b54c9dc54307fb1629b039b786fd426572a4d1 SHA512 6f13f85a5aeab1099ebfca38a6173384050b1f1c2e7eac93d978587c92751ddd24d583e39bc5a949f0caec66ca141d265147e63e9e2afea2094bda4667936a86 +DIST commons-logging-1.3.4-src.tar.gz 195717 BLAKE2B ba691ea0033c14f54fcb525faeadd4b330e063f73175c5ee40a4f50f159f1b264efb9f40661c4af3902ddca7d43f8f9b84e7a77bf1eeb3b237b31f566fc98aab SHA512 a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44 +DIST commons-logging-1.3.4-src.tar.gz.asc 488 BLAKE2B a9cdc993891ff39bb8ebeaa3eefdecee1adb062ed77449dfa1dad75a43cf5aa5678f014d24765ebff7b761498abfc795d3bb68359a73f8de98cb4ac115cb68da SHA512 1c132b87f03ca54887172e45c36e1d8c66d4f12a2a6a2da84e0d6cf3ac2cd2366193829fac0393837371bc1cd34215cd6318c9e7ea6c406c11d9f0dce28b3143 EBUILD commons-logging-1.3.1.ebuild 5386 BLAKE2B dec24c358e19ac4ba1cad8a4a83527a6af3ad3db1a4006805ca7e529b8984d4f20bec13176dda17595b016e74eb5de0fe0bd3242c84904683ea99985761c5b69 SHA512 6cb7fae5214abd1a4ce0d7ea80a48cb24331ddc103a0a739119815cfe0cd000394a20283a977ff12f97937efcfd44c4e20602b32fc03e3aa7340db19678340d0 +EBUILD commons-logging-1.3.4.ebuild 6645 BLAKE2B 46c8fd7ad6823ea68224c90fecbf998da11e9c41b8393c948c6e2c1f4c736c7032065d8a99ced8c402924bfffd66a12425825e6444980ce2c90b1418a234ab45 SHA512 575816443dba5fc90eb444dbd5a3e7f4bf851c5a6d3b122d78c979acdde45c6eae9b7ff9304d324c85b98fee114509e9a4a25587cd170941e141653e695407b5 MISC metadata.xml 549 BLAKE2B b20c8451a73329dbdb8aa88120543b948014115d754a84e8a77a8f61b9134277a7849fc10e35323c028a32d69f6e45702200e06af4481bf5238f5d848b3ccc03 SHA512 105c2bdf3eed380f11be1b8987a08fbcf1b6e6cbbb00c0e38e4813875865abd65c9be85267d5b49486913fdb0635b7329b5c4e84a86d9f93f9dcdad74c336ff0 diff --git a/dev-java/commons-logging/commons-logging-1.3.4.ebuild b/dev-java/commons-logging/commons-logging-1.3.4.ebuild new file mode 100644 index 000000000000..e440061c3289 --- /dev/null +++ b/dev-java/commons-logging/commons-logging-1.3.4.ebuild @@ -0,0 +1,194 @@ +# 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="commons-logging:commons-logging:${PV}" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems" +HOMEPAGE="https://commons.apache.org/proper/commons-logging/" +SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz + verify-sig? ( https://downloads.apache.org/commons/logging/source/${P}-src.tar.gz.asc )" +S="${WORKDIR}/${P}-src" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="log4j" + +# src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java:26: +# error: cannot find symbol +# import org.apache.commons.logging.impl.Log4jApiLogFactory; +# ^ +# symbol: class Log4jApiLogFactory +# location: package org.apache.commons.logging.impl +REQUIRED_USE="test? ( log4j )" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" + +COMMON_DEPEND=" + dev-java/jakarta-servlet-api:4 + dev-java/slf4j-api:0 + log4j? ( + dev-java/log4j-12-api:2 + dev-java/log4j-api:2 + ) +" + +DEPEND=" + ${COMMON_DEPEND} + >=virtual/jdk-11:* + test? ( + dev-java/commons-io:1 + dev-java/junit:5 + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + >=virtual/jre-1.8:* +" + +DOCS=( NOTICE.txt src/changes/changes.xml ) +HTML_DOCS=( PROPOSAL.html ) + +JAVA_GENTOO_CLASSPATH=" + jakarta-servlet-api-4 + slf4j-api +" + +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + java-pkg-2_src_prepare + + # https://avalon.apache.org/closed.html Apache Avalon has closed. + rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die + rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die + + if use !log4j; then + rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die + rm src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java || die + else + JAVA_GENTOO_CLASSPATH+=" + log4j-12-api-2 + log4j-api-2 + " + fi +} + +src_compile() { + # getting dependencies into the modulepath + DEPENDENCIES=( + jakarta-servlet-api-4 + slf4j-api + $(use log4j && echo log4j-12-api-2) + $(use log4j && echo log4j-api-2) + ) + local modulepath + for dependency in ${DEPENDENCIES[@]}; do + modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})" + done + + local JAVA_MODULE_NAME="org.apache.${PN/-/.}" + JAVA_JAR_FILENAME="${JAVA_MODULE_NAME}.jar" + java-pkg-simple_src_compile # creates a legacy jar file without module-info + + # generate module-info.java + jdeps \ + --module-path "${modulepath}" \ + --add-modules=ALL-MODULE-PATH \ + --generate-module-info src/main \ + --multi-release 9 \ + "${JAVA_MODULE_NAME}.jar" || die + + # compile module-info.java + ejavac \ + -source 9 -target 9 \ + --module-path "${modulepath}" \ + --patch-module "${JAVA_MODULE_NAME}"="${JAVA_MODULE_NAME}.jar" \ + -d target/versions/9 \ + src/main/"${JAVA_MODULE_NAME}"/versions/9/module-info.java + + # package + JAVA_JAR_FILENAME="${PN}.jar" + jar cvf "${JAVA_JAR_FILENAME}" \ + -C target/classes . \ + --release 9 -C target/versions/9 . || die + java-pkg-simple_src_compile + + pushd target/classes > /dev/null || die + + # pom.xml, lines 81-103 + jar -cvf ../../commons-logging-api.jar \ + $(find . -type f -name '*.class' \ + ! -name 'Jdk13LumberjackLogger.class' \ + ! -name 'ServletContextCleaner.class' \ + ) || die + + # pom.xml, lines 205-124 + jar -cvf ../../commons-logging-adapters.jar \ + $(find . -type f -path './org/apache/commons/logging/impl/**.class' \ + ! -name 'WeakHashtable*.class' \ + ! -name 'LogFactoryImpl*.class' \ + ) || die + + popd > /dev/null || die +} + +src_test() { + # Do not run Log4j tests because these tests use an Appender to verify + # logging correctness. The log4j-12-api bridge no longer supports using an + # Appender for verifications since the methods for adding an Appender in + # the bridge "are largely no-ops". This means an Appender's state would + # never be changed by log4j-12-api after new messages are logged. The test + # cases, however, expect changes to the Appender's state in such an event, + # so they would fail with log4j-12-api. + # https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html + rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger + rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger + rm -r src/test/java/org/apache/commons/logging/log4j || die + rm src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java || die + # error: package ch.qos.logback.classic does not exist + rm src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java || die + + JAVA_TEST_EXCLUDES=( + org.apache.commons.logging.jdk14.TestHandler # No runnable methods + # junit.framework.AssertionFailedError: Wrong factory retrieved through + # ServiceLoader: org.apache.commons.logging.impl.Slf4jLogFactory + org.apache.commons.logging.serviceloader.ServiceLoaderTestCase + # junit.framework.ComparisonFailure: Log class expected:<...ommons.logging.impl.[NoOp]Log> + # but was:<...ommons.logging.impl.[Slf4jLogFactory$Slf4j]Log> + org.apache.commons.logging.noop.NoOpLogTestCase + # org.junit.runners.model.InvalidTestClassyyError: Invalid test class + org.apache.commons.logging.LogSourceTest # No runnable methods + # junit.framework.AssertionFailedError: Logging config succeeded when context class loader was null! + org.apache.commons.logging.LoadTestCase + # junit.framework.AssertionFailedError: + # expected: + # but was: + org.apache.commons.logging.tccl.logfactory.AdaptersTcclTestCase + ) + JAVA_TEST_EXTRA_ARGS=( + -Dcommons-lang3="$(java-pkg_getjars commons-lang-3.6)" + -Dlog4j-api="commons-logging-api.jar" + -Dservlet-api="$(java-pkg_getjars jakarta-servlet-api-4)" + -Dcommons-logging="commons-logging.jar" + -Dcommons-logging-api="commons-logging-api.jar" + -Dcommons-logging-adapters="commons-logging-adapters.jar" + -Dtestclasses="target/test-classes" + ) + if use log4j; then + JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)" + fi + JAVA_TEST_GENTOO_CLASSPATH="commons-io-1 commons-lang-3.6 junit-4 junit-5" + JAVA_TEST_RESOURCE_DIRS="src/test/resources" + JAVA_TEST_SRC_DIR="src/test/java" + java-pkg-simple_src_test +} diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest index 046be15f418c..27ce0c3b87a3 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -1,8 +1,6 @@ -DIST mysql-connector-j-8.3.0.tar.gz 4255433 BLAKE2B b5cd437e4ab87052c0fd8e4da6a2612d4c068193a4fe2d207505b2f42d664a414c8a0f3131f34b471a30bfa6b6bb9e76ad0dd4779abbecb46ea014ab5d06e36d SHA512 0849ff13f4adc4ae2d2b9f64ff192435dd9560763a50c7df117a171ae1d90fc97bc36dc89097472d0a2c182492a45ca14ffcf577a9c54267be79e5b3f147dc41 DIST mysql-connector-j-9.0.0.tar.gz 4469329 BLAKE2B 3248d43654c56a2b566bbf515de996ab43f845beb2104f69c3c3c837b8b527d8e9851fe849bcf55fd7eafb061e4780dfaa19b42583a7d12b72367d0a36a61ab3 SHA512 40028f528e8bff686fcd700d165785194e1732a8c2c29efb2ffe67623f8915caaac4d2a9e548b0e9cda4328e25cfd6fe4e008cca1491117e38a4c79af0231475 DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430 DIST opentelemetry-api-1.40.0.jar 141734 BLAKE2B 1f14ca7caadd0a3eed615da7ee528e5df72474d9a4eabcf5a820996830cf76c8fa3402de7d283598f1e4bb44b1a15c488b81863c4b5c0685ea35fe65f3fb12c2 SHA512 d4a1af66075b5f147ba297a8133a707716e323800d8aa2debcdace2bbe10046b2fee8a47d87fa9b6f1f11ad30f4da688670c546841990ad8daa7c8c0535498f2 DIST opentelemetry-context-1.40.0.jar 47251 BLAKE2B 7effcc63ec6695184467518686ec8165118cae1e7a4f1a7db273a3cbd1ff0b1e98c2a83252291db9536121e1e2999d1d77734acd7ddb5b272264138af4e6af74 SHA512 14ebc39edce8b603fe9f13d304faf54d7362abe3b1ae574aa84d5bbe37c43b133c8131976efd2bfedc94c646b2487054f7b3cce04e1f09efbce0f4ce5a6d5921 -EBUILD jdbc-mysql-8.3.0.ebuild 1575 BLAKE2B 5e2ac925d850cbd027ea9eac9ac1566ed7e724c09954bb1e091ce91793efcc2afb2b88fa24342df64ca6f08aecc18ea340b453becd018b5bf75b9bb83ac19911 SHA512 af4f5da3680caeea3ca5561b69641c958b50c0cf42ace91c256f82382d1b78d3ed3b9fe52fa06c8da3e73388ab962a700bd692b21bff55cd809a65438857c1a4 EBUILD jdbc-mysql-9.0.0.ebuild 2155 BLAKE2B 43fed7d0957229763236b03a51016f677c7cd102e534688d30b4bed399bd1e6ba58d1b33e133ef32755cbc51a63b707db24fa91de972269e053ab62a24c1008c SHA512 3a16afd8a4212a21500477316bce52a37361930e46c2225ee91066acc0944a79af76d78d84ae2ab0524c8da1a2c8db301404d88ed15906fc192ec82a921c7136 MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8 diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild deleted file mode 100644 index fa5c0981ca39..000000000000 --- a/dev-java/jdbc-mysql/jdbc-mysql-8.3.0.ebuild +++ /dev/null @@ -1,55 +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="com.mysql:mysql-connector-j:8.3.0" -# Tests disabled, see bug #902723 -# 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="3.29.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-3.25:0 - - -+ - - - diff --git a/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild deleted file mode 100644 index 95aa1c28a226..000000000000 --- a/dev-java/protobuf-java/protobuf-java-3.25.3.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 2008-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.google.protobuf:protobuf-java:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple cmake - -DESCRIPTION="Core Protocol Buffers library" -HOMEPAGE="https://protobuf.dev" -# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. -# And we build artifact 3.25.3 from the 25.3 tarball in order to allow sharing the tarball with -# dev-libs/protobuf. -MY_PV3="${PV#3.}" -MY_PV="${MY_PV3/_rc/-rc}" -SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${MY_PV}.tar.gz - test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" -S="${WORKDIR}/protobuf-${MY_PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="system-protoc" - -BDEPEND=" - system-protoc? ( ~dev-libs/protobuf-${MY_PV3}:0 ) - !system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 ) -" -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/guava:0 - dev-java/mockito:4 - ) -" -RDEPEND=">=virtual/jre-1.8:*" - -PATCHES=( - "${FILESDIR}/protobuf-java-3.23.0-unittest_retention.proto.patch" -) - -JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" -JAVA_JAR_FILENAME="protobuf.jar" -JAVA_RESOURCE_DIRS="java/core/src/main/resources" -JAVA_SRC_DIR="java/core/src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" -JAVA_TEST_SRC_DIR="java/core/src/test/java" - -run-protoc() { - if use system-protoc; then - protoc $1 - else - "${BUILD_DIR}"/protoc $1 - fi -} - -src_prepare() { - # If the corrsponding version of system-protoc is not available we build protoc locally - if use system-protoc; then - default # apply patches - else - cmake_src_prepare - fi - java-pkg-2_src_prepare - - mkdir "${JAVA_RESOURCE_DIRS}" || die - # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/pom.xml#L43-L62 - PROTOS=( $(sed \ - -n '/google\/protobuf.*\.proto/s:.*\(.*\):\1:p' \ - "${S}/java/core/pom.xml") ) || die - pushd src > /dev/null || die - cp --parents -v "${PROTOS[@]}" ../"${JAVA_RESOURCE_DIRS}" || die - popd > /dev/null || die - - # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/generate-sources-build.xml - einfo "Replace variables in generate-sources-build.xml" - sed \ - -e 's:${generated.sources.dir}:java/core/src/main/java:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|echo\|mkdir\|exec/d' \ - -i java/core/generate-sources-build.xml || die "sed to sources failed" - - # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/generate-test-sources-build.xml - einfo "Replace variables in generate-test-sources-build.xml" - sed \ - -e 's:${generated.testsources.dir}:java/core/src/test/java:' \ - -e 's:${protobuf.source.dir}:src:' \ - -e 's:${test.proto.dir}:java/core/src/test/proto:' \ - -e 's:^.*value="::' -e 's:\"/>::' \ - -e '/project\|mkdir\|exec\|Also generate/d' \ - -i java/core/generate-test-sources-build.xml || die "sed to test sources failed" - - # Split the file in two parts, one for each run-protoc call - awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \ - java/core/generate-test-sources-build.xml || die -} - -src_configure() { - local mycmakeargs=( - -Dprotobuf_BUILD_TESTS=OFF - -Dprotobuf_ABSL_PROVIDER=package - ) - if use system-protoc; then - : - else - cmake_src_configure - fi -} - -src_compile() { - if use system-protoc; then - : - else - cmake_src_compile - fi - - einfo "Run protoc to generate sources" - run-protoc \ - @java/core/generate-sources-build.xml \ - || die "protoc sources failed" - - java-pkg-simple_src_compile -} - -src_test() { - # https://github.com/protocolbuffers/protobuf/blob/v25.3/java/core/pom.xml#L63-L71 - jar cvf testdata.jar \ - -C src google/protobuf/testdata/golden_message_oneof_implemented \ - -C src google/protobuf/testdata/golden_packed_fields_message || die - - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar:testdata.jar" - - einfo "Running protoc on first part of generate-test-sources-build.xml" - run-protoc @test-sources-build-1 \ - || die "run-protoc test-sources-build-1 failed" - - einfo "Running protoc on second part of generate-test-sources-build.xml" - run-protoc @test-sources-build-2 \ - || die "run-protoc test-sources-build-2 failed" - - einfo "Running tests" - # Invalid test class 'map_test.MapInitializationOrderTest': - # 1. Test class should have exactly one public constructor - # Invalid test class 'protobuf_unittest.CachedFieldSizeTest': - # 1. Test class should have exactly one public constructor - pushd "${JAVA_TEST_SRC_DIR}" || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -path "**/*Test.java" \ - ! -path "**/Abstract*Test.java" \ - ! -name "MapInitializationOrderTest.java" \ - ! -path '*protobuf_unittest/CachedFieldSizeTest.java' - ) - popd - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - java-pkg-simple_src_test -} - -src_install() { - java-pkg-simple_src_install -} -- cgit v1.2.3