diff options
| -rw-r--r-- | dev-java/byte-buddy/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/byte-buddy/byte-buddy-1.15.11.ebuild | 144 | ||||
| -rw-r--r-- | dev-java/byte-buddy/files/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch | 34 |
3 files changed, 0 insertions, 179 deletions
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest index c9fa7a46a585..df0b5389e9ee 100644 --- a/dev-java/byte-buddy/Manifest +++ b/dev-java/byte-buddy/Manifest @@ -1,2 +1 @@ -DIST byte-buddy-1.15.11.tar.gz 2059994 BLAKE2B b5b11de938d2b96518c01cf1bcebb0f34ca6ccdb81e519e0177fa371f438da9ca5aba5749d1a7af0f42a2359c55228f3cbfbfe32f158d4a18fe7f02a5d5bf4f2 SHA512 9e663dfee80e6ae9e4983a39177a94f160e52e3ef1dec54b8f6a90e32c18ae5b36c9e791fd605b43754b2667f6efd7e15a1f7b0ce6c5034945567aef8a6b8aa8 DIST byte-buddy-1.17.8.tar.gz 2104108 BLAKE2B fbb5d7afd985d68343693a7b3737d1e3908c49124549120f778fcef3810b4da98ed38d38ae47e22a6d13d1d23f575adb3e46e98161986dddb5a960395884d6db SHA512 1b79277264af390b960921891b65c81b5fea972dd18c711a119312d43798a1edcf5fef1dd3923cfd60c7393ca9dae6ad6cd19854bb733658018af2f644fd2d90 diff --git a/dev-java/byte-buddy/byte-buddy-1.15.11.ebuild b/dev-java/byte-buddy/byte-buddy-1.15.11.ebuild deleted file mode 100644 index f082462e97d5..000000000000 --- a/dev-java/byte-buddy/byte-buddy-1.15.11.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_PROVIDES="net.bytebuddy:byte-buddy-agent:${PV} net.bytebuddy:byte-buddy:${PV}" -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" -S="${WORKDIR}/byte-buddy-${P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -DEPEND=" - >=dev-java/asm-9.7.1:9 - dev-java/findbugs-annotations:0 - dev-java/jna:4 - dev-java/jsr305:0 - >=virtual/jdk-11:* - test? ( - >=dev-java/mockito-2.28.2-r1:2 - ) -" - -RDEPEND=">=virtual/jre-1.8:*" - -PATCHES=( "${FILESDIR}/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch" ) - -JAVA_CLASSPATH_EXTRA=" - asm-9 - findbugs-annotations - jna-4 - jsr305 -" -JAVADOC_CLASSPATH="${JAVA_CLASSPATH_EXTRA}" -JAVADOC_SRC_DIRS=( - "byte-buddy-agent/src/main/java" - "byte-buddy/src/main/java" -) - -src_prepare() { - default #780585 - java-pkg_clean ! -path "./byte-buddy-dep/src/test/*" # Keep test-classes - java-pkg-2_src_prepare - # 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 - - einfo "Building javadocs" - rm byte-buddy{,-agent}/src/main/java/module-info.java || die - use doc && ejavadoc -} - -src_test() { - # instead of shading byte-buddy-dep we move it into byte-buddy. - mv byte-buddy{-dep,}/src/test || die "cannot move tests" - - JAVAC_ARGS="-g" - JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-2" - - 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-simple_src_install - - if use source; then - java-pkg_dosrc "byte-buddy-agent/src/main/java/*" - java-pkg_dosrc "byte-buddy/src/main/java/*" - fi -} diff --git a/dev-java/byte-buddy/files/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch b/dev-java/byte-buddy/files/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch deleted file mode 100644 index c90c3c9a66c9..000000000000 --- a/dev-java/byte-buddy/files/byte-buddy-1.15.10-Skip-testIgnoreExistingField.patch +++ /dev/null @@ -1,34 +0,0 @@ -There was 1 failure: -1) testIgnoreExistingField(net.bytebuddy.build.CachedReturnPluginOtherTest) -net.bytebuddy.pool.TypePool$Resolution$NoSuchTypeException: Cannot resolve type description for net.bytebuddy.build.CachedReturnPlugin$Advice$boolean - at net.bytebuddy.pool.TypePool$Resolution$Illegal.resolve(TypePool.java:190) - at net.bytebuddy.build.CachedReturnPlugin.<init>(CachedReturnPlugin.java:125) - at net.bytebuddy.build.CachedReturnPluginOtherTest.testIgnoreExistingField(CachedReturnPluginOtherTest.java:19) - -FAILURES!!! - ---- a/byte-buddy-dep/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java -+++ b/byte-buddy-dep/src/test/java/net/bytebuddy/build/CachedReturnPluginOtherTest.java -@@ -6,13 +6,14 @@ import net.bytebuddy.dynamic.ClassFileLocator; - import net.bytebuddy.dynamic.DynamicType; - import org.hamcrest.CoreMatchers; - import org.junit.Test; -+import org.junit.Ignore; - - import static org.hamcrest.CoreMatchers.sameInstance; - import static org.hamcrest.MatcherAssert.assertThat; - - public class CachedReturnPluginOtherTest { - -- @Test -+ @Test @Ignore - @SuppressWarnings("rawtypes") - public void testIgnoreExistingField() { - DynamicType.Builder<ExistingField> builder = new ByteBuddy().redefine(ExistingField.class); -@@ -73,4 +74,4 @@ public class CachedReturnPluginOtherTest { - return null; - } - } --} -\ No newline at end of file -+} |