commit: ffa8f6b5eb8be026039338befd02e2c124934e20 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Jan 10 07:52:07 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Jan 10 08:51:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa8f6b5
dev-java/byte-buddy: drop 1.14.0 Closes: https://bugs.gentoo.org/916487 Closes: https://bugs.gentoo.org/936606 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/byte-buddy/Manifest | 1 - dev-java/byte-buddy/byte-buddy-1.14.0.ebuild | 161 --------------------------- 2 files changed, 162 deletions(-) diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest index 9fc8709af89a..b9be7b28c952 100644 --- a/dev-java/byte-buddy/Manifest +++ b/dev-java/byte-buddy/Manifest @@ -1,3 +1,2 @@ -DIST byte-buddy-1.14.0.tar.gz 1989303 BLAKE2B c284f54ebc6bf67e4706380f0876f403fcf5ae172a690888d13d6b3399cf41bf1fd8890bf15059f71a9457ec6343254ad1f421f8e4975aa70dd9a2103ab59610 SHA512 e6ccda287935b5ff7104d5c0e4904b0595918a21bcc90c6ac5b2358cc0371b22a4fcac2a95dde9e377c5d1e43077c8b57ea9520a9093b2380ab53c830f107ced DIST byte-buddy-1.15.10.tar.gz 2057524 BLAKE2B 7f5e178b3ea31fb30379e49d69f34ba1b9953d705a54c3609bb771f66962af776dee95ea10ab7049e50351362ff87c164782bc4b1b782985ac8f122e5833cb4e SHA512 3b7a02475433193efe8a8e20378369ec18f10c81dd90b428d5393c45fe261f678b1707c92923381b8a3030f8a2e8525fe95e3337ca7e5455cdc5fc2647416d2a DIST byte-buddy-1.15.11.tar.gz 2059994 BLAKE2B b5b11de938d2b96518c01cf1bcebb0f34ca6ccdb81e519e0177fa371f438da9ca5aba5749d1a7af0f42a2359c55228f3cbfbfe32f158d4a18fe7f02a5d5bf4f2 SHA512 9e663dfee80e6ae9e4983a39177a94f160e52e3ef1dec54b8f6a90e32c18ae5b36c9e791fd605b43754b2667f6efd7e15a1f7b0ce6c5034945567aef8a6b8aa8 diff --git a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild deleted file mode 100644 index 13232b00c524..000000000000 --- a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2024 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.23.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild byte-buddy-1.12.23.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_PROVIDES="net.bytebuddy:byte-buddy-agent:1.12.23 net.bytebuddy:byte-buddy:1.12.23" -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/byte-buddy/archive/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -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}/byte-buddy-${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.20/byte-buddy-agent/pom.xml#L142-L176 - cat > byte-buddy-agent/src/main/java/module-info.java <<-EOF || die - 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 - - # instead of shading byte-buddy-dep we move it into byte-buddy. - mv byte-buddy{-dep,}/src/main/java || die "cannot move sources" - - # https://github.com/raphw/byte-buddy/blob/byte-buddy-1.12.20/byte-buddy/pom.xml#L159-L195 - local exports="$( \ - sed -n '/<packages.list.external>/,/<\/packages.list.external/p' \ - byte-buddy/pom.xml \ - | sed -e 's:^:exports :' -e 's:,:;:' \ - | grep -v 'packages.list.external\|shade' | tr -s '[:space:]' \ - )" || die - cat > byte-buddy/src/main/java/module-info.java <<-EOF || die - 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} - } - EOF -} - -src_compile() { - einfo "Compiling byte-buddy-agent.jar" - JAVA_JAR_FILENAME="byte-buddy-agent.jar" - JAVA_RESOURCE_DIRS="byte-buddy-agent/src/main/resources" - JAVA_SRC_DIR="byte-buddy-agent/src/main/java" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy-agent.jar" - rm -r target || die - - einfo "Compiling byte-buddy.jar" - JAVA_JAR_FILENAME="byte-buddy.jar" - JAVA_MAIN_CLASS="net.bytebuddy.build.Plugin\$Engine\$Default" - JAVA_RESOURCE_DIRS=() - JAVA_SRC_DIR="byte-buddy/src/main/java" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":byte-buddy.jar" - rm -r target || die - - if use doc; then - einfo "Compiling javadocs" - rm byte-buddy-agent/src/main/java/module-info.java || die - JAVA_SRC_DIR=( - "byte-buddy-agent/src/main/java" - "byte-buddy/src/main/java" - ) - JAVA_JAR_FILENAME="ignoreme.jar" - java-pkg-simple_src_compile - fi -} - -src_test() { - # instead of shading byte-buddy-dep we move it into byte-buddy. - mv byte-buddy{-dep,}/src/test || die "cannot move tests" - - # @Ignore one of 4 tests, https://bugs.gentoo.org/863386 - sed \ - -e '/import org.junit.Test/a import org.junit.Ignore;' \ - -e '/testIgnoreExistingField()/i @Ignore' \ - -i byte-buddy/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java || die - - # @Ignore one of 39 tests, https://bugs.gentoo.org/863386 - sed \ - -e '/import org.junit.Test/a import org.junit.Ignore;' \ - -e '/testNoParameterNameAndModifiers()/i @Ignore' \ - -i byte-buddy/src/test/java/net/bytebuddy/description/method/AbstractMethodDescriptionTest.java || die - - JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4" - - einfo "Testing byte-buddy-agent" - # https://github.com/raphw/byte-buddy/issues/1321#issuecomment-1252776459 - JAVA_TEST_EXTRA_ARGS=( -Dnet.bytebuddy.test.jnapath="${EPREFIX}/usr/$(get_libdir)/jna-4/" ) - JAVA_TEST_SRC_DIR="byte-buddy-agent/src/test/java" - java-pkg-simple_src_test - - einfo "Testing byte-buddy" - JAVA_TEST_RESOURCE_DIRS=( byte-buddy/src/test/{resources,precompiled*} ) - JAVA_TEST_SRC_DIR="byte-buddy/src/test/java" - - JAVA_TEST_EXCLUDES=( - # all tests in this class fail, https://bugs.gentoo.org/863386 - net.bytebuddy.build.CachedReturnPluginTest - ) - 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 -}
