From patchwork Sat Feb 25 20:30:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 47348 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B4E0916BBA; Sat, 25 Feb 2023 20:33:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CDA901684B for ; Sat, 25 Feb 2023 20:33:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW1DC-0005os-MS; Sat, 25 Feb 2023 15:32:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW1D9-0005mX-61 for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW1D8-00016U-UF for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW1D8-0004Ty-R3 for guix-patches@gnu.org; Sat, 25 Feb 2023 15:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61794] [PATCH 03/18] gnu: java-cglib: Update to 3.3.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 20:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61794@debbugs.gnu.org Received: via spool by 61794-submit@debbugs.gnu.org id=B61794.167735706517036 (code B ref 61794); Sat, 25 Feb 2023 20:32:02 +0000 Received: (at 61794) by debbugs.gnu.org; 25 Feb 2023 20:31:05 +0000 Received: from localhost ([127.0.0.1]:41655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1CB-0004Py-Ib for submit@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:05 -0500 Received: from lepiller.eu ([89.234.186.109]:49662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW1C5-0004OQ-4r for 61794@debbugs.gnu.org; Sat, 25 Feb 2023 15:31:00 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id b1e84f88 for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=zRIVQuPj0/l8ckGiuuCGn9+cT giAMFUQCn/EBbRHYOw=; b=Wo1JeFtmkYSaDWLbrInltujINcShzLPbsmiooJh1h di4db2CyfqjznawEC6fmjCxE8fpX7cY6SgpWOP7JynrOGY82/R/IwXKsgCyYR1Lp 4bDBDxwnG3gqMLtu/TMNsrafhhq6lHwdP8E9HH8tnO/mOwUB3qlnYMxdPU7Cr0up 0TEOoSZf0PuKy7viFqhGH3b0D3uozF5ehu/QXA4dt1pv1HENkZv/sBHjnEv+S+qU U+2RyDWOu0jEix5INJaPtRspTQfXJ8x6uKIVAaDPktPQrwa7Eos9plLe+KhnhOU4 fryGg5pmYAo41h75Br85gLffY+KV/HjoMViqdtgA8i7PA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 29f77e52 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <61794@debbugs.gnu.org>; Sat, 25 Feb 2023 20:30:53 +0000 (UTC) From: Julien Lepiller Date: Sat, 25 Feb 2023 21:30:27 +0100 Message-Id: <7ed71ea7616290fd7d0309d01b3f0859a062228e.1677357041.git.julien@lepiller.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> References: <8c21fa41d1a4bc4665a074eee3b960a99455459e.1677357041.git.julien@lepiller.eu> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches cglib now requires asm-8 at runtime, so propagate it and do not use asm-6 in dependents. * gnu/packages/java.scm (java-cglib): Update to 3.3.0. (java-plexus-component-metadata-1.7, java-easymock, java-jmock) (java-jmock-legacy, java-jmock-junit4, java-ops4j-pax-exam-core-spi) (java-guice, java-fest-assert, java-testng, java-lmax-disruptor) (java-powermock-reflect, java-powermock-modules-junit4) (java-kafka-clients, java-jline-2, java-xmlunit, java-eclipse-sisu-plexus) (java-logback-core): Remove `java-asm` from inputs or native-inputs. * gnu/packages/batik.scm (java-xmlgraphics-commons): Remove `java-asm` from inputs or native inputs. * gnu/packages/maven.scm (maven-resolver-transport-file) (maven-resolver-transport-http, maven-model, maven-repository-metadata) (maven-compat): Remove `java-asm` from inputs or native-inputs. --- gnu/packages/batik.scm | 1 - gnu/packages/java.scm | 36 +++++++++++------------------------- gnu/packages/maven.scm | 7 +------ 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index 7f159010a5..138869dc90 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -241,7 +241,6 @@ (define-public java-xmlgraphics-commons #t)))))) (native-inputs `(("java-apache-xml-commons-resolver" ,java-apache-xml-commons-resolver) - ("java-asm" ,java-asm) ("java-cglib" ,java-cglib) ("java-hamcrest" ,java-hamcrest-core) ("java-junit" ,java-junit) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0fb46ce465..187a531c27 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3854,7 +3854,7 @@ (define-public java-plexus-component-metadata-1.7 java-commons-cli java-qdox java-jdom2 - java-asm)) + java-asm-8)) (native-inputs (list java-junit java-guava java-geronimo-xbean-reflect)) (synopsis "Inversion-of-control container for Maven") @@ -4826,7 +4826,7 @@ (define-public java-asm-commons-8 (define-public java-cglib (package (name "java-cglib") - (version "3.2.4") + (version "3.3.0") (source (origin (method git-fetch) @@ -4838,7 +4838,7 @@ (define-public java-cglib version))))) (file-name (git-file-name name version)) (sha256 - (base32 "186451jms2zfp47yd8kxd77az2cqal1my2br7klgyp8fpl4qfg8v")))) + (base32 "1lnscamc6bnhh7jgij5garxagp3zn2jp4cbq0rsn4xr3l0cnd014")))) (build-system ant-build-system) (arguments `(;; FIXME: tests fail because junit runs @@ -4850,8 +4850,8 @@ (define-public java-cglib (modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "cglib") #t))))) - (inputs - (list java-asm java-junit)) + (native-inputs (list java-junit)) + (propagated-inputs (list java-asm-8)) (home-page "https://github.com/cglib/cglib/") (synopsis "Java byte code generation library") (description "The byte code generation library CGLIB is a high level API @@ -4939,7 +4939,7 @@ (define-public java-easymock (delete-file "tests2/EasyMockPropertiesTest.java")) #t))))) (inputs - (list java-asm java-cglib java-objenesis)) + (list java-cglib java-objenesis)) (native-inputs (list java-junit java-hamcrest-core)) (home-page "https://easymock.org/") @@ -5000,7 +5000,7 @@ (define-public java-jmock (base32 "12b7l22g3nrjvf2dzcw3z03fpd2chrgp0d8xkvn8w55rwb57pax6")))) (inputs - (list java-hamcrest-all java-asm java-bsh java-junit)) + (list java-hamcrest-all java-bsh java-junit)) (native-inputs `(("cglib" ,java-cglib))) (arguments @@ -5018,7 +5018,6 @@ (define-public java-jmock-junit4 #:test-dir "jmock-junit4/src/test")) (inputs `(("java-hamcrest-all" ,java-hamcrest-all) - ("java-asm" ,java-asm) ("java-bsh" ,java-bsh) ("java-jmock" ,java-jmock) ("java-jumit" ,java-junit))))) @@ -5045,7 +5044,6 @@ (define-public java-jmock-legacy java-objenesis java-cglib java-jmock - java-asm java-bsh java-junit)) (native-inputs @@ -9402,8 +9400,7 @@ (define-public java-ops4j-pax-exam-core-spi ("junit" ,java-junit) ("hamcrest" ,java-hamcrest-core) ("cglib" ,java-cglib) - ("objenesis" ,java-objenesis) - ("asm" ,java-asm))))) + ("objenesis" ,java-objenesis))))) (define-public java-ops4j-pax-exam-core-junit (package @@ -10049,7 +10046,6 @@ (define-public java-guice (install-from-pom "core/pom.xml"))))) (propagated-inputs (list java-aopalliance - java-asm java-cglib java-guava java-javax-inject @@ -10355,8 +10351,7 @@ (define-public java-fest-assert java-hamcrest-core java-mockito-1 java-cglib - java-objenesis - java-asm)) + java-objenesis)) (home-page "https://github.com/alexruiz/fest-assert-2.x") (synopsis "FEST fluent assertions") (description "FEST-Assert provides a fluent interface for assertions.") @@ -10429,7 +10424,6 @@ (define-public java-testng ("java-assertj" ,java-assertj) ("java-mockito" ,java-mockito-1) ("cglib" ,java-cglib) - ("asm" ,java-asm) ("aopalliance" ,java-aopalliance))) (home-page "https://testng.org") (synopsis "Testing framework") @@ -10711,8 +10705,7 @@ (define-public java-lmax-disruptor ("java-hamcrest-all" ,java-hamcrest-all))) (native-inputs `(("cglib" ,java-cglib) - ("objenesis" ,java-objenesis) - ("asm" ,java-asm))) + ("objenesis" ,java-objenesis))) (home-page "https://www.lmax.com/disruptor") (synopsis "High performance inter-thread communication") (description "LMAX Disruptor is a software pattern and software component @@ -10876,7 +10869,6 @@ (define-public java-powermock-reflect (native-inputs `(("junit" ,java-junit) ("cglib" ,java-cglib) - ("asm" ,java-asm) ("hamcrest" ,java-hamcrest-core) ("assertj" ,java-assertj))) (home-page "https://github.com/powermock/powermock") @@ -10973,7 +10965,6 @@ (define-public java-powermock-modules-junit4 `(("easymock" ,java-easymock) ("hamcrest" ,java-hamcrest-core) ("objenesis" ,java-objenesis) - ("asm" ,java-asm) ("junit" ,java-junit))))) (define-public java-powermock-api-easymock @@ -11159,8 +11150,7 @@ (define-public java-kafka-clients (inputs (list java-slf4j-api java-lz4)) (native-inputs - (list java-asm - java-bouncycastle + (list java-bouncycastle java-cglib java-easymock java-hamcrest-all @@ -12032,7 +12022,6 @@ (define-public java-jline-2 java-easymock java-jboss-javassist java-objenesis - java-asm java-hamcrest-core java-cglib java-junit @@ -12163,7 +12152,6 @@ (define-public java-xmlunit ("java-mockito-1" ,java-mockito-1) ("java-hamcrest-all" ,java-hamcrest-all) ("java-objenesis" ,java-objenesis) - ("java-asm" ,java-asm) ("java-cglib" ,java-cglib) ("resources" ,(origin @@ -12851,7 +12839,6 @@ (define-public java-eclipse-sisu-plexus java-guice java-guava java-aopalliance - java-asm java-cglib)) (native-inputs (list java-junit)) @@ -12975,7 +12962,6 @@ (define-public java-logback-core java-hamcrest-core java-mockito-1 java-cglib - java-asm java-objenesis java-joda-time)) (home-page "https://logback.qos.ch") diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index fc3a63c263..f941bf0dd0 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -344,8 +344,7 @@ (define-public maven-resolver-transport-file maven-resolver-util maven-wagon-provider-api)) (native-inputs - (list java-asm - java-aopalliance + (list java-aopalliance java-cglib java-guava java-guice @@ -393,7 +392,6 @@ (define-public maven-resolver-transport-http java-httpcomponents-httpcore)) (native-inputs (list java-aopalliance - java-asm java-cglib java-eclipse-aether-api java-eclipse-jetty-http @@ -1262,7 +1260,6 @@ (define-public maven-model java-plexus-component-annotations java-guice java-cglib - java-asm java-eclipse-sisu-inject java-javax-inject java-plexus-classworlds @@ -1473,7 +1470,6 @@ (define-public maven-repository-metadata ("java-plexus-component-annotations" ,java-plexus-component-annotations) ("java-guice" ,java-guice) ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) ("java-eclipse-sisu-inject" ,java-eclipse-sisu-inject) ("java-javax-inject" ,java-javax-inject) ("java-plexus-utils" ,java-plexus-utils) @@ -2103,7 +2099,6 @@ (define-public maven-compat ("java-guice" ,java-guice) ("java-guava" ,java-guava) ("java-cglib" ,java-cglib) - ("java-asm" ,java-asm) ("java-modello-plugins-java" ,java-modello-plugins-java) ("java-modello-plugins-xml" ,java-modello-plugins-xml) ("java-modello-plugins-xpp3" ,java-modello-plugins-xpp3)