From 5d6d466c3994b03f3e5b7e21257d34552a26319e751d3ea80b04efbb8215be9a Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 15 Apr 2024 07:32:42 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=40

---
 modello-build.tar.xz      | 4 ++--
 modello-maven-plugin.spec | 3 +++
 modello.spec              | 9 ++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modello-build.tar.xz b/modello-build.tar.xz
index 8dde078..7260eb5 100644
--- a/modello-build.tar.xz
+++ b/modello-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73aaa91e5257affba64b5ce72eae0a8f40e999bd48bd2c1caf5ec792bb781c14
-size 4472
+oid sha256:b8d4a4762a66a6f86ad5569afb60e38b0de736799f2f3a97d72f5eac207c50fb
+size 4736
diff --git a/modello-maven-plugin.spec b/modello-maven-plugin.spec
index 361b5e6..3ed9e27 100644
--- a/modello-maven-plugin.spec
+++ b/modello-maven-plugin.spec
@@ -111,12 +111,15 @@ rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVeloc
 
 %build
 pushd %{name}
+%{mvn_file} :{*} %{parent}/@1
 %{mvn_build} -f -- -Dsource=8
 popd
 
 %install
 pushd %{name}
+
 %mvn_install
+
 popd
 %fdupes -s %{buildroot}%{_javadocdir}
 
diff --git a/modello.spec b/modello.spec
index a645328..63ef079 100644
--- a/modello.spec
+++ b/modello.spec
@@ -35,6 +35,7 @@ BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  google-guice
 BuildRequires:  guava
+BuildRequires:  jackson-core
 BuildRequires:  javadoc-parser
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  jsoup
@@ -52,6 +53,7 @@ Requires:       aopalliance
 Requires:       atinject
 Requires:       google-guice
 Requires:       guava
+Requires:       jackson-core
 Requires:       javadoc-parser
 Requires:       javapackages-tools
 Requires:       plexus-build-api
@@ -95,12 +97,8 @@ cp -p %{SOURCE1} LICENSE
 
 %pom_remove_dep :jackson-bom
 
-%pom_disable_module modello-plugin-jackson modello-plugins
-%pom_disable_module modello-plugin-jsonschema modello-plugins
 %pom_disable_module modello-plugin-snakeyaml modello-plugins
 %pom_disable_module modello-plugin-velocity modello-plugins
-%pom_remove_dep :modello-plugin-jackson modello-maven-plugin
-%pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin
 %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin
 %pom_remove_dep :modello-plugin-velocity modello-maven-plugin
 
@@ -115,6 +113,7 @@ build-jar-repository -s lib \
     atinject \
     guava/guava \
     guice/google-guice \
+    jackson-core \
     javadoc-parser \
     jsoup \
     org.eclipse.sisu.inject \
@@ -172,7 +171,7 @@ done
 %fdupes -s %{buildroot}%{_javadocdir}
 
 # script
-%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:objectweb-asm:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:javadoc-parser:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/xml:plexus/plexus-build-api:guava:slf4j/api:slf4j/simple %{name} true
+%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:objectweb-asm:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:jackson-core:javadoc-parser:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/xml:plexus/plexus-build-api:guava:slf4j/api:slf4j/simple %{name} true
 
 %files -f .mfiles
 %license LICENSE