From e51d222b3d2fcd677704643bed59fa51e57e5e726093ef8647d79612eb3590b1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 10 Jun 2024 15:41:18 +0000 Subject: [PATCH 1/2] Accepting request 1179727 from Java:packages:test guice 6.0.0 + dependent changes OBS-URL: https://build.opensuse.org/request/show/1179727 OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=95 --- maven.changes | 5 +++++ maven.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/maven.changes b/maven.changes index d12b05f..1ca4b0d 100644 --- a/maven.changes +++ b/maven.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 10 13:58:23 UTC 2024 - Fridrich Strba + +- Add dependency on jakarta-inject, needed by google-guice 6.0.0 + ------------------------------------------------------------------- Tue Apr 2 17:21:14 UTC 2024 - Fridrich Strba diff --git a/maven.spec b/maven.spec index 97ae4b4..b0a9017 100644 --- a/maven.spec +++ b/maven.spec @@ -52,6 +52,7 @@ BuildRequires: google-guice BuildRequires: guava BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core +BuildRequires: jakarta-inject BuildRequires: jansi BuildRequires: javapackages-local BuildRequires: jcl-over-slf4j @@ -125,6 +126,7 @@ Requires: google-guice Requires: guava Requires: httpcomponents-client Requires: httpcomponents-core +Requires: jakarta-inject Requires: jansi Requires: javapackages-tools Requires: jcl-over-slf4j @@ -234,6 +236,7 @@ build-jar-repository -s lib \ glassfish-annotation-api \ guava/guava \ guice/google-guice \ + jakarta-inject \ jdom2/jdom2 \ maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-impl \ @@ -309,6 +312,7 @@ build-jar-repository -p %{buildroot}%{homedir}/lib \ guice/google-guice \ httpcomponents/httpclient \ httpcomponents/httpcore \ + jakarta-inject \ jansi/jansi \ maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-connector-basic \ From c0f90a3e026d3d4b0dc22370897aef9d6e9cef6959254e819c73a81ad778eb50 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 10 Jun 2024 19:22:38 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=96 --- apache-maven-3.9.6-build.tar.xz | 4 ++-- maven.spec | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/apache-maven-3.9.6-build.tar.xz b/apache-maven-3.9.6-build.tar.xz index 5d5d5f5..14da9b7 100644 --- a/apache-maven-3.9.6-build.tar.xz +++ b/apache-maven-3.9.6-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b0991c5dc67adc417251b4997e219497c7de12ecd01f82f0848d44db402ab8f -size 5152 +oid sha256:aa3896059314acc059579b0d921680c51440eb233e6301882a28abf881186ee0 +size 5136 diff --git a/maven.spec b/maven.spec index b0a9017..f5c49f7 100644 --- a/maven.spec +++ b/maven.spec @@ -234,10 +234,8 @@ build-jar-repository -s lib \ atinject \ commons-cli \ glassfish-annotation-api \ - guava/guava \ guice/google-guice \ jakarta-inject \ - jdom2/jdom2 \ maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-impl \ maven-resolver/maven-resolver-named-locks \ @@ -250,18 +248,14 @@ build-jar-repository -s lib \ org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ plexus-classworlds \ - plexus/cli \ plexus-containers/plexus-component-annotations \ plexus/interpolation \ - plexus-metadata-generator \ plexus/plexus-cipher \ plexus/plexus-sec-dispatcher \ plexus/utils \ plexus/xml \ - qdox \ slf4j/api \ - slf4j/simple \ - xbean/xbean-reflect + slf4j/simple ln -s $(build-classpath slf4j/slf4j-simple-sources) lib/ %{ant} \ -Dtest.skip=true \