commit: b741d5d6e21369ec8819557a3daee8184edb3266 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu Sep 15 06:22:08 2022 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri Sep 16 18:58:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b741d5d6
dev-java/byte-buddy: drop 1.12.12 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-java/byte-buddy/Manifest | 1 - dev-java/byte-buddy/byte-buddy-1.12.12.ebuild | 176 -------------------------- 2 files changed, 177 deletions(-) diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest index 59590e26fdd0..09b6bc50584f 100644 --- a/dev-java/byte-buddy/Manifest +++ b/dev-java/byte-buddy/Manifest @@ -1,3 +1,2 @@ -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 diff --git a/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild b/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild deleted file mode 100644 index 999d9bfbd469..000000000000 --- a/dev-java/byte-buddy/byte-buddy-1.12.12.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# 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.12.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.12.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="net.bytebuddy:byte-buddy-agent:1.12.12" -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.12/byte-buddy-agent/pom.xml#L132-L165 - 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 - - 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 -} - -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 - -# For pkgdiff to compare the content of module-info.class -# mkdir -p META-INF/versions/9 || die -# cp target/classes/module-info.class META-INF/versions/9/ || die -# jar -uf byte-buddy.jar -C . META-INF/versions/9/module-info.class || die - - einfo "Compiling byte-buddy-dep.jar" - JAVA_SRC_DIR="byte-buddy-dep/src/main/java" - JAVA_RESOURCE_DIRS="byte-buddy-dep/src/main/resources" - JAVA_JAR_FILENAME="byte-buddy-dep.jar" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-dep.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-dep" - JAVA_TEST_SRC_DIR="byte-buddy-dep/src/test/java" - JAVA_TEST_RESOURCE_DIRS="byte-buddy-dep/src/test/resources" - - # what "mvn test" does with java 17 is: - # Tests run: 9836, Failures: 0, Errors: 0, Skipped: 0 - - # 1) testTypeVariableTypeAnnotationRuntimeRetention[0](net.bytebuddy.implementation.attribute.MethodAttributeAppenderForInstrumentedMethodTest) - # org.mockito.exceptions.verification.NoInteractionsWanted: - # -- - # 2) testTypeVariableTypeAnnotationRuntimeRetention[1](net.bytebuddy.implementation.attribute.MethodAttributeAppenderForInstrumentedMethodTest) - # org.mockito.exceptions.verification.NoInteractionsWanted: - # -- - # 3) testAnnotationClassFileRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeDifferentiatingTest) - # org.mockito.exceptions.verification.NoInteractionsWanted: - # -- - # 4) testAnnotationByteCodeRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeDifferentiatingTest) - # org.mockito.exceptions.verification.NoInteractionsWanted: - # -- - # 5) testAnnotationClassFileRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeTest) - # org.mockito.exceptions.verification.NoInteractionsWanted: - # -- - # 6) testAnnotationByteCodeRetention(net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeTest) - # org.mockito.exceptions.verification.NoInteractionsWanted: - # -- - # 7) testChildSecond(net.bytebuddy.pool.TypePoolDefaultHierarchyTest) - # org.mockito.exceptions.verification.NoInteractionsWanted: - # -- - # 8) testNoParameterNameAndModifiers(net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest) - # java.lang.AssertionError: - # -- - # 9) testSimpleApplication(net.bytebuddy.description.type.TypeInitializerTest) - # org.mockito.exceptions.verification.NoInteractionsWanted: - # -- - # 10) testRedefinitionChunkedOneFailsResubmit(net.bytebuddy.agent.builder.AgentBuilderDefaultTest) - # org.mockito.exceptions.verification.NoInteractionsWanted: - JAVA_TEST_EXCLUDES+=( - net.bytebuddy.implementation.attribute.MethodAttributeAppenderForInstrumentedMethodTest - net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeDifferentiatingTest - net.bytebuddy.implementation.attribute.TypeAttributeAppenderForInstrumentedTypeTest - net.bytebuddy.pool.TypePoolDefaultHierarchyTest - net.bytebuddy.pool.TypePoolDefaultMethodDescriptionTest - net.bytebuddy.description.type.TypeInitializerTest - net.bytebuddy.agent.builder.AgentBuilderDefaultTest - ) - java-pkg-simple_src_test -} - -src_install() { - java-pkg_dojar "byte-buddy-agent.jar" - java-pkg_dojar "byte-buddy-dep.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-dep/src/main/java/*" - fi -}
