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

---
 modello-maven-plugin.spec |  6 ++----
 modello.spec              | 28 +++++++---------------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/modello-maven-plugin.spec b/modello-maven-plugin.spec
index 3ed9e27..78b8a20 100644
--- a/modello-maven-plugin.spec
+++ b/modello-maven-plugin.spec
@@ -41,8 +41,10 @@ BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.codehaus.modello:modello-core) = %{version}
 BuildRequires:  mvn(org.codehaus.modello:modello-plugin-converters) = %{version}
 BuildRequires:  mvn(org.codehaus.modello:modello-plugin-dom4j) = %{version}
+BuildRequires:  mvn(org.codehaus.modello:modello-plugin-jackson) = %{version}
 BuildRequires:  mvn(org.codehaus.modello:modello-plugin-java) = %{version}
 BuildRequires:  mvn(org.codehaus.modello:modello-plugin-jdom) = %{version}
+BuildRequires:  mvn(org.codehaus.modello:modello-plugin-jsonschema) = %{version}
 BuildRequires:  mvn(org.codehaus.modello:modello-plugin-sax) = %{version}
 BuildRequires:  mvn(org.codehaus.modello:modello-plugin-stax) = %{version}
 BuildRequires:  mvn(org.codehaus.modello:modello-plugin-xdoc) = %{version}
@@ -96,12 +98,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
 
diff --git a/modello.spec b/modello.spec
index 63ef079..50456b5 100644
--- a/modello.spec
+++ b/modello.spec
@@ -133,37 +133,23 @@ build-jar-repository -s lib \
 %install
 # jars
 install -dm 0755 %{buildroot}%{_javadir}/%{name}
-
-for i in core; do
-  install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar
-done
-
-for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do
-  install -pm 0644 %{name}-plugins/%{name}-plugin-${i}/target/%{name}-plugin-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-plugin-${i}.jar
-done
-
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-
-for i in core; do
-  %{mvn_install_pom} %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom
-  %add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar
-done
-
-for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do
-  %{mvn_install_pom} %{name}-plugins/%{name}-plugin-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugin-${i}.pom
-  %add_maven_depmap %{name}/%{name}-plugin-${i}.pom %{name}/%{name}-plugin-${i}.jar
-done
-
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 
 for i in core; do
+  install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar
+  %{mvn_install_pom} %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom
+  %add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar
   install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}
   cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
 done
 
-for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd; do
+for i in converters dom4j java jdom sax stax xdoc xml xpp3 xsd jackson jsonschema; do
+  install -pm 0644 %{name}-plugins/%{name}-plugin-${i}/target/%{name}-plugin-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-plugin-${i}.jar
+  %{mvn_install_pom} %{name}-plugins/%{name}-plugin-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugin-${i}.pom
+  %add_maven_depmap %{name}/%{name}-plugin-${i}.pom %{name}/%{name}-plugin-${i}.jar
   install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-plugin-${i}
   cp -pr %{name}-plugins/%{name}-plugin-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-plugin-${i}/
 done