diff --git a/avoid-bundling-asm.patch b/avoid-bundling-asm.patch index f04755c..f6a3fca 100644 --- a/avoid-bundling-asm.patch +++ b/avoid-bundling-asm.patch @@ -1,5 +1,7 @@ ---- byte-buddy/pom.xml.orig 2018-11-22 17:18:25.000000000 +0000 -+++ byte-buddy/pom.xml 2018-11-30 17:48:48.655978937 +0000 +diff --git a/byte-buddy/pom.xml b/byte-buddy/pom.xml +index f16ba74..d7f68b4 100644 +--- a/byte-buddy/pom.xml ++++ b/byte-buddy/pom.xml @@ -26,8 +26,6 @@ --> @@ -9,25 +11,20 @@ net.bytebuddy, net.bytebuddy.agent.builder, -@@ -61,10 +59,7 @@ - net.bytebuddy.pool, +@@ -62,9 +60,6 @@ net.bytebuddy.utility, net.bytebuddy.utility.privilege, -- net.bytebuddy.utility.visitor, + net.bytebuddy.utility.visitor, - ${shade.target}, - ${shade.target}.signature, - ${shade.target}.commons -+ net.bytebuddy.utility.visitor -@@ -77,7 +72,17 @@ - - ${project.groupId} +@@ -79,6 +74,16 @@ byte-buddy-dep -- ${project.version} -+ ${project.version} -+ + ${project.version} + + + org.ow2.asm + asm @@ -37,10 +34,11 @@ + org.ow2.asm + asm-commons + ${version.asm} - ++ -@@ -99,47 +104,19 @@ + +@@ -99,48 +104,19 @@ true true true @@ -54,14 +52,15 @@ - - org.ow2.asm:asm-commons - -- org/objectweb/asm/commons/Remapper.class -- org/objectweb/asm/commons/SimpleRemapper.class -- org/objectweb/asm/commons/ClassRemapper.class - org/objectweb/asm/commons/AnnotationRemapper.class +- org/objectweb/asm/commons/ClassRemapper.class - org/objectweb/asm/commons/FieldRemapper.class - org/objectweb/asm/commons/MethodRemapper.class +- org/objectweb/asm/commons/ModuleHashesAttribute.class - org/objectweb/asm/commons/ModuleRemapper.class +- org/objectweb/asm/commons/Remapper.class - org/objectweb/asm/commons/SignatureRemapper.class +- org/objectweb/asm/commons/SimpleRemapper.class - - - diff --git a/byte-buddy.spec b/byte-buddy.spec index 1bf013e..4c59df6 100644 --- a/byte-buddy.spec +++ b/byte-buddy.spec @@ -1,6 +1,6 @@ Name: byte-buddy -Version: 1.9.5 -Release: 5%{?dist} +Version: 1.9.13 +Release: 1%{?dist} Summary: Runtime code generation for the Java virtual machine License: ASL 2.0 URL: http://bytebuddy.net/ @@ -71,7 +71,7 @@ This package contains API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} %patch0 -%patch1 +%patch1 -p1 # Remove pre-built jars find -name *.jar -delete @@ -111,6 +111,8 @@ sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings) # Plugin for generating Java 9 module-info file is not in Fedora %pom_remove_plugin -r :modulemaker-maven-plugin +%pom_remove_dep org.ow2.asm:asm-deprecated + %build # Ignore test failures, there seems to be something different about the # bytecode of our recompiled test resources, expect 6 test failures in @@ -136,6 +138,9 @@ sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings) %license LICENSE NOTICE %changelog +* Thu Jun 06 2019 Marian Koncek - 1.9.13-1 +- Update to upstream version 1.9.13 + * Fri May 24 2019 Mikolaj Izdebski - 1.9.5-5 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 5b50456..446a1a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (byte-buddy-1.9.5.tar.gz) = 6f34e57afa2be4e846f6ffbfe0c1936dcc67c674a876f9be9ae988205c3723a507302881fe0731d26830d6f3973bc71cde781f9a11e766e51312316b1c911193 +SHA512 (byte-buddy-1.9.13.tar.gz) = 30ea5fce9eeb9a84e80fc86f5d77eba9bfea939a7de5581481a300c47e85c8206843ef7155672603b26dce6df00c1a5a3fc2a3f38da69a2f33579f7a2790e132