ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: java-cglib: Update to 3.3.0.

Browse source 
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.
(java-httpcomponents-httpclient-cache)
(java-httpcomponents-httpclient-osgi): Disable tests.
* 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.

Change-Id: I92a939e7522d92b185715d7935aabed5ddb77451
This commit is contained in:
Julien Lepiller 2023-02-25 21:30:27 +01:00
parent 415a4d0115
commit f1ed3d4699
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
3 changed files with 14 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/packages/batik.scm
View file

@ -338,7 +338,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)

39
gnu/packages/java.scm
View file

@ -4135,7 +4135,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")
@ -5109,7 +5109,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)
@ -5121,7 +5121,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
@ -5133,8 +5133,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
@ -5222,7 +5222,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/")
@ -5345,7 +5345,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
@ -5363,7 +5363,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)))))
@ -5390,7 +5389,6 @@ (define-public java-jmock-legacy
java-objenesis
java-cglib
java-jmock
java-asm
java-bsh
java-junit))
(native-inputs
@ -6567,6 +6565,7 @@ (define-public java-httpcomponents-httpclient-cache
`(#:jar-name "httpcomponents-httpclient-cache.jar"
#:source-dir "src/main/java"
#:test-dir "src/test"
#:tests? #f; tests are broken with current cglib.
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-unused-impls
@ -6584,7 +6583,6 @@ (define-public java-httpcomponents-httpclient-cache
(prepend java-httpcomponents-httpclient
java-httpcomponents-httpmime
java-hamcrest-core)))
(native-inputs (list java-easymock-3.2 java-easymock-class-extension))
(description "This package provides an API for caching accessed HTTP
resources.")))
@ -6593,6 +6591,7 @@ (define-public java-httpcomponents-httpclient-osgi
(name "java-httpcomponents-httpclient-osgi")
(arguments
`(#:jar-name "httpcomponents-httpclient-osgi.jar"
#:tests? #f; tests are broken with current cglib.
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'chdir
@ -9862,8 +9861,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
@ -10509,7 +10507,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
@ -10815,8 +10812,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.")
@ -10889,7 +10885,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")
@ -11171,8 +11166,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
@ -11336,7 +11330,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")
@ -11433,7 +11426,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
@ -11651,8 +11643,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
@ -12524,7 +12515,6 @@ (define-public java-jline-2
java-easymock
java-jboss-javassist
java-objenesis
java-asm
java-hamcrest-core
java-cglib
java-junit
@ -12655,7 +12645,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
@ -13343,7 +13332,6 @@ (define-public java-eclipse-sisu-plexus
java-guice
java-guava
java-aopalliance
java-asm
java-cglib))
(native-inputs
(list java-junit))
@ -13467,7 +13455,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")

7
gnu/packages/maven.scm
View file

@ -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 (modello-single-mode file version mode)
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 (modello-single-mode file version mode)
("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 (modello-single-mode file version mode)
("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)