From 50878a9089d38edec91fb6a8035f9681695189b7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Sep 2022 17:11:03 +0100 Subject: gentoo auto-resync : 14:09:2022 - 17:11:02 --- dev-java/Manifest.gz | Bin 54058 -> 54057 bytes dev-java/byte-buddy/Manifest | 2 + dev-java/byte-buddy/byte-buddy-1.12.14.ebuild | 202 ++++++++++++++++++++++++++ 3 files changed, 204 insertions(+) create mode 100644 dev-java/byte-buddy/byte-buddy-1.12.14.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index df4f8c28b8c6..f80490e490ec 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest index 442c949c97f4..f68a034fb81f 100644 --- a/dev-java/byte-buddy/Manifest +++ b/dev-java/byte-buddy/Manifest @@ -1,5 +1,7 @@ DIST byte-buddy-1.12.12.tar.gz 149937318 BLAKE2B 1a1bd0de97b47ace4c64649da3ae80dcb421a4d46e9b4f66e121accad94a99a2b81fa9aeaca99ae14cf1ef56feff5248d5700d6b056d490563bbc7ae9f07ace9 SHA512 bd8dc5b86ce456d5a907dd23643233bb001c15df5419aeed177d3b4f8054ab172d13244d0b3fef734e8232dfdd9339745d8112fa69e0be566b62459c198bf67a DIST byte-buddy-1.12.13.tar.gz 1721038 BLAKE2B 60aadbbb3b56e5ac2ecc2bb162653b769f4d4b913bd675457ce2fbf12a5777addc4beb2bb2e347d5956dbf1fbe6a6dfce078a29c53b1f1e2a60585670897d4ee SHA512 88c221d0dccb248683069070e498c5d4320f4fce059c45f460e04fbd86c2c596c18a4c7f4e9b3a0480eaf96d93593d1f1af87d894a7c4b3d73511e88a95f4e92 +DIST byte-buddy-1.12.14.tar.gz 1857258 BLAKE2B 6957246f6689d1bdfdc6277ad752e03df0ae47c62b0afded77c94cdd41e00cc736517d0e4e5d5f8c59be519262a03864cde9bffa4ae53e5a7daeed84a519967f SHA512 5035be16fbdf2f7e8e2c93b87ee5f9adc927a19fd3b7d9fcd262906d8d21532cef8111084c3d6d0b75e101df0bfee19bf9177bc6a7d4b18cf0f26146fba4f147 EBUILD byte-buddy-1.12.12.ebuild 6641 BLAKE2B 5be4c84242682cdc08fbfb495253d3a0da7b16185ce1ffffab3771bf76531dbf8a011cf799cb7ff7bbe0e7ba4cd0712c12105fca8026bf8a3c4aa1d8464cd80e SHA512 60c8e42be0979cfba922fc01742b3a23689cca95193ef67a2129071d057b4ba9b44891bd6026cdd41a5d8a7dcb4779f12c4ac80ffbc32059f0875b8993e90520 EBUILD byte-buddy-1.12.13.ebuild 4576 BLAKE2B e670a5c667ad5d01a89e73bb6e4a4b3e34a7e70dd3ea1669e7abe76402dd7a1159d443eb1f5359c060b5ff7f6f85d9ef8970362669dc32a4da0093de7c27915b SHA512 d09eba83a9d2fb6d5f2a7020305499d67beda435161a25437466f76169b0930c7632cdc1e505a859effe6a239b0b6e7149c533bf6328cb089be6dce0be61b32c +EBUILD byte-buddy-1.12.14.ebuild 6737 BLAKE2B fa6cc684f2a2754b7db7eecfdb83b8f0027a421e1304a360e68272dde6d837ee78b1edb833b25a5167e0acf44f2eb2a13f8860e2bf9e13ff0f569612ecfa29d7 SHA512 7d2fa806770bbafb3adc538af4c0d8cc64fb5aaf793c69f504b55f11c0e9798f02d86d985870e7516de355c4950720832538e023332eac4ee516131742a8d251 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956 diff --git a/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild new file mode 100644 index 000000000000..a2dee2c98e3d --- /dev/null +++ b/dev-java/byte-buddy/byte-buddy-1.12.14.ebuild @@ -0,0 +1,202 @@ +# 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://github.com/raphw/byte-buddy/archive/byte-buddy-1.12.14.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.14.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.14" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Offers convenience for attaching an agent to the local or a remote VM" +HOMEPAGE="https://bytebuddy.net" +SRC_URI="https://github.com/raphw/${PN}/archive/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=" + >=virtual/jdk-11:* + dev-java/asm:9 + dev-java/findbugs-annotations:0 + dev-java/jna:4 + dev-java/jsr305:0 + test? ( + dev-java/mockito:4 + ) +" + +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}/${PN}-${P}" + +JAVA_CLASSPATH_EXTRA=" + asm-9 + findbugs-annotations + jsr305 + jna-4 +" + +src_prepare() { + default + # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.14/byte-buddy-agent/pom.xml#L132-L166 + cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF + module net.bytebuddy.agent { + requires java.instrument; + requires static jdk.attach; + requires static com.sun.jna; + requires static com.sun.jna.platform; + requires java.base; + exports net.bytebuddy.agent; + exports net.bytebuddy.agent.utility.nullability; + } + EOF + + # adjustment for recent mockito versions + sed \ + -e 's:verifyZeroInteractions:verifyNoInteractions:g' \ + -i byte-buddy-dep/src/test/java/net/bytebuddy/*.java \ + -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*Test.java \ + -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*Test.java \ + -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*Test.java \ + -i byte-buddy-dep/src/test/java/net/bytebuddy/*/*/*/*/*Test.java \ + || die + + # instead of shading byte-buddy-dep we move it into byte-buddy. + mv byte-buddy{-dep,}/src/main/java || die "cannot move sources" + mv byte-buddy{-dep,}/src/test || die "cannot move tests" + + # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.14/byte-buddy/pom.xml#L159-L195 + cat > byte-buddy/src/main/java/module-info.java <<-EOF + module net.bytebuddy { + requires static java.instrument; + requires static java.management; + requires static jdk.unsupported; + requires static net.bytebuddy.agent; + requires static com.sun.jna; + requires static com.sun.jna.platform; + requires java.base; + exports net.bytebuddy; + exports net.bytebuddy.agent.builder; + exports net.bytebuddy.asm; + exports net.bytebuddy.build; + exports net.bytebuddy.description; + exports net.bytebuddy.description.annotation; + exports net.bytebuddy.description.enumeration; + exports net.bytebuddy.description.field; + exports net.bytebuddy.description.method; + exports net.bytebuddy.description.modifier; + exports net.bytebuddy.description.type; + exports net.bytebuddy.dynamic; + exports net.bytebuddy.dynamic.loading; + exports net.bytebuddy.dynamic.scaffold; + exports net.bytebuddy.dynamic.scaffold.inline; + exports net.bytebuddy.dynamic.scaffold.subclass; + exports net.bytebuddy.implementation; + exports net.bytebuddy.implementation.attribute; + exports net.bytebuddy.implementation.auxiliary; + exports net.bytebuddy.implementation.bind; + exports net.bytebuddy.implementation.bind.annotation; + exports net.bytebuddy.implementation.bytecode; + exports net.bytebuddy.implementation.bytecode.assign; + exports net.bytebuddy.implementation.bytecode.assign.primitive; + exports net.bytebuddy.implementation.bytecode.assign.reference; + exports net.bytebuddy.implementation.bytecode.collection; + exports net.bytebuddy.implementation.bytecode.constant; + exports net.bytebuddy.implementation.bytecode.member; + exports net.bytebuddy.matcher; + exports net.bytebuddy.pool; + exports net.bytebuddy.utility; + exports net.bytebuddy.utility.nullability; + exports net.bytebuddy.utility.privilege; + exports net.bytebuddy.utility.visitor; + } + EOF + # We don't bundle, hence cannot export them + # exports net.bytebuddy.jar.asm; + # exports net.bytebuddy.jar.asm.signature; + # exports net.bytebuddy.jar.asm.commons; +} + +src_compile() { + einfo "Compiling byte-buddy-agent.jar" + JAVA_SRC_DIR="byte-buddy-agent/src/main/java" + JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources" + JAVA_JAR_FILENAME="byte-buddy-agent.jar" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar" + rm -r target || die + + einfo "Compiling byte-buddy.jar" + JAVA_SRC_DIR="byte-buddy/src/main/java" + JAVA_RESOURCE_DIRS=() + JAVA_JAR_FILENAME="byte-buddy.jar" + JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar" + rm -r target || die + + if use doc; then + einfo "Compiling javadocs" + JAVA_SRC_DIR=( + "byte-buddy-agent/src/main/java" + "byte-buddy-dep/src/main/java" + ) + JAVA_JAR_FILENAME="ignoreme.jar" + java-pkg-simple_src_compile + fi +} + +src_test() { + JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4" + + # einfo "Setting -Djava.library.path" + # This would work only after manually adding libjnidispatch.so to /usr/share/jna-4/lib/jna.jar, + # done with ( jar -uf /usr/share/jna-4/lib/jna.jar -C . com/sun/jna/linux-x86-64/libjnidispatch ) +# JAVA_TEST_EXTRA_ARGS=( -Djava.library.path+="$(java-config -i jna-4)" com.sun.jna.Native ) + # Otherwise fails with: + # Exception in thread "main" java.lang.UnsatisfiedLinkError: Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path + + einfo "Testing byte-buddy-agent" + JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java" + # Native library (com/sun/jna/linux-x86-64/libjnidispatch.so) not found in resource path + JAVA_TEST_EXCLUDES=( + net.bytebuddy.agent.VirtualMachineAttachmentTest + ) + java-pkg-simple_src_test + + einfo "Testing byte-buddy" + JAVA_TEST_SRC_DIR="byte-buddy/src/test/java" + JAVA_TEST_RESOURCE_DIRS=( + byte-buddy/src/test/resources + byte-buddy/src/test/precompiled* + ) + + # what "mvn test" does with java 17 is: + # Tests run: 10022, Failures: 0, Errors: 0, Skipped: 0 + JAVA_TEST_EXCLUDES+=( + net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest # 39 tests + net.bytebuddy.build.CachedReturnPluginTest # 44 tests + net.bytebuddy.build.CachedReturnPluginOtherTest # 4 tests + ) + java-pkg-simple_src_test +} + +src_install() { + java-pkg_dojar "byte-buddy-agent.jar" + java-pkg_dojar "byte-buddy.jar" + + if use doc; then + java-pkg_dojavadoc target/api + fi + + if use source; then + java-pkg_dosrc "byte-buddy-agent/src/main/java/*" + java-pkg_dosrc "byte-buddy/src/main/java/*" + fi +} -- cgit v1.2.3