From 15eab680eff88caf172e00eed2c5907868cfa60b6f2e790f71232a131a2cd90f Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 10 Jun 2024 15:41:02 +0000
Subject: [PATCH] Accepting request 1179728 from Java:packages:test

guice 6.0.0 + dependent changes

OBS-URL: https://build.opensuse.org/request/show/1179728
OBS-URL: https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=58
---
 modello.changes | 5 +++++
 modello.spec    | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/modello.changes b/modello.changes
index 0d68808..f3803de 100644
--- a/modello.changes
+++ b/modello.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 10 14:01:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on jakarta-inject, needed by google-guice 6.0.0
+
 -------------------------------------------------------------------
 Wed Jun  5 11:27:39 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/modello.spec b/modello.spec
index aab6641..f4404d6 100644
--- a/modello.spec
+++ b/modello.spec
@@ -34,6 +34,7 @@ BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  guava
 BuildRequires:  jackson-core
+BuildRequires:  jakarta-inject
 BuildRequires:  javadoc-parser
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  jsoup
@@ -53,6 +54,7 @@ Requires:       atinject
 Requires:       google-guice
 Requires:       guava
 Requires:       jackson-core
+Requires:       jakarta-inject
 Requires:       javadoc-parser
 Requires:       javapackages-tools
 Requires:       plexus-build-api
@@ -118,6 +120,7 @@ build-jar-repository -s lib \
     atinject \
     guava/guava \
     jackson-core \
+    jakarta-inject \
     javadoc-parser \
     jsoup \
     junit \
@@ -163,7 +166,7 @@ done
 %fdupes -s %{buildroot}%{_javadocdir}
 
 # script
-%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:javadoc-parser:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true
+%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:jakarta-inject:javadoc-parser:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true
 
 %files -f .mfiles -f .mfiles-core
 %license LICENSE.txt LICENSE-2.0.txt