From e62efb358cd4c6233052e2546cd51c16b4ff832b Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 22 Apr 2022 18:03:00 +0200
Subject: [PATCH] Port to Modello 2.0.0

---
 0001-Port-to-Modello-2.0.0.patch | 39 ++++++++++++++++++++++++++++++++
 xmvn.spec                        | 13 +++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 0001-Port-to-Modello-2.0.0.patch

diff --git a/0001-Port-to-Modello-2.0.0.patch b/0001-Port-to-Modello-2.0.0.patch
new file mode 100644
index 0000000..ab9e2df
--- /dev/null
+++ b/0001-Port-to-Modello-2.0.0.patch
@@ -0,0 +1,39 @@
+From e1f17fa910dcd18716c612070067f79cdd4fa716 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Wed, 2 Mar 2022 06:58:32 +0100
+Subject: [PATCH] Port to Modello 2.0.0
+
+---
+ xmvn-api/pom.xml    | 2 +-
+ xmvn-parent/pom.xml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xmvn-api/pom.xml b/xmvn-api/pom.xml
+index 74b961d8..18539a4a 100644
+--- a/xmvn-api/pom.xml
++++ b/xmvn-api/pom.xml
+@@ -38,7 +38,7 @@
+         <artifactId>modello-maven-plugin</artifactId>
+         <configuration>
+           <version>3.2.0</version>
+-          <useJava5>true</useJava5>
++          <javaSource>11</javaSource>
+           <domAsXpp3>false</domAsXpp3>
+           <models>
+             <model>src/main/mdo/config.mdo</model>
+diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml
+index 2dafffbe..a563eb7c 100644
+--- a/xmvn-parent/pom.xml
++++ b/xmvn-parent/pom.xml
+@@ -107,7 +107,7 @@
+     <junitVersion>5.7.2</junitVersion>
+     <jxrPluginVersion>2.3</jxrPluginVersion>
+     <mavenWagonVersion>1.0</mavenWagonVersion>
+-    <modelloVersion>1.11</modelloVersion>
++    <modelloVersion>2.0.0</modelloVersion>
+     <nexusStagingPluginVersion>1.6.8</nexusStagingPluginVersion>
+     <pmdPluginVersion>3.0.1</pmdPluginVersion>
+     <projectInfoReportsPluginVersion>3.0.0</projectInfoReportsPluginVersion>
+-- 
+2.35.1
+
diff --git a/xmvn.spec b/xmvn.spec
index 431c188..9c77f0e 100644
--- a/xmvn.spec
+++ b/xmvn.spec
@@ -6,7 +6,7 @@
 
 Name:           xmvn
 Version:        4.0.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Local Extensions for Apache Maven
 License:        ASL 2.0
 URL:            https://fedora-java.github.io/xmvn/
@@ -14,6 +14,8 @@ BuildArch:      noarch
 
 Source0:        https://github.com/fedora-java/xmvn/releases/download/%{version}/xmvn-%{version}.tar.xz
 
+Patch0:         0001-Port-to-Modello-2.0.0.patch
+
 BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
@@ -30,7 +32,7 @@ BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-model-builder)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
-BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
+BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin) >= 2.0.0
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-classworlds)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
@@ -136,6 +138,10 @@ This package provides %{summary}.
 
 %prep
 %setup -q
+%if %{without bootstrap}
+# XXX modello in javapackages-bootstrap is stil at version 1.11
+%patch0 -p1
+%endif
 
 %mvn_package ::tar.gz: __noinstall
 %mvn_package ":{xmvn,xmvn-connector}" xmvn
@@ -272,6 +278,9 @@ end
 %license LICENSE NOTICE
 
 %changelog
+* Fri Apr 22 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0.0-9
+- Port to Modello 2.0.0
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.0.0-8
 - Rebuilt for java-17-openjdk as system jdk