From 333cf1b7c44e8ee5a3b6b1693a2fa6f76ed60583958200422394e11fe36bff52 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 4 Sep 2023 23:39:55 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=26

---
 modello-build.tar.xz      |  4 ++--
 modello-maven-plugin.spec |  2 ++
 modello.spec              | 43 ++++++++++++++++++++++++++-------------
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/modello-build.tar.xz b/modello-build.tar.xz
index 37aaadd..5ccfd76 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:9d25d68e98de3b6bf0a4a3d76109dd96dea849562a521797d3a9a5f434f04864
-size 4384
+oid sha256:49332cdb095b7b2d2a61768c5508e969b739dfb50bdb8d42ba6aaac5af40d783
+size 4468
diff --git a/modello-maven-plugin.spec b/modello-maven-plugin.spec
index cf818da..fe4cd50 100644
--- a/modello-maven-plugin.spec
+++ b/modello-maven-plugin.spec
@@ -103,6 +103,8 @@ cp -p %{SOURCE1} LICENSE
 
 rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java
 
+%pom_disable_module modello-test
+
 %build
 pushd %{name}
 %{mvn_build} -f -- -Dsource=8
diff --git a/modello.spec b/modello.spec
index 1d6cd22..bf3f164 100644
--- a/modello.spec
+++ b/modello.spec
@@ -39,6 +39,7 @@ BuildRequires:  plexus-build-api
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-compiler
 BuildRequires:  plexus-containers-component-annotations
+BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
 BuildRequires:  sisu-plexus
 BuildRequires:  unzip
@@ -89,12 +90,32 @@ cp -p %{SOURCE1} LICENSE
 
 rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java
 
+%pom_disable_module modello-test
+
 %build
 mkdir -p lib
-build-jar-repository -s lib plexus/classworlds plexus/utils plexus/plexus-build-api \
-  plexus-compiler/plexus-compiler-api plexus-compiler/plexus-compiler-javac \
-  plexus-containers/plexus-component-annotations jsoup guava/guava junit org.eclipse.sisu.plexus
-# skip tests because we have too old xmlunit in openSUSE now (1.5)
+build-jar-repository -s lib \
+	atinject \
+	commons-cli \
+    guava/guava \
+    guice/google-guice \
+	jdom2/jdom2 \
+    jsoup \
+    junit \
+	objectweb-asm/asm \
+    org.eclipse.sisu.inject \
+    org.eclipse.sisu.plexus \
+    plexus/classworlds \
+	plexus/cli \
+    plexus/plexus-build-api \
+    plexus/utils \
+    plexus-compiler/plexus-compiler-api \
+    plexus-compiler/plexus-compiler-javac \
+    plexus-containers/plexus-component-annotations \
+    plexus-metadata-generator \
+	qdox \
+	xbean/xbean-reflect
+
 %{ant} \
   -Dtest.skip=true \
   package javadoc
@@ -103,7 +124,7 @@ build-jar-repository -s lib plexus/classworlds plexus/utils plexus/plexus-build-
 # jars
 install -dm 0755 %{buildroot}%{_javadir}/%{name}
 
-for i in core test; do
+for i in core; do
   install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar
 done
 
@@ -114,13 +135,7 @@ done
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
-%add_maven_depmap %{name}/%{name}.pom
-
-install -pm 0644 %{name}-plugins/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-plugins.pom
-%add_maven_depmap %{name}/%{name}-plugins.pom
-
-for i in core test; do
+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
@@ -133,7 +148,7 @@ done
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 
-for i in core test; do
+for i in core; do
   install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}
   cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
 done
@@ -146,7 +161,7 @@ done
 %fdupes -s %{buildroot}%{_javadocdir}
 
 # script
-%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice-no_aop:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true
+%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true
 
 %files -f .mfiles
 %license LICENSE